diff --git a/aegisub/src/audio_box.cpp b/aegisub/src/audio_box.cpp index 3cc5e7be7..aeff79b42 100644 --- a/aegisub/src/audio_box.cpp +++ b/aegisub/src/audio_box.cpp @@ -46,7 +46,6 @@ #include -#include "selection_controller.h" #include "audio_box.h" #include "audio_controller.h" #include "audio_display.h" @@ -57,6 +56,7 @@ #include "libresrc/libresrc.h" #include "main.h" #include "toggle_bitmap.h" +#include "selection_controller.h" #include "tooltip_manager.h" #include "utils.h" diff --git a/aegisub/src/audio_controller.cpp b/aegisub/src/audio_controller.cpp index 44e7a8099..8815c5fc1 100644 --- a/aegisub/src/audio_controller.cpp +++ b/aegisub/src/audio_controller.cpp @@ -45,13 +45,13 @@ #include -#include "selection_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_timing.h" #include "compat.h" +#include "include/aegisub/audio_player.h" +#include "include/aegisub/audio_provider.h" +#include "selection_controller.h" #include "video_context.h" class AudioMarkerKeyframe : public AudioMarker { diff --git a/aegisub/src/audio_display.cpp b/aegisub/src/audio_display.cpp index 901f41144..857869a10 100644 --- a/aegisub/src/audio_display.cpp +++ b/aegisub/src/audio_display.cpp @@ -45,8 +45,6 @@ #include #endif -#include "block_cache.h" -#include "selection_controller.h" #include "ass_time.h" #include "audio_colorscheme.h" #include "audio_controller.h" @@ -55,10 +53,12 @@ #include "audio_renderer_spectrum.h" #include "audio_renderer_waveform.h" #include "audio_timing.h" +#include "block_cache.h" #include "include/aegisub/audio_player.h" #include "include/aegisub/audio_provider.h" #include "include/aegisub/hotkey.h" #include "main.h" +#include "selection_controller.h" #include "utils.h" class AudioDisplayScrollbar : public AudioDisplayInteractionObject { diff --git a/aegisub/src/audio_karaoke.cpp b/aegisub/src/audio_karaoke.cpp index 84be566da..a01db2bfa 100644 --- a/aegisub/src/audio_karaoke.cpp +++ b/aegisub/src/audio_karaoke.cpp @@ -48,11 +48,11 @@ #include #include "ass_override.h" -#include "selection_controller.h" -#include "audio_controller.h" #include "audio_box.h" +#include "audio_controller.h" #include "audio_display.h" #include "audio_karaoke.h" +#include "selection_controller.h" /// @brief Empty constructor /// diff --git a/aegisub/src/audio_renderer.h b/aegisub/src/audio_renderer.h index 9d9daac2a..738a64149 100644 --- a/aegisub/src/audio_renderer.h +++ b/aegisub/src/audio_renderer.h @@ -43,6 +43,7 @@ #include #endif +#include "block_cache.h" // Some forward declarations for outside stuff class AudioProvider; @@ -51,13 +52,6 @@ class AudioProvider; class AudioRendererBitmapProvider; class AudioRenderer; - -#ifndef AGI_BLOCK_CACHE_INCLUDED -#error You much include "block_cache.h" before "audio_renderer.h" -#endif - - - /// @class AudioRendererBitmapCacheBitmapFactory /// @brief Produces wxBitmap objects for DataBlockCache storage for the audio renderer struct AudioRendererBitmapCacheBitmapFactory { diff --git a/aegisub/src/audio_timing.h b/aegisub/src/audio_timing.h index cd2c445ad..6b3de988f 100644 --- a/aegisub/src/audio_timing.h +++ b/aegisub/src/audio_timing.h @@ -37,6 +37,8 @@ class AssDialogue; class AssFile; class AudioController; +#include "selection_controller.h" + #include /// @class AudioTimingController diff --git a/aegisub/src/audio_timing_dialogue.cpp b/aegisub/src/audio_timing_dialogue.cpp index 3eb76fca5..725472d32 100644 --- a/aegisub/src/audio_timing_dialogue.cpp +++ b/aegisub/src/audio_timing_dialogue.cpp @@ -42,14 +42,12 @@ #include "ass_dialogue.h" #include "ass_file.h" #include "ass_time.h" -#include "main.h" -#include "selection_controller.h" #include "audio_controller.h" #include "audio_timing.h" +#include "main.h" +#include "selection_controller.h" #include "utils.h" - - /// @class AudioMarkerDialogueTiming /// @brief AudioMarker implementation for AudioTimingControllerDialogue /// diff --git a/aegisub/src/base_grid.cpp b/aegisub/src/base_grid.cpp index 7c79dd1fc..d2278de66 100644 --- a/aegisub/src/base_grid.cpp +++ b/aegisub/src/base_grid.cpp @@ -54,7 +54,6 @@ #include "ass_dialogue.h" #include "ass_file.h" #include "ass_style.h" -#include "selection_controller.h" #include "compat.h" #include "frame_main.h" #include "main.h" diff --git a/aegisub/src/block_cache.h b/aegisub/src/block_cache.h index da815935e..d3e8ac5fd 100644 --- a/aegisub/src/block_cache.h +++ b/aegisub/src/block_cache.h @@ -33,17 +33,13 @@ /// @ingroup utility /// @brief Template class for creating caches for blocks of data - - +#pragma once #ifndef AGI_PRE #include #include #endif -#define AGI_BLOCK_CACHE_INCLUDED 1 - - /// @class BasicDataBlockFactory /// @brief Simple factory for allocating blocks for DataBlockCache /// @tparam BlockT Type of blocks to produce diff --git a/aegisub/src/command/audio.cpp b/aegisub/src/command/audio.cpp index 59df7d9f6..3fb32c01e 100644 --- a/aegisub/src/command/audio.cpp +++ b/aegisub/src/command/audio.cpp @@ -44,7 +44,6 @@ #include "command.h" -#include "../selection_controller.h" #include "../ass_dialogue.h" #include "../audio_controller.h" #include "../audio_timing.h" diff --git a/aegisub/src/command/time.cpp b/aegisub/src/command/time.cpp index 55c9b9802..6647f1f94 100644 --- a/aegisub/src/command/time.cpp +++ b/aegisub/src/command/time.cpp @@ -44,7 +44,6 @@ #include "command.h" -#include "../selection_controller.h" #include "../ass_dialogue.h" #include "../ass_file.h" #include "../audio_controller.h" @@ -52,6 +51,7 @@ #include "../dialog_shift_times.h" #include "../include/aegisub/context.h" #include "../main.h" +#include "../selection_controller.h" #include "../subs_grid.h" #include "../video_context.h" diff --git a/aegisub/src/dialog_styling_assistant.cpp b/aegisub/src/dialog_styling_assistant.cpp index e37dda6d2..b9079f821 100644 --- a/aegisub/src/dialog_styling_assistant.cpp +++ b/aegisub/src/dialog_styling_assistant.cpp @@ -43,19 +43,20 @@ #include #endif +#include "dialog_styling_assistant.h" + #include "include/aegisub/context.h" #include "include/aegisub/hotkey.h" #include "ass_dialogue.h" #include "ass_file.h" #include "ass_style.h" -#include "selection_controller.h" -#include "audio_controller.h" #include "audio_box.h" -#include "dialog_styling_assistant.h" +#include "audio_controller.h" #include "frame_main.h" #include "help_button.h" #include "libresrc/libresrc.h" +#include "selection_controller.h" #include "subs_edit_box.h" #include "subs_grid.h" #include "utils.h" diff --git a/aegisub/src/frame_main.cpp b/aegisub/src/frame_main.cpp index fa9a5c3e8..4ae3f817d 100644 --- a/aegisub/src/frame_main.cpp +++ b/aegisub/src/frame_main.cpp @@ -54,7 +54,6 @@ #include "include/aegisub/hotkey.h" #include "ass_file.h" -#include "selection_controller.h" #include "audio_controller.h" #include "audio_box.h" #ifdef WITH_AUTOMATION diff --git a/aegisub/src/main.cpp b/aegisub/src/main.cpp index c1acdd51e..2802bf313 100644 --- a/aegisub/src/main.cpp +++ b/aegisub/src/main.cpp @@ -60,7 +60,6 @@ #include "ass_export_filter.h" #include "ass_file.h" #include "ass_time.h" -#include "selection_controller.h" #include "audio_box.h" #ifdef WITH_AUTOMATION #include "auto4_base.h" diff --git a/aegisub/src/selection_controller.h b/aegisub/src/selection_controller.h index 466d3e2ab..13b57e9fa 100644 --- a/aegisub/src/selection_controller.h +++ b/aegisub/src/selection_controller.h @@ -33,13 +33,11 @@ /// @ingroup controllers /// @brief Interface declaration for the SubtitleSelectionController +#pragma once -#ifndef AGI_SELECTION_CONTROLLER_H -#define AGI_SELECTION_CONTROLLER_H - - +#ifndef AGI_PRE #include - +#endif /// @class SelectionListener /// @brief Abstract interface for classes wanting to subtitle selection change notifications @@ -66,7 +64,6 @@ public: }; - /// @class SelectionController /// @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 template class DummySelectionController : public SelectionController { @@ -222,7 +217,3 @@ public: virtual void AddSelectionListener(SelectionListener *listener) { } virtual void RemoveSelectionListener(SelectionListener *listener) { } }; - - - -#endif // include guard diff --git a/aegisub/src/subs_edit_box.cpp b/aegisub/src/subs_edit_box.cpp index 18970241c..2455d427a 100644 --- a/aegisub/src/subs_edit_box.cpp +++ b/aegisub/src/subs_edit_box.cpp @@ -66,7 +66,6 @@ #include "include/aegisub/context.h" #include "libresrc/libresrc.h" #include "main.h" -#include "selection_controller.h" #include "subs_edit_box.h" #include "subs_edit_ctrl.h" #include "subs_grid.h" diff --git a/aegisub/src/subs_grid.cpp b/aegisub/src/subs_grid.cpp index ed9e1355f..811ae4af3 100644 --- a/aegisub/src/subs_grid.cpp +++ b/aegisub/src/subs_grid.cpp @@ -54,13 +54,12 @@ #include "ass_karaoke.h" #include "ass_override.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_controller.h" #include "charset_conv.h" #include "dialog_paste_over.h" #include "frame_main.h" +#include "include/aegisub/audio_provider.h" #include "main.h" #include "subs_edit_box.h" #include "subs_grid.h" diff --git a/aegisub/src/video_display.cpp b/aegisub/src/video_display.cpp index d6a13e5d8..4b054df25 100644 --- a/aegisub/src/video_display.cpp +++ b/aegisub/src/video_display.cpp @@ -60,7 +60,6 @@ #include "include/aegisub/hotkey.h" #include "video_display.h" -#include "selection_controller.h" #include "ass_file.h" #include "main.h" diff --git a/aegisub/src/video_slider.cpp b/aegisub/src/video_slider.cpp index 3210de82c..fa659a35f 100644 --- a/aegisub/src/video_slider.cpp +++ b/aegisub/src/video_slider.cpp @@ -43,7 +43,6 @@ #include "include/aegisub/context.h" #include "include/aegisub/hotkey.h" #include "main.h" -#include "selection_controller.h" #include "subs_grid.h" #include "utils.h" #include "video_context.h" diff --git a/aegisub/src/visual_tool.cpp b/aegisub/src/visual_tool.cpp index b1be50192..83d122e17 100644 --- a/aegisub/src/visual_tool.cpp +++ b/aegisub/src/visual_tool.cpp @@ -47,7 +47,6 @@ #include "ass_time.h" #include "include/aegisub/context.h" #include "main.h" -#include "selection_controller.h" #include "subs_edit_box.h" #include "subs_grid.h" #include "utils.h" diff --git a/aegisub/src/visual_tool.h b/aegisub/src/visual_tool.h index ca9243627..23a77fe43 100644 --- a/aegisub/src/visual_tool.h +++ b/aegisub/src/visual_tool.h @@ -47,7 +47,6 @@ #include "base_grid.h" #include "gl_wrap.h" -#include "selection_controller.h" class AssDialogue; class SubtitlesGrid; diff --git a/aegisub/src/visual_tool_vector_clip.cpp b/aegisub/src/visual_tool_vector_clip.cpp index 8291fdcb0..ab114adbf 100644 --- a/aegisub/src/visual_tool_vector_clip.cpp +++ b/aegisub/src/visual_tool_vector_clip.cpp @@ -53,7 +53,6 @@ #endif #include "config.h" -#include "selection_controller.h" #include "ass_dialogue.h" #include "libresrc/libresrc.h"