Add missing headers when not using precompiled header support. Some minor formatting in libaegisub/common/hotkey.cpp.

Originally committed to SVN as r5135.

aegisub/libaegisub/common/hotkey.cpp

@@ -26,11 +26,15 @@
 #include <memory>
 #endif
 
+#include "libaegisub/hotkey.h"
+
 #include "libaegisub/access.h"
+#include "libaegisub/cajun/writer.h"
+#include "libaegisub/exception.h"
 #include "libaegisub/io.h"
 #include "libaegisub/json.h"
 #include "libaegisub/log.h"
-#include "libaegisub/hotkey.h"
+
 
 namespace agi {
 	namespace hotkey {
@@ -67,7 +71,7 @@ Hotkey::Hotkey(const std::string &file, const std::string &default_config):
     try {
 		stream = agi::io::Open(config_file);
 	} catch (const acs::AcsNotFound&) {
-stream = new std::istringstream(config_default);
+		stream = new std::istringstream(config_default);
     }
 
 

aegisub/src/command/app.cpp

@@ -39,6 +39,7 @@
 #include "../config.h"
 
 #ifndef AGI_PRE
+#include <wx/msgdlg.h>
 #endif
 
 #include "command.h"

aegisub/src/command/command.h

@@ -18,9 +18,18 @@
 /// @brief Command base class and main header.
 /// @ingroup command
 
+
+#ifndef AGI_PRE
+#include <map>
+#endif
+
+#include <libaegisub/exception.h>
+
 #include "../include/aegisub/context.h"
 #include "icon.h"
 
+
+
 DEFINE_BASE_EXCEPTION_NOINNER(CommandError, agi::Exception)
 DEFINE_SIMPLE_EXCEPTION_NOINNER(CommandIconNone, CommandError, "command/icon")
 DEFINE_SIMPLE_EXCEPTION_NOINNER(CommandIconInvalid, CommandError, "command/icon/invalid")

aegisub/src/command/help.cpp

@@ -39,6 +39,7 @@
 #include "../config.h"
 
 #ifndef AGI_PRE
+#include <wx/msgdlg.h>
 #endif
 
 #include "command.h"

aegisub/src/command/icon.cpp

@@ -20,6 +20,8 @@
 
 
 #ifndef AGI_PRE
+#include <map>
+
 #include <wx/bitmap.h>
 #include <wx/image.h>
 #include <wx/mstream.h>

aegisub/src/command/keyframe.cpp

@@ -39,6 +39,7 @@
 #include "../config.h"
 
 #ifndef AGI_PRE
+#include <wx/filedlg.h>
 #endif
 
 #include "command.h"

aegisub/src/command/subtitle.cpp

@@ -39,6 +39,7 @@
 #include "../config.h"
 
 #ifndef AGI_PRE
+#include <wx/filename.h>
 #include <wx/filedlg.h>
 #include <wx/choicdlg.h>
 #endif

aegisub/src/command/time.cpp

@@ -39,6 +39,7 @@
 #include "../config.h"
 
 #ifndef AGI_PRE
+#include <algorithm>
 #endif
 
 #include "command.h"

aegisub/src/frame_main.cpp

@@ -36,6 +36,7 @@
 #include "config.h"
 
 #ifndef AGI_PRE
+#include <wx/clipbrd.h>
 #include <wx/filename.h>
 #include <wx/image.h>
 #include <wx/mimetype.h>