Move a pile of things that shouldn't be in headers out of the headers

Originally committed to SVN as r6308.

aegisub/src/auto4_lua.cpp

@@ -62,6 +62,7 @@
 #include "ass_style.h"
 #include "auto4_lua_factory.h"
 #include "auto4_lua_scriptreader.h"
+#include "compat.h"
 #include "include/aegisub/context.h"
 #include "main.h"
 #include "selection_controller.h"

aegisub/src/auto4_lua.h

@@ -41,7 +41,6 @@
 #include <wx/thread.h>
 #endif
 
-#include "compat.h"
 #include "auto4_base.h"
 
 #include "command/command.h"

aegisub/src/auto4_lua_dialog.cpp

@@ -60,6 +60,7 @@
 
 #include "ass_style.h"
 #include "colour_button.h"
+#include "compat.h"
 #include "string_codec.h"
 #include "utils.h"
 

aegisub/src/command/video.cpp

@@ -62,6 +62,7 @@
 #include "../video_box.h"
 #include "../video_context.h"
 #include "../video_display.h"
+#include "../video_frame.h"
 #include "../video_slider.h"
 
 namespace {

aegisub/src/dialog_dummy_video.cpp

@@ -37,18 +37,33 @@
 
 #include "config.h"
 
+#include "dialog_dummy_video.h"
+
 #ifndef AGI_PRE
+#include <wx/checkbox.h>
+#include <wx/combobox.h>
 #include <wx/datetime.h>
 #include <wx/log.h>
 #include <wx/sizer.h>
+#include <wx/spinctrl.h>
 #include <wx/statline.h>
+#include <wx/stattext.h>
+#include <wx/string.h>
+#include <wx/textctrl.h>
 #endif
 
+#include "colour_button.h"
 #include "compat.h"
-#include "dialog_dummy_video.h"
 #include "help_button.h"
 #include "main.h"
 #include "utils.h"
+#include "video_provider_dummy.h"
+
+enum {
+	Dummy_Video_Resolution_Shortcut = 1700,
+	Dummy_Video_FPS,
+	Dummy_Video_Length
+};
 
 /// DOCME
 struct ResolutionShortcut {

aegisub/src/dialog_dummy_video.h

@@ -34,22 +34,17 @@
 /// @ingroup secondary_ui
 ///
 
-
-
-
 #ifndef AGI_PRE
-#include <wx/checkbox.h>
-#include <wx/combobox.h>
 #include <wx/dialog.h>
-#include <wx/spinctrl.h>
-#include <wx/stattext.h>
-#include <wx/string.h>
-#include <wx/textctrl.h>
 #endif
 
-#include "colour_button.h"
+class ColourButton;
-#include "video_provider_dummy.h"
+class wxButton;
-
+class wxCheckBox;
+class wxComboBox;
+class wxSpinCtrl;
+class wxStaticText;
+class wxTextCtrl;
 
 /// DOCME
 /// @class DialogDummyVideo
@@ -57,10 +52,8 @@
 ///
 /// DOCME
 class DialogDummyVideo : public wxDialog {
-private:
 	DialogDummyVideo(wxWindow *parent);
-	virtual ~DialogDummyVideo();
+	~DialogDummyVideo();
-
 
 	/// DOCME
 	wxComboBox *resolution_shortcuts;
@@ -104,15 +97,3 @@ public:
 
 	DECLARE_EVENT_TABLE()
 };
-
-enum {
-
-	/// DOCME
-	Dummy_Video_Resolution_Shortcut = 1700,
-
-	/// DOCME
-	Dummy_Video_FPS,
-
-	/// DOCME
-	Dummy_Video_Length
-};

aegisub/src/dialog_text_import.cpp

@@ -34,9 +34,6 @@
 /// @ingroup secondary_ui
 ///
 
-
-///////////
-// Headers
 #include "config.h"
 
 #ifndef AGI_PRE
@@ -48,6 +45,10 @@
 #include "dialog_text_import.h"
 #include "main.h"
 
+enum {
+	EDIT_ACTOR_SEPARATOR = 1480,
+	EDIT_COMMENT_STARTER
+};
 
 /// @brief Constructor 
 ///

aegisub/src/dialog_text_import.h

@@ -34,10 +34,6 @@
 /// @ingroup secondary_ui
 ///
 
-
-
-///////////
-// Headers
 #ifndef AGI_PRE
 #include <wx/dialog.h>
 #include <wx/textctrl.h>
@@ -67,15 +63,3 @@ public:
 
 	DECLARE_EVENT_TABLE()
 };
-
-
-///////
-// IDs
-enum {
-
-	/// DOCME
-	EDIT_ACTOR_SEPARATOR = 1480,
-
-	/// DOCME
-	EDIT_COMMENT_STARTER
-};

aegisub/src/include/aegisub/video_provider.h

@@ -36,10 +36,15 @@
 
 #pragma once
 
-#include "video_frame.h"
 #include <libaegisub/exception.h>
 #include <libaegisub/vfr.h>
 
+#ifndef AGI_PRE
+#include <wx/string.h>
+#endif
+
+class AegiVideoFrame;
+
 /// @class VideoProvider
 /// @brief DOCME
 ///

aegisub/src/threaded_frame_source.cpp

@@ -47,6 +47,7 @@
 #include "compat.h"
 #include "include/aegisub/context.h"
 #include "include/aegisub/subtitles_provider.h"
+#include "video_frame.h"
 #include "video_provider_manager.h"
 
 // Test if a line is a dialogue line which is not visible at the given time

aegisub/src/threaded_frame_source.h

@@ -44,8 +44,7 @@
 #include <libaegisub/exception.h>
 #include <libaegisub/scoped_ptr.h>
 
-#include "video_frame.h"
+class AegiVideoFrame;
-
 class AssFile;
 class SubtitlesProvider;
 class VideoProvider;

aegisub/src/video_provider_avs.h

@@ -38,6 +38,7 @@
 #include "avisynth.h"
 #include "avisynth_wrap.h"
 #include "include/aegisub/video_provider.h"
+#include "video_frame.h"
 
 /// DOCME
 /// @class AvisynthVideoProvider

aegisub/src/video_provider_cache.cpp

@@ -35,10 +35,13 @@
 ///
 
 #include "config.h"
-#include "main.h"
 
 #include "video_provider_cache.h"
 
+#include "main.h"
+#include "video_frame.h"
+
+
 /// DOCME
 /// @class CachedFrame
 /// @brief DOCME

aegisub/src/video_provider_dummy.h

@@ -41,6 +41,7 @@
 #endif
 
 #include "include/aegisub/video_provider.h"
+#include "video_frame.h"
 
 /// DOCME
 /// @class DummyVideoProvider

aegisub/src/video_provider_ffmpegsource.h

@@ -41,7 +41,7 @@
 
 #include "ffmpegsource_common.h"
 #include "include/aegisub/video_provider.h"
-
+#include "video_frame.h"
 
 /// @class FFmpegSourceVideoProvider
 /// @brief Implements video loading through the FFMS library.

aegisub/src/video_provider_yuv4mpeg.cpp

@@ -38,9 +38,11 @@
 
 #include <libaegisub/log.h>
 
+#include "video_provider_yuv4mpeg.h"
+
 #include "compat.h"
 #include "utils.h"
-#include "video_provider_yuv4mpeg.h"
+#include "video_frame.h"
 
 // All of this cstdio bogus is because of one reason and one reason only:
 // MICROSOFT'S IMPLEMENTATION OF STD::FSTREAM DOES NOT SUPPORT FILES LARGER THAN 2 GB.