Remove header include order requirements

Originally committed to SVN as r5449.
This commit is contained in:
Thomas Goyne 2011-07-15 04:04:13 +00:00
parent 63538d125e
commit 256e098aa7
22 changed files with 24 additions and 53 deletions

View file

@ -46,7 +46,6 @@
#include <libaegisub/log.h> #include <libaegisub/log.h>
#include "selection_controller.h"
#include "audio_box.h" #include "audio_box.h"
#include "audio_controller.h" #include "audio_controller.h"
#include "audio_display.h" #include "audio_display.h"
@ -57,6 +56,7 @@
#include "libresrc/libresrc.h" #include "libresrc/libresrc.h"
#include "main.h" #include "main.h"
#include "toggle_bitmap.h" #include "toggle_bitmap.h"
#include "selection_controller.h"
#include "tooltip_manager.h" #include "tooltip_manager.h"
#include "utils.h" #include "utils.h"

View file

@ -45,13 +45,13 @@
#include <libaegisub/io.h> #include <libaegisub/io.h>
#include "selection_controller.h"
#include "audio_controller.h" #include "audio_controller.h"
#include "include/aegisub/audio_provider.h"
#include "include/aegisub/audio_player.h"
#include "audio_provider_dummy.h" #include "audio_provider_dummy.h"
#include "audio_timing.h" #include "audio_timing.h"
#include "compat.h" #include "compat.h"
#include "include/aegisub/audio_player.h"
#include "include/aegisub/audio_provider.h"
#include "selection_controller.h"
#include "video_context.h" #include "video_context.h"
class AudioMarkerKeyframe : public AudioMarker { class AudioMarkerKeyframe : public AudioMarker {

View file

@ -45,8 +45,6 @@
#include <wx/mousestate.h> #include <wx/mousestate.h>
#endif #endif
#include "block_cache.h"
#include "selection_controller.h"
#include "ass_time.h" #include "ass_time.h"
#include "audio_colorscheme.h" #include "audio_colorscheme.h"
#include "audio_controller.h" #include "audio_controller.h"
@ -55,10 +53,12 @@
#include "audio_renderer_spectrum.h" #include "audio_renderer_spectrum.h"
#include "audio_renderer_waveform.h" #include "audio_renderer_waveform.h"
#include "audio_timing.h" #include "audio_timing.h"
#include "block_cache.h"
#include "include/aegisub/audio_player.h" #include "include/aegisub/audio_player.h"
#include "include/aegisub/audio_provider.h" #include "include/aegisub/audio_provider.h"
#include "include/aegisub/hotkey.h" #include "include/aegisub/hotkey.h"
#include "main.h" #include "main.h"
#include "selection_controller.h"
#include "utils.h" #include "utils.h"
class AudioDisplayScrollbar : public AudioDisplayInteractionObject { class AudioDisplayScrollbar : public AudioDisplayInteractionObject {

View file

@ -48,11 +48,11 @@
#include <libaegisub/log.h> #include <libaegisub/log.h>
#include "ass_override.h" #include "ass_override.h"
#include "selection_controller.h"
#include "audio_controller.h"
#include "audio_box.h" #include "audio_box.h"
#include "audio_controller.h"
#include "audio_display.h" #include "audio_display.h"
#include "audio_karaoke.h" #include "audio_karaoke.h"
#include "selection_controller.h"
/// @brief Empty constructor /// @brief Empty constructor
/// ///

View file

@ -43,6 +43,7 @@
#include <wx/gdicmn.h> #include <wx/gdicmn.h>
#endif #endif
#include "block_cache.h"
// Some forward declarations for outside stuff // Some forward declarations for outside stuff
class AudioProvider; class AudioProvider;
@ -51,13 +52,6 @@ class AudioProvider;
class AudioRendererBitmapProvider; class AudioRendererBitmapProvider;
class AudioRenderer; class AudioRenderer;
#ifndef AGI_BLOCK_CACHE_INCLUDED
#error You much include "block_cache.h" before "audio_renderer.h"
#endif
/// @class AudioRendererBitmapCacheBitmapFactory /// @class AudioRendererBitmapCacheBitmapFactory
/// @brief Produces wxBitmap objects for DataBlockCache storage for the audio renderer /// @brief Produces wxBitmap objects for DataBlockCache storage for the audio renderer
struct AudioRendererBitmapCacheBitmapFactory { struct AudioRendererBitmapCacheBitmapFactory {

View file

@ -37,6 +37,8 @@ class AssDialogue;
class AssFile; class AssFile;
class AudioController; class AudioController;
#include "selection_controller.h"
#include <libaegisub/signal.h> #include <libaegisub/signal.h>
/// @class AudioTimingController /// @class AudioTimingController

View file

@ -42,14 +42,12 @@
#include "ass_dialogue.h" #include "ass_dialogue.h"
#include "ass_file.h" #include "ass_file.h"
#include "ass_time.h" #include "ass_time.h"
#include "main.h"
#include "selection_controller.h"
#include "audio_controller.h" #include "audio_controller.h"
#include "audio_timing.h" #include "audio_timing.h"
#include "main.h"
#include "selection_controller.h"
#include "utils.h" #include "utils.h"
/// @class AudioMarkerDialogueTiming /// @class AudioMarkerDialogueTiming
/// @brief AudioMarker implementation for AudioTimingControllerDialogue /// @brief AudioMarker implementation for AudioTimingControllerDialogue
/// ///

View file

@ -54,7 +54,6 @@
#include "ass_dialogue.h" #include "ass_dialogue.h"
#include "ass_file.h" #include "ass_file.h"
#include "ass_style.h" #include "ass_style.h"
#include "selection_controller.h"
#include "compat.h" #include "compat.h"
#include "frame_main.h" #include "frame_main.h"
#include "main.h" #include "main.h"

View file

@ -33,17 +33,13 @@
/// @ingroup utility /// @ingroup utility
/// @brief Template class for creating caches for blocks of data /// @brief Template class for creating caches for blocks of data
#pragma once
#ifndef AGI_PRE #ifndef AGI_PRE
#include <algorithm> #include <algorithm>
#include <vector> #include <vector>
#endif #endif
#define AGI_BLOCK_CACHE_INCLUDED 1
/// @class BasicDataBlockFactory /// @class BasicDataBlockFactory
/// @brief Simple factory for allocating blocks for DataBlockCache /// @brief Simple factory for allocating blocks for DataBlockCache
/// @tparam BlockT Type of blocks to produce /// @tparam BlockT Type of blocks to produce

View file

@ -44,7 +44,6 @@
#include "command.h" #include "command.h"
#include "../selection_controller.h"
#include "../ass_dialogue.h" #include "../ass_dialogue.h"
#include "../audio_controller.h" #include "../audio_controller.h"
#include "../audio_timing.h" #include "../audio_timing.h"

View file

@ -44,7 +44,6 @@
#include "command.h" #include "command.h"
#include "../selection_controller.h"
#include "../ass_dialogue.h" #include "../ass_dialogue.h"
#include "../ass_file.h" #include "../ass_file.h"
#include "../audio_controller.h" #include "../audio_controller.h"
@ -52,6 +51,7 @@
#include "../dialog_shift_times.h" #include "../dialog_shift_times.h"
#include "../include/aegisub/context.h" #include "../include/aegisub/context.h"
#include "../main.h" #include "../main.h"
#include "../selection_controller.h"
#include "../subs_grid.h" #include "../subs_grid.h"
#include "../video_context.h" #include "../video_context.h"

View file

@ -43,19 +43,20 @@
#include <wx/recguard.h> #include <wx/recguard.h>
#endif #endif
#include "dialog_styling_assistant.h"
#include "include/aegisub/context.h" #include "include/aegisub/context.h"
#include "include/aegisub/hotkey.h" #include "include/aegisub/hotkey.h"
#include "ass_dialogue.h" #include "ass_dialogue.h"
#include "ass_file.h" #include "ass_file.h"
#include "ass_style.h" #include "ass_style.h"
#include "selection_controller.h"
#include "audio_controller.h"
#include "audio_box.h" #include "audio_box.h"
#include "dialog_styling_assistant.h" #include "audio_controller.h"
#include "frame_main.h" #include "frame_main.h"
#include "help_button.h" #include "help_button.h"
#include "libresrc/libresrc.h" #include "libresrc/libresrc.h"
#include "selection_controller.h"
#include "subs_edit_box.h" #include "subs_edit_box.h"
#include "subs_grid.h" #include "subs_grid.h"
#include "utils.h" #include "utils.h"

View file

@ -54,7 +54,6 @@
#include "include/aegisub/hotkey.h" #include "include/aegisub/hotkey.h"
#include "ass_file.h" #include "ass_file.h"
#include "selection_controller.h"
#include "audio_controller.h" #include "audio_controller.h"
#include "audio_box.h" #include "audio_box.h"
#ifdef WITH_AUTOMATION #ifdef WITH_AUTOMATION

View file

@ -60,7 +60,6 @@
#include "ass_export_filter.h" #include "ass_export_filter.h"
#include "ass_file.h" #include "ass_file.h"
#include "ass_time.h" #include "ass_time.h"
#include "selection_controller.h"
#include "audio_box.h" #include "audio_box.h"
#ifdef WITH_AUTOMATION #ifdef WITH_AUTOMATION
#include "auto4_base.h" #include "auto4_base.h"

View file

@ -33,13 +33,11 @@
/// @ingroup controllers /// @ingroup controllers
/// @brief Interface declaration for the SubtitleSelectionController /// @brief Interface declaration for the SubtitleSelectionController
#pragma once
#ifndef AGI_SELECTION_CONTROLLER_H #ifndef AGI_PRE
#define AGI_SELECTION_CONTROLLER_H
#include <set> #include <set>
#endif
/// @class SelectionListener /// @class SelectionListener
/// @brief Abstract interface for classes wanting to subtitle selection change notifications /// @brief Abstract interface for classes wanting to subtitle selection change notifications
@ -66,7 +64,6 @@ public:
}; };
/// @class SelectionController /// @class SelectionController
/// @brief Abstract interface for selection controllers /// @brief Abstract interface for selection controllers
/// ///
@ -205,8 +202,6 @@ public:
} }
}; };
/// Do-nothing selection controller, can be considered to always operate on an empty subtitle file /// Do-nothing selection controller, can be considered to always operate on an empty subtitle file
template <typename ItemDataType> template <typename ItemDataType>
class DummySelectionController : public SelectionController<ItemDataType> { class DummySelectionController : public SelectionController<ItemDataType> {
@ -222,7 +217,3 @@ public:
virtual void AddSelectionListener(SelectionListener<ItemDataType> *listener) { } virtual void AddSelectionListener(SelectionListener<ItemDataType> *listener) { }
virtual void RemoveSelectionListener(SelectionListener<ItemDataType> *listener) { } virtual void RemoveSelectionListener(SelectionListener<ItemDataType> *listener) { }
}; };
#endif // include guard

View file

@ -66,7 +66,6 @@
#include "include/aegisub/context.h" #include "include/aegisub/context.h"
#include "libresrc/libresrc.h" #include "libresrc/libresrc.h"
#include "main.h" #include "main.h"
#include "selection_controller.h"
#include "subs_edit_box.h" #include "subs_edit_box.h"
#include "subs_edit_ctrl.h" #include "subs_edit_ctrl.h"
#include "subs_grid.h" #include "subs_grid.h"

View file

@ -54,13 +54,12 @@
#include "ass_karaoke.h" #include "ass_karaoke.h"
#include "ass_override.h" #include "ass_override.h"
#include "ass_style.h" #include "ass_style.h"
#include "include/aegisub/audio_provider.h"
#include "selection_controller.h"
#include "audio_controller.h"
#include "audio_box.h" #include "audio_box.h"
#include "audio_controller.h"
#include "charset_conv.h" #include "charset_conv.h"
#include "dialog_paste_over.h" #include "dialog_paste_over.h"
#include "frame_main.h" #include "frame_main.h"
#include "include/aegisub/audio_provider.h"
#include "main.h" #include "main.h"
#include "subs_edit_box.h" #include "subs_edit_box.h"
#include "subs_grid.h" #include "subs_grid.h"

View file

@ -60,7 +60,6 @@
#include "include/aegisub/hotkey.h" #include "include/aegisub/hotkey.h"
#include "video_display.h" #include "video_display.h"
#include "selection_controller.h"
#include "ass_file.h" #include "ass_file.h"
#include "main.h" #include "main.h"

View file

@ -43,7 +43,6 @@
#include "include/aegisub/context.h" #include "include/aegisub/context.h"
#include "include/aegisub/hotkey.h" #include "include/aegisub/hotkey.h"
#include "main.h" #include "main.h"
#include "selection_controller.h"
#include "subs_grid.h" #include "subs_grid.h"
#include "utils.h" #include "utils.h"
#include "video_context.h" #include "video_context.h"

View file

@ -47,7 +47,6 @@
#include "ass_time.h" #include "ass_time.h"
#include "include/aegisub/context.h" #include "include/aegisub/context.h"
#include "main.h" #include "main.h"
#include "selection_controller.h"
#include "subs_edit_box.h" #include "subs_edit_box.h"
#include "subs_grid.h" #include "subs_grid.h"
#include "utils.h" #include "utils.h"

View file

@ -47,7 +47,6 @@
#include "base_grid.h" #include "base_grid.h"
#include "gl_wrap.h" #include "gl_wrap.h"
#include "selection_controller.h"
class AssDialogue; class AssDialogue;
class SubtitlesGrid; class SubtitlesGrid;

View file

@ -53,7 +53,6 @@
#endif #endif
#include "config.h" #include "config.h"
#include "selection_controller.h"
#include "ass_dialogue.h" #include "ass_dialogue.h"
#include "libresrc/libresrc.h" #include "libresrc/libresrc.h"