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

Originally committed to SVN as r6308.
This commit is contained in:
Thomas Goyne 2012-01-18 20:08:42 +00:00
parent b38851bb93
commit b36c70ca7d
16 changed files with 49 additions and 54 deletions

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

@ -38,9 +38,11 @@
#include <libaegisub/log.h> #include <libaegisub/log.h>
#include "video_provider_yuv4mpeg.h"
#include "compat.h" #include "compat.h"
#include "utils.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: // 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. // MICROSOFT'S IMPLEMENTATION OF STD::FSTREAM DOES NOT SUPPORT FILES LARGER THAN 2 GB.