From 7a8c5229fdf6d746c52cb9ba55ea7222bb448f85 Mon Sep 17 00:00:00 2001 From: Amar Takhar Date: Thu, 10 Sep 2009 10:26:50 +0000 Subject: [PATCH] * Remove wxprec.h from all files other than agi_pre.h. Including this in various headers is useless as it includes wx.h which includes dozens of 'common' wx headers. With this we're unable to tell which files rely on which interfaces. This commit removes them and manually places in required headers as-needed. * Update agi_pre.h to include some missing headers, also move required windowsheaders to the top of the list * Use <> versus "" for the wx header in avisynth_wrap.cpp * Remove xx/wx.h from agi_pre.h as it's included by wxprec.h. Originally committed to SVN as r3513. --- aegisub/src/aegisublocale.cpp | 1 - aegisub/src/agi_pre.h | 15 +++++++++------ aegisub/src/ass_entry.h | 1 - aegisub/src/ass_export_filter.h | 1 - aegisub/src/ass_exporter.h | 1 - aegisub/src/ass_file.h | 3 +-- aegisub/src/ass_style_storage.h | 1 - aegisub/src/ass_time.h | 1 - aegisub/src/audio_box.h | 1 - aegisub/src/audio_display.h | 2 +- aegisub/src/audio_karaoke.h | 1 - aegisub/src/audio_player.cpp | 1 - aegisub/src/audio_player_alsa.cpp | 1 - aegisub/src/audio_player_alsa.h | 1 - aegisub/src/audio_player_dsound.cpp | 1 - aegisub/src/audio_player_dsound.h | 1 - aegisub/src/audio_player_dsound2.cpp | 1 - aegisub/src/audio_player_dsound2.h | 1 - aegisub/src/audio_player_manager.h | 1 - aegisub/src/audio_player_openal.cpp | 1 - aegisub/src/audio_player_openal.h | 1 - aegisub/src/audio_player_oss.cpp | 1 - aegisub/src/audio_player_oss.h | 1 - aegisub/src/audio_player_pulse.cpp | 1 - aegisub/src/audio_player_pulse.h | 1 - aegisub/src/audio_provider.cpp | 1 - aegisub/src/audio_provider_avs.cpp | 1 - aegisub/src/audio_provider_avs.h | 1 - aegisub/src/audio_provider_ffmpegsource.h | 1 - aegisub/src/audio_provider_manager.h | 1 - aegisub/src/audio_provider_quicktime.h | 1 - aegisub/src/audio_renderer_spectrum.h | 1 - aegisub/src/auto4_lua.cpp | 1 + aegisub/src/auto4_lua_assfile.cpp | 1 + aegisub/src/auto4_lua_dialog.cpp | 5 +++++ aegisub/src/auto4_lua_scriptreader.h | 3 ++- aegisub/src/avisynth_wrap.cpp | 2 +- aegisub/src/avisynth_wrap.h | 1 - aegisub/src/base_grid.h | 2 +- aegisub/src/browse_button.h | 1 - aegisub/src/charset_detect.cpp | 1 - aegisub/src/charset_detect.h | 1 - aegisub/src/colorspace.h | 1 - aegisub/src/colour_button.h | 1 - aegisub/src/dialog_about.cpp | 2 ++ aegisub/src/dialog_about.h | 1 - aegisub/src/dialog_associations.h | 1 - aegisub/src/dialog_attachments.h | 1 - aegisub/src/dialog_colorpicker.cpp | 1 + aegisub/src/dialog_detached_video.cpp | 1 - aegisub/src/dialog_dummy_video.h | 1 + aegisub/src/dialog_export.h | 1 - aegisub/src/dialog_fonts_collector.h | 7 +++++-- aegisub/src/dialog_jumpto.h | 1 - aegisub/src/dialog_kara_timing_copy.h | 1 - aegisub/src/dialog_options.h | 1 - aegisub/src/dialog_paste_over.h | 1 - aegisub/src/dialog_progress.h | 1 - aegisub/src/dialog_properties.h | 1 - aegisub/src/dialog_resample.h | 1 - aegisub/src/dialog_search_replace.cpp | 1 - aegisub/src/dialog_search_replace.h | 1 - aegisub/src/dialog_selection.cpp | 1 - aegisub/src/dialog_selection.h | 1 - aegisub/src/dialog_spellchecker.h | 1 - aegisub/src/dialog_splash.cpp | 2 +- aegisub/src/dialog_splash.h | 1 - aegisub/src/dialog_style_editor.h | 2 +- aegisub/src/dialog_style_manager.h | 1 - aegisub/src/dialog_styling_assistant.h | 1 - aegisub/src/dialog_timing_processor.h | 1 - aegisub/src/dialog_tip.cpp | 1 - aegisub/src/dialog_translation.cpp | 1 - aegisub/src/dialog_translation.h | 5 ++++- aegisub/src/dialog_version_check.h | 1 - aegisub/src/dialog_video_details.cpp | 1 + aegisub/src/drop.h | 1 - aegisub/src/export_framerate.h | 1 + aegisub/src/ffmpegsource_common.cpp | 2 +- aegisub/src/font_file_lister.h | 1 - aegisub/src/font_file_lister_fontconfig.cpp | 1 - aegisub/src/frame_main.cpp | 1 - aegisub/src/frame_main.h | 1 - aegisub/src/frame_main_events.cpp | 1 - aegisub/src/gl_text.h | 1 - aegisub/src/gl_wrap.cpp | 1 - aegisub/src/help_button.cpp | 1 - aegisub/src/help_button.h | 1 - aegisub/src/hilimod_textctrl.h | 1 - aegisub/src/hotkeys.cpp | 1 + aegisub/src/hotkeys.h | 1 - aegisub/src/idle_field_event.h | 2 +- aegisub/src/include/aegisub/audio_player.h | 1 - aegisub/src/include/aegisub/video_provider.h | 1 - aegisub/src/kana_table.h | 1 - aegisub/src/main.cpp | 1 - aegisub/src/main.h | 1 - aegisub/src/mkv_wrap.h | 1 - aegisub/src/options.cpp | 3 +++ aegisub/src/options.h | 1 - aegisub/src/quicktime_common.cpp | 1 - aegisub/src/quicktime_common.h | 1 - aegisub/src/scintilla_text_ctrl.h | 1 - aegisub/src/setup.cpp | 1 - aegisub/src/spellchecker_hunspell.cpp | 4 +--- aegisub/src/spellchecker_hunspell.h | 1 - aegisub/src/spellchecker_manager.h | 1 - aegisub/src/spline.h | 1 - aegisub/src/standard_paths.h | 1 - aegisub/src/static_bmp.h | 1 - aegisub/src/string_codec.h | 1 - aegisub/src/subs_edit_box.h | 8 +++++++- aegisub/src/subs_edit_ctrl.cpp | 1 - aegisub/src/subs_edit_ctrl.h | 1 - aegisub/src/subs_preview.h | 1 - aegisub/src/subtitle_format.h | 1 - aegisub/src/subtitles_provider_csri.cpp | 1 - aegisub/src/subtitles_provider_csri.h | 1 - aegisub/src/subtitles_provider_manager.h | 1 - aegisub/src/text_file_reader.h | 1 - aegisub/src/text_file_writer.h | 1 - aegisub/src/thesaurus.h | 1 - aegisub/src/thesaurus_myspell.cpp | 1 - aegisub/src/timeedit_ctrl.cpp | 1 + aegisub/src/timeedit_ctrl.h | 1 - aegisub/src/toggle_bitmap.cpp | 1 - aegisub/src/toggle_bitmap.h | 2 +- aegisub/src/tooltip_manager.h | 1 - aegisub/src/utils.cpp | 1 - aegisub/src/utils.h | 1 + aegisub/src/validators.h | 1 - aegisub/src/variable_data.h | 1 - aegisub/src/vfr.h | 1 - aegisub/src/vfw_wrap.h | 1 - aegisub/src/video_box.cpp | 1 - aegisub/src/video_box.h | 1 - aegisub/src/video_context.h | 1 - aegisub/src/video_display.cpp | 3 +++ aegisub/src/video_display.h | 2 +- aegisub/src/video_provider_avs.cpp | 1 - aegisub/src/video_provider_avs.h | 1 - aegisub/src/video_provider_ffmpegsource.cpp | 1 + aegisub/src/video_provider_ffmpegsource.h | 1 - aegisub/src/video_provider_quicktime.h | 1 - aegisub/src/video_provider_yuv4mpeg.h | 1 - aegisub/src/video_slider.cpp | 1 - aegisub/src/video_slider.h | 1 - aegisub/src/visual_tool.cpp | 1 - 148 files changed, 61 insertions(+), 143 deletions(-) diff --git a/aegisub/src/aegisublocale.cpp b/aegisub/src/aegisublocale.cpp index 297a205e2..ffa3ed21c 100644 --- a/aegisub/src/aegisublocale.cpp +++ b/aegisub/src/aegisublocale.cpp @@ -39,7 +39,6 @@ // Headers #include "config.h" -#include #include #include #include diff --git a/aegisub/src/agi_pre.h b/aegisub/src/agi_pre.h index 54b02f949..c90be4217 100644 --- a/aegisub/src/agi_pre.h +++ b/aegisub/src/agi_pre.h @@ -106,8 +106,14 @@ ///////////////////// // wxWidgets headers -#include +#include // Leave this first. +// Windows +#ifdef __WXMSW__ +#include +#endif + +// All platforms. #include #include #include @@ -125,6 +131,7 @@ #include #include #include +#include #include #include #include @@ -154,6 +161,7 @@ #include #include #include +#include #include #include #include @@ -165,9 +173,6 @@ #include #include #include -#ifdef __WXMSW__ -#include -#endif #include #include #include @@ -207,8 +212,6 @@ #include #include #include -#include -#include #include #include diff --git a/aegisub/src/ass_entry.h b/aegisub/src/ass_entry.h index 50a18381d..1bdd9138b 100644 --- a/aegisub/src/ass_entry.h +++ b/aegisub/src/ass_entry.h @@ -40,7 +40,6 @@ /////////// // Headers -#include #include #include "include/aegisub/exception.h" diff --git a/aegisub/src/ass_export_filter.h b/aegisub/src/ass_export_filter.h index 441260b5d..ad5720569 100644 --- a/aegisub/src/ass_export_filter.h +++ b/aegisub/src/ass_export_filter.h @@ -40,7 +40,6 @@ /////////// // Headers -#include #include #include #include diff --git a/aegisub/src/ass_exporter.h b/aegisub/src/ass_exporter.h index ecde295d5..d73e320fc 100644 --- a/aegisub/src/ass_exporter.h +++ b/aegisub/src/ass_exporter.h @@ -40,7 +40,6 @@ /////////// // Headers -#include #include #include #include diff --git a/aegisub/src/ass_file.h b/aegisub/src/ass_file.h index be6c03419..654d764a9 100644 --- a/aegisub/src/ass_file.h +++ b/aegisub/src/ass_file.h @@ -40,11 +40,10 @@ /////////// // Headers -#include #include #include #include - +#include ////////////// // Prototypes diff --git a/aegisub/src/ass_style_storage.h b/aegisub/src/ass_style_storage.h index 3442299c4..cb3eec725 100644 --- a/aegisub/src/ass_style_storage.h +++ b/aegisub/src/ass_style_storage.h @@ -43,7 +43,6 @@ //////////// // Includes -#include #include #include diff --git a/aegisub/src/ass_time.h b/aegisub/src/ass_time.h index 801a09ee4..a0737034e 100644 --- a/aegisub/src/ass_time.h +++ b/aegisub/src/ass_time.h @@ -40,7 +40,6 @@ /////////// // Headers -#include #include #include diff --git a/aegisub/src/audio_box.h b/aegisub/src/audio_box.h index dc2643831..48c641e2e 100644 --- a/aegisub/src/audio_box.h +++ b/aegisub/src/audio_box.h @@ -43,7 +43,6 @@ /////////// // Headers -#include #include #include #include diff --git a/aegisub/src/audio_display.h b/aegisub/src/audio_display.h index 7eb459358..54a9d6684 100644 --- a/aegisub/src/audio_display.h +++ b/aegisub/src/audio_display.h @@ -43,9 +43,9 @@ /////////// // Headers -#include #include #include +#include #include #include "audio_provider_manager.h" #include "audio_player_manager.h" diff --git a/aegisub/src/audio_karaoke.h b/aegisub/src/audio_karaoke.h index c280ba55f..d22d256d2 100644 --- a/aegisub/src/audio_karaoke.h +++ b/aegisub/src/audio_karaoke.h @@ -43,7 +43,6 @@ /////////// // Headers -#include #include #include #include diff --git a/aegisub/src/audio_player.cpp b/aegisub/src/audio_player.cpp index db5e2d9a8..d9718fea9 100644 --- a/aegisub/src/audio_player.cpp +++ b/aegisub/src/audio_player.cpp @@ -39,7 +39,6 @@ // Headers #include "config.h" -#include #include "audio_player_manager.h" #include "options.h" #ifdef WITH_ALSA diff --git a/aegisub/src/audio_player_alsa.cpp b/aegisub/src/audio_player_alsa.cpp index e09ca0968..51a951e67 100644 --- a/aegisub/src/audio_player_alsa.cpp +++ b/aegisub/src/audio_player_alsa.cpp @@ -42,7 +42,6 @@ /////////// // Headers -#include #include "audio_player_manager.h" #include "audio_provider_manager.h" #include "utils.h" diff --git a/aegisub/src/audio_player_alsa.h b/aegisub/src/audio_player_alsa.h index 70c907137..f6668f500 100644 --- a/aegisub/src/audio_player_alsa.h +++ b/aegisub/src/audio_player_alsa.h @@ -40,7 +40,6 @@ /////////// // Headers -#include #include "include/aegisub/audio_player.h" #include "include/aegisub/audio_provider.h" #include "utils.h" diff --git a/aegisub/src/audio_player_dsound.cpp b/aegisub/src/audio_player_dsound.cpp index f38547ba0..de870a472 100644 --- a/aegisub/src/audio_player_dsound.cpp +++ b/aegisub/src/audio_player_dsound.cpp @@ -41,7 +41,6 @@ #ifdef WITH_DIRECTSOUND -#include #include "utils.h" #include "main.h" #include "frame_main.h" diff --git a/aegisub/src/audio_player_dsound.h b/aegisub/src/audio_player_dsound.h index 43a4da91f..57fb5ec85 100644 --- a/aegisub/src/audio_player_dsound.h +++ b/aegisub/src/audio_player_dsound.h @@ -39,7 +39,6 @@ // Headers #ifdef WITH_DIRECTSOUND -#include #include "include/aegisub/audio_player.h" #include "include/aegisub/audio_provider.h" #include "utils.h" diff --git a/aegisub/src/audio_player_dsound2.cpp b/aegisub/src/audio_player_dsound2.cpp index 8d81ffe3d..0ed81da35 100644 --- a/aegisub/src/audio_player_dsound2.cpp +++ b/aegisub/src/audio_player_dsound2.cpp @@ -41,7 +41,6 @@ #ifdef WITH_DIRECTSOUND -#include #include #include #include diff --git a/aegisub/src/audio_player_dsound2.h b/aegisub/src/audio_player_dsound2.h index d8185d272..344f4c5af 100644 --- a/aegisub/src/audio_player_dsound2.h +++ b/aegisub/src/audio_player_dsound2.h @@ -37,7 +37,6 @@ #ifdef WITH_DIRECTSOUND -#include #include "include/aegisub/audio_player.h" diff --git a/aegisub/src/audio_player_manager.h b/aegisub/src/audio_player_manager.h index 304bb0ea7..464630456 100644 --- a/aegisub/src/audio_player_manager.h +++ b/aegisub/src/audio_player_manager.h @@ -40,7 +40,6 @@ /////////// // Headers -#include #include #include #include diff --git a/aegisub/src/audio_player_openal.cpp b/aegisub/src/audio_player_openal.cpp index 9dd05c8a6..5715bf645 100644 --- a/aegisub/src/audio_player_openal.cpp +++ b/aegisub/src/audio_player_openal.cpp @@ -42,7 +42,6 @@ /////////// // Headers -#include #include "audio_player_manager.h" #include "audio_provider_manager.h" #include "utils.h" diff --git a/aegisub/src/audio_player_openal.h b/aegisub/src/audio_player_openal.h index 25f07b4d7..c9323a1be 100644 --- a/aegisub/src/audio_player_openal.h +++ b/aegisub/src/audio_player_openal.h @@ -40,7 +40,6 @@ /////////// // Headers -#include #include "include/aegisub/audio_player.h" #include "include/aegisub/audio_provider.h" #include "utils.h" diff --git a/aegisub/src/audio_player_oss.cpp b/aegisub/src/audio_player_oss.cpp index b4fc3c3db..ac5466b2e 100644 --- a/aegisub/src/audio_player_oss.cpp +++ b/aegisub/src/audio_player_oss.cpp @@ -39,7 +39,6 @@ /////////// // Headers -#include #include "audio_player_manager.h" #include "audio_provider_manager.h" #include "utils.h" diff --git a/aegisub/src/audio_player_oss.h b/aegisub/src/audio_player_oss.h index fea6a5987..80841da15 100644 --- a/aegisub/src/audio_player_oss.h +++ b/aegisub/src/audio_player_oss.h @@ -41,7 +41,6 @@ /////////// // Headers -#include #include #include #ifdef HAVE_SOUNDCARD_H diff --git a/aegisub/src/audio_player_pulse.cpp b/aegisub/src/audio_player_pulse.cpp index 503529b2f..b36ca728e 100644 --- a/aegisub/src/audio_player_pulse.cpp +++ b/aegisub/src/audio_player_pulse.cpp @@ -42,7 +42,6 @@ /////////// // Headers -#include #include #include "audio_player_pulse.h" #include "audio_provider_manager.h" diff --git a/aegisub/src/audio_player_pulse.h b/aegisub/src/audio_player_pulse.h index b51f4b5ca..ee8c8e88c 100644 --- a/aegisub/src/audio_player_pulse.h +++ b/aegisub/src/audio_player_pulse.h @@ -40,7 +40,6 @@ /////////// // Headers -#include #include #include "include/aegisub/audio_player.h" #include "include/aegisub/audio_provider.h" diff --git a/aegisub/src/audio_provider.cpp b/aegisub/src/audio_provider.cpp index 05833571d..7a009ba62 100644 --- a/aegisub/src/audio_provider.cpp +++ b/aegisub/src/audio_provider.cpp @@ -39,7 +39,6 @@ // Headers #include "config.h" -#include #include #include "audio_provider_ram.h" #include "audio_provider_hd.h" diff --git a/aegisub/src/audio_provider_avs.cpp b/aegisub/src/audio_provider_avs.cpp index 6df5c8056..ac21182a3 100644 --- a/aegisub/src/audio_provider_avs.cpp +++ b/aegisub/src/audio_provider_avs.cpp @@ -39,7 +39,6 @@ // Headers #include "config.h" -#include #ifdef WITH_AVISYNTH #include #include diff --git a/aegisub/src/audio_provider_avs.h b/aegisub/src/audio_provider_avs.h index f056e95f5..7522ecadf 100644 --- a/aegisub/src/audio_provider_avs.h +++ b/aegisub/src/audio_provider_avs.h @@ -37,7 +37,6 @@ /////////// // Headers -#include #ifdef WITH_AVISYNTH #include #include "include/aegisub/audio_provider.h" diff --git a/aegisub/src/audio_provider_ffmpegsource.h b/aegisub/src/audio_provider_ffmpegsource.h index 89a3c5040..353bb44fc 100644 --- a/aegisub/src/audio_provider_ffmpegsource.h +++ b/aegisub/src/audio_provider_ffmpegsource.h @@ -36,7 +36,6 @@ /////////// // Headers -#include #ifdef WITH_FFMPEGSOURCE #include "include/aegisub/audio_provider.h" #include "ffmpegsource_common.h" diff --git a/aegisub/src/audio_provider_manager.h b/aegisub/src/audio_provider_manager.h index 64a38e659..eb25cd831 100644 --- a/aegisub/src/audio_provider_manager.h +++ b/aegisub/src/audio_provider_manager.h @@ -40,7 +40,6 @@ /////////// // Headers -#include #include #include "factory_manager.h" #include "include/aegisub/audio_provider.h" diff --git a/aegisub/src/audio_provider_quicktime.h b/aegisub/src/audio_provider_quicktime.h index 843e0fad8..e0c62f14f 100644 --- a/aegisub/src/audio_provider_quicktime.h +++ b/aegisub/src/audio_provider_quicktime.h @@ -40,7 +40,6 @@ #include "quicktime_common.h" #ifdef WITH_QUICKTIME -#include #include #include "include/aegisub/audio_provider.h" diff --git a/aegisub/src/audio_renderer_spectrum.h b/aegisub/src/audio_renderer_spectrum.h index 257722ab7..dfbd4b2a9 100644 --- a/aegisub/src/audio_renderer_spectrum.h +++ b/aegisub/src/audio_renderer_spectrum.h @@ -42,7 +42,6 @@ /// Include guard for audio_spectrum.h #define AUDIO_SPECTRUM_H -#include #include #include "audio_provider_manager.h" diff --git a/aegisub/src/auto4_lua.cpp b/aegisub/src/auto4_lua.cpp index a0e77af66..acbf0988c 100644 --- a/aegisub/src/auto4_lua.cpp +++ b/aegisub/src/auto4_lua.cpp @@ -63,6 +63,7 @@ #include #include #include +#include #include #include diff --git a/aegisub/src/auto4_lua_assfile.cpp b/aegisub/src/auto4_lua_assfile.cpp index d5d45fa97..8725b3b4d 100644 --- a/aegisub/src/auto4_lua_assfile.cpp +++ b/aegisub/src/auto4_lua_assfile.cpp @@ -53,6 +53,7 @@ #include "lauxlib.h" #endif +#include #include #include diff --git a/aegisub/src/auto4_lua_dialog.cpp b/aegisub/src/auto4_lua_dialog.cpp index fe98ff5a1..8c4b5902e 100644 --- a/aegisub/src/auto4_lua_dialog.cpp +++ b/aegisub/src/auto4_lua_dialog.cpp @@ -57,6 +57,11 @@ #include #include #include +#include +#include +#include +#include + #include #include "colour_button.h" #include "ass_style.h" diff --git a/aegisub/src/auto4_lua_scriptreader.h b/aegisub/src/auto4_lua_scriptreader.h index 782ddb3a6..b2cb526da 100644 --- a/aegisub/src/auto4_lua_scriptreader.h +++ b/aegisub/src/auto4_lua_scriptreader.h @@ -36,7 +36,8 @@ #pragma once -#include +#include + #ifdef __WINDOWS__ #include "../../contrib/lua51/src/lua.h" #else diff --git a/aegisub/src/avisynth_wrap.cpp b/aegisub/src/avisynth_wrap.cpp index bd10827ba..0591a28ae 100644 --- a/aegisub/src/avisynth_wrap.cpp +++ b/aegisub/src/avisynth_wrap.cpp @@ -46,7 +46,7 @@ #ifdef DEBUG_AVISYNTH_CODE #include "main.h" -#include "wx/textfile.h" +#include /// DOCME wxTextFile avs_trace_file; diff --git a/aegisub/src/avisynth_wrap.h b/aegisub/src/avisynth_wrap.h index f1034756d..c8812597a 100644 --- a/aegisub/src/avisynth_wrap.h +++ b/aegisub/src/avisynth_wrap.h @@ -43,7 +43,6 @@ /////////// // Headers -#include #ifdef WITH_AVISYNTH #include diff --git a/aegisub/src/base_grid.h b/aegisub/src/base_grid.h index f77694017..26b893cb3 100644 --- a/aegisub/src/base_grid.h +++ b/aegisub/src/base_grid.h @@ -40,8 +40,8 @@ //////////// // Includes -#include #include +#include #include #include diff --git a/aegisub/src/browse_button.h b/aegisub/src/browse_button.h index 7b11e3275..4432d1c17 100644 --- a/aegisub/src/browse_button.h +++ b/aegisub/src/browse_button.h @@ -40,7 +40,6 @@ //////////// // Includes -#include #include #include diff --git a/aegisub/src/charset_detect.cpp b/aegisub/src/charset_detect.cpp index 74a8d2968..89de5ad6b 100644 --- a/aegisub/src/charset_detect.cpp +++ b/aegisub/src/charset_detect.cpp @@ -41,7 +41,6 @@ #ifdef WITH_UNIVCHARDET #include -#include #include #include diff --git a/aegisub/src/charset_detect.h b/aegisub/src/charset_detect.h index 74640e467..66f690e4e 100644 --- a/aegisub/src/charset_detect.h +++ b/aegisub/src/charset_detect.h @@ -39,7 +39,6 @@ /////////// // Headers -#include #include "../universalchardet/nsUniversalDetector.h" diff --git a/aegisub/src/colorspace.h b/aegisub/src/colorspace.h index 578526945..e42b7f1c0 100644 --- a/aegisub/src/colorspace.h +++ b/aegisub/src/colorspace.h @@ -39,7 +39,6 @@ /// DOCME #define COLORSPACE_H -#include #include #include diff --git a/aegisub/src/colour_button.h b/aegisub/src/colour_button.h index b78bea953..20c681ea9 100644 --- a/aegisub/src/colour_button.h +++ b/aegisub/src/colour_button.h @@ -40,7 +40,6 @@ //////////// // Includes -#include #include diff --git a/aegisub/src/dialog_about.cpp b/aegisub/src/dialog_about.cpp index 780c017de..de2b72030 100644 --- a/aegisub/src/dialog_about.cpp +++ b/aegisub/src/dialog_about.cpp @@ -43,6 +43,8 @@ #include #include #include +#include +#include #include "dialog_about.h" #include "version.h" #include "options.h" diff --git a/aegisub/src/dialog_about.h b/aegisub/src/dialog_about.h index c314aefc0..a14b4b988 100644 --- a/aegisub/src/dialog_about.h +++ b/aegisub/src/dialog_about.h @@ -40,7 +40,6 @@ //////////// // Includes -#include #include #include "static_bmp.h" diff --git a/aegisub/src/dialog_associations.h b/aegisub/src/dialog_associations.h index ae3ba0453..d9c427c56 100644 --- a/aegisub/src/dialog_associations.h +++ b/aegisub/src/dialog_associations.h @@ -40,7 +40,6 @@ /////////// // Headers -#include #include #include #include diff --git a/aegisub/src/dialog_attachments.h b/aegisub/src/dialog_attachments.h index ba90080a2..867fd7bac 100644 --- a/aegisub/src/dialog_attachments.h +++ b/aegisub/src/dialog_attachments.h @@ -40,7 +40,6 @@ /////////// // Headers -#include ////////////// diff --git a/aegisub/src/dialog_colorpicker.cpp b/aegisub/src/dialog_colorpicker.cpp index 0eecd890f..e0917b4f4 100644 --- a/aegisub/src/dialog_colorpicker.cpp +++ b/aegisub/src/dialog_colorpicker.cpp @@ -48,6 +48,7 @@ #include #include #include +#include #include "dialog_colorpicker.h" #include "colorspace.h" #include "ass_style.h" diff --git a/aegisub/src/dialog_detached_video.cpp b/aegisub/src/dialog_detached_video.cpp index 898de9a71..9bd938229 100644 --- a/aegisub/src/dialog_detached_video.cpp +++ b/aegisub/src/dialog_detached_video.cpp @@ -39,7 +39,6 @@ // Headers #include "config.h" -#include #include #include "dialog_detached_video.h" #include "video_box.h" diff --git a/aegisub/src/dialog_dummy_video.h b/aegisub/src/dialog_dummy_video.h index 0b5b2f884..17197b9f6 100644 --- a/aegisub/src/dialog_dummy_video.h +++ b/aegisub/src/dialog_dummy_video.h @@ -45,6 +45,7 @@ #include #include #include +#include #include "video_provider_dummy.h" #include "colour_button.h" diff --git a/aegisub/src/dialog_export.h b/aegisub/src/dialog_export.h index cb96d2ed8..f9f03efe1 100644 --- a/aegisub/src/dialog_export.h +++ b/aegisub/src/dialog_export.h @@ -40,7 +40,6 @@ /////////// // Headers -#include #include #include #include diff --git a/aegisub/src/dialog_fonts_collector.h b/aegisub/src/dialog_fonts_collector.h index 527bfb76f..28dd05ef7 100644 --- a/aegisub/src/dialog_fonts_collector.h +++ b/aegisub/src/dialog_fonts_collector.h @@ -40,9 +40,12 @@ //////////// // Includes -#include #include - +#include +#include +#include +#include +#include ////////////// // Prototypes diff --git a/aegisub/src/dialog_jumpto.h b/aegisub/src/dialog_jumpto.h index a240e52d2..118b569a5 100644 --- a/aegisub/src/dialog_jumpto.h +++ b/aegisub/src/dialog_jumpto.h @@ -43,7 +43,6 @@ /////////// // Headers -#include #include "ass_time.h" #include "timeedit_ctrl.h" diff --git a/aegisub/src/dialog_kara_timing_copy.h b/aegisub/src/dialog_kara_timing_copy.h index 08a7540cc..87094a0dc 100644 --- a/aegisub/src/dialog_kara_timing_copy.h +++ b/aegisub/src/dialog_kara_timing_copy.h @@ -43,7 +43,6 @@ /////////// // Headers -#include #include #include #include diff --git a/aegisub/src/dialog_options.h b/aegisub/src/dialog_options.h index ae673aaa8..f973f0f11 100644 --- a/aegisub/src/dialog_options.h +++ b/aegisub/src/dialog_options.h @@ -40,7 +40,6 @@ //////////// // Includes -#include #include #include #include diff --git a/aegisub/src/dialog_paste_over.h b/aegisub/src/dialog_paste_over.h index c987897e1..5299a2274 100644 --- a/aegisub/src/dialog_paste_over.h +++ b/aegisub/src/dialog_paste_over.h @@ -40,7 +40,6 @@ /////////// // Headers -#include #include #include diff --git a/aegisub/src/dialog_progress.h b/aegisub/src/dialog_progress.h index d8095942a..64f0cdb84 100644 --- a/aegisub/src/dialog_progress.h +++ b/aegisub/src/dialog_progress.h @@ -43,7 +43,6 @@ /////////// // Headers -#include #include #include #include diff --git a/aegisub/src/dialog_properties.h b/aegisub/src/dialog_properties.h index 967764608..063337c47 100644 --- a/aegisub/src/dialog_properties.h +++ b/aegisub/src/dialog_properties.h @@ -40,7 +40,6 @@ /////////// // Headers -#include #include #include #include diff --git a/aegisub/src/dialog_resample.h b/aegisub/src/dialog_resample.h index 76f6501c0..25473a1ff 100644 --- a/aegisub/src/dialog_resample.h +++ b/aegisub/src/dialog_resample.h @@ -43,7 +43,6 @@ /////////// // Headers -#include #include #include #include diff --git a/aegisub/src/dialog_search_replace.cpp b/aegisub/src/dialog_search_replace.cpp index f3fec807e..8065d3f85 100644 --- a/aegisub/src/dialog_search_replace.cpp +++ b/aegisub/src/dialog_search_replace.cpp @@ -39,7 +39,6 @@ // Headers #include "config.h" -#include #include #include #include "dialog_search_replace.h" diff --git a/aegisub/src/dialog_search_replace.h b/aegisub/src/dialog_search_replace.h index 487c26b81..852418e3e 100644 --- a/aegisub/src/dialog_search_replace.h +++ b/aegisub/src/dialog_search_replace.h @@ -40,7 +40,6 @@ /////////// // Headers -#include #include #include #include diff --git a/aegisub/src/dialog_selection.cpp b/aegisub/src/dialog_selection.cpp index 78ca85060..714022208 100644 --- a/aegisub/src/dialog_selection.cpp +++ b/aegisub/src/dialog_selection.cpp @@ -39,7 +39,6 @@ // Headers #include "config.h" -#include #include #include #include "dialog_selection.h" diff --git a/aegisub/src/dialog_selection.h b/aegisub/src/dialog_selection.h index 8ede8fb47..53ac9defc 100644 --- a/aegisub/src/dialog_selection.h +++ b/aegisub/src/dialog_selection.h @@ -43,7 +43,6 @@ /////////// // Headers -#include #include #include #include diff --git a/aegisub/src/dialog_spellchecker.h b/aegisub/src/dialog_spellchecker.h index 26f07ada3..39d46e597 100644 --- a/aegisub/src/dialog_spellchecker.h +++ b/aegisub/src/dialog_spellchecker.h @@ -38,7 +38,6 @@ /////////// // Headers -#include #include #include #include diff --git a/aegisub/src/dialog_splash.cpp b/aegisub/src/dialog_splash.cpp index e04df9f14..758a58892 100644 --- a/aegisub/src/dialog_splash.cpp +++ b/aegisub/src/dialog_splash.cpp @@ -39,7 +39,7 @@ // Includes #include "config.h" -#include +#include #include #include #include "dialog_splash.h" diff --git a/aegisub/src/dialog_splash.h b/aegisub/src/dialog_splash.h index e67666cb0..141589c8b 100644 --- a/aegisub/src/dialog_splash.h +++ b/aegisub/src/dialog_splash.h @@ -43,7 +43,6 @@ //////////// // Includes -#include #include #include diff --git a/aegisub/src/dialog_style_editor.h b/aegisub/src/dialog_style_editor.h index 417e7379b..714966d76 100644 --- a/aegisub/src/dialog_style_editor.h +++ b/aegisub/src/dialog_style_editor.h @@ -43,11 +43,11 @@ //////////// // Includes -#include #include #include #include #include +#include #include "colour_button.h" diff --git a/aegisub/src/dialog_style_manager.h b/aegisub/src/dialog_style_manager.h index 46aec7e23..d7e73c63a 100644 --- a/aegisub/src/dialog_style_manager.h +++ b/aegisub/src/dialog_style_manager.h @@ -43,7 +43,6 @@ //////////// // Includes -#include #include #include #include diff --git a/aegisub/src/dialog_styling_assistant.h b/aegisub/src/dialog_styling_assistant.h index 6724b3c84..bbe42af4c 100644 --- a/aegisub/src/dialog_styling_assistant.h +++ b/aegisub/src/dialog_styling_assistant.h @@ -43,7 +43,6 @@ /////////// // Headers -#include #include #include #include diff --git a/aegisub/src/dialog_timing_processor.h b/aegisub/src/dialog_timing_processor.h index 5417510a9..ee7792759 100644 --- a/aegisub/src/dialog_timing_processor.h +++ b/aegisub/src/dialog_timing_processor.h @@ -42,7 +42,6 @@ /////////// // Headers -#include #include #include #include diff --git a/aegisub/src/dialog_tip.cpp b/aegisub/src/dialog_tip.cpp index cde71194e..dd3105138 100644 --- a/aegisub/src/dialog_tip.cpp +++ b/aegisub/src/dialog_tip.cpp @@ -39,7 +39,6 @@ // Headers #include "config.h" -#include #include #include #include "dialog_tip.h" diff --git a/aegisub/src/dialog_translation.cpp b/aegisub/src/dialog_translation.cpp index 575dbd63a..327b58272 100644 --- a/aegisub/src/dialog_translation.cpp +++ b/aegisub/src/dialog_translation.cpp @@ -39,7 +39,6 @@ // Headers #include "config.h" -#include #include #include "dialog_translation.h" #include "ass_dialogue.h" diff --git a/aegisub/src/dialog_translation.h b/aegisub/src/dialog_translation.h index 5b6ba4d54..9c2ccd09d 100644 --- a/aegisub/src/dialog_translation.h +++ b/aegisub/src/dialog_translation.h @@ -43,7 +43,10 @@ /////////// // Headers -#include +#include +#include +#include + #include "scintilla_text_ctrl.h" diff --git a/aegisub/src/dialog_version_check.h b/aegisub/src/dialog_version_check.h index ee34b655e..87ca14334 100644 --- a/aegisub/src/dialog_version_check.h +++ b/aegisub/src/dialog_version_check.h @@ -40,7 +40,6 @@ /////////// // Headers -#include #include #include #include diff --git a/aegisub/src/dialog_video_details.cpp b/aegisub/src/dialog_video_details.cpp index 53df5de87..00728500a 100644 --- a/aegisub/src/dialog_video_details.cpp +++ b/aegisub/src/dialog_video_details.cpp @@ -39,6 +39,7 @@ // Headers #include "config.h" +#include #include "dialog_video_details.h" #include "video_context.h" #include "video_provider_manager.h" diff --git a/aegisub/src/drop.h b/aegisub/src/drop.h index b501baf8a..f403c5a13 100644 --- a/aegisub/src/drop.h +++ b/aegisub/src/drop.h @@ -43,7 +43,6 @@ /////////// // Headers -#include #include diff --git a/aegisub/src/export_framerate.h b/aegisub/src/export_framerate.h index 3a86d0edd..bf3639058 100644 --- a/aegisub/src/export_framerate.h +++ b/aegisub/src/export_framerate.h @@ -46,6 +46,7 @@ #include #include #include +#include #include "ass_export_filter.h" #include "vfr.h" diff --git a/aegisub/src/ffmpegsource_common.cpp b/aegisub/src/ffmpegsource_common.cpp index df4b3454f..05a0559e6 100644 --- a/aegisub/src/ffmpegsource_common.cpp +++ b/aegisub/src/ffmpegsource_common.cpp @@ -40,8 +40,8 @@ /////////// // Headers -#include #include +#include #include "ffmpegsource_common.h" #include "md5.h" #include "standard_paths.h" diff --git a/aegisub/src/font_file_lister.h b/aegisub/src/font_file_lister.h index 499ba43c5..509907e00 100644 --- a/aegisub/src/font_file_lister.h +++ b/aegisub/src/font_file_lister.h @@ -40,7 +40,6 @@ //////////// // Includes -#include #include #include #include diff --git a/aegisub/src/font_file_lister_fontconfig.cpp b/aegisub/src/font_file_lister_fontconfig.cpp index 40b8b99af..6d1d25bba 100644 --- a/aegisub/src/font_file_lister_fontconfig.cpp +++ b/aegisub/src/font_file_lister_fontconfig.cpp @@ -39,7 +39,6 @@ // Includes #include "config.h" -#include #ifndef WIN32 #include "font_file_lister_fontconfig.h" #include "charset_conv.h" diff --git a/aegisub/src/frame_main.cpp b/aegisub/src/frame_main.cpp index e43a493e1..7780dddb7 100644 --- a/aegisub/src/frame_main.cpp +++ b/aegisub/src/frame_main.cpp @@ -39,7 +39,6 @@ // Include headers #include "config.h" -#include #include #include #include diff --git a/aegisub/src/frame_main.h b/aegisub/src/frame_main.h index ce5530286..4e6680210 100644 --- a/aegisub/src/frame_main.h +++ b/aegisub/src/frame_main.h @@ -43,7 +43,6 @@ /////////////////// // Include headers -#include #include #include #include diff --git a/aegisub/src/frame_main_events.cpp b/aegisub/src/frame_main_events.cpp index bd3ba9f92..8a57aafaa 100644 --- a/aegisub/src/frame_main_events.cpp +++ b/aegisub/src/frame_main_events.cpp @@ -39,7 +39,6 @@ // Include headers #include "config.h" -#include #include #include #include diff --git a/aegisub/src/gl_text.h b/aegisub/src/gl_text.h index 88683ad77..a51719af2 100644 --- a/aegisub/src/gl_text.h +++ b/aegisub/src/gl_text.h @@ -38,7 +38,6 @@ /////////// // Headers -#include #include #include #ifdef __APPLE__ diff --git a/aegisub/src/gl_wrap.cpp b/aegisub/src/gl_wrap.cpp index 200e66cc1..255a70c1d 100644 --- a/aegisub/src/gl_wrap.cpp +++ b/aegisub/src/gl_wrap.cpp @@ -39,7 +39,6 @@ // Headers #include "config.h" -#include #include #ifdef __APPLE__ #include diff --git a/aegisub/src/help_button.cpp b/aegisub/src/help_button.cpp index 50da6899f..2a2b97202 100644 --- a/aegisub/src/help_button.cpp +++ b/aegisub/src/help_button.cpp @@ -39,7 +39,6 @@ // Headers #include "config.h" -#include #include #include #include diff --git a/aegisub/src/help_button.h b/aegisub/src/help_button.h index c58c16c30..4921692b8 100644 --- a/aegisub/src/help_button.h +++ b/aegisub/src/help_button.h @@ -40,7 +40,6 @@ //////////// // Includes -#include #include diff --git a/aegisub/src/hilimod_textctrl.h b/aegisub/src/hilimod_textctrl.h index a67cd15a3..b279f1cd3 100644 --- a/aegisub/src/hilimod_textctrl.h +++ b/aegisub/src/hilimod_textctrl.h @@ -43,7 +43,6 @@ //////////// // Includes -#include #include diff --git a/aegisub/src/hotkeys.cpp b/aegisub/src/hotkeys.cpp index b53c285c0..fb422b27c 100644 --- a/aegisub/src/hotkeys.cpp +++ b/aegisub/src/hotkeys.cpp @@ -45,6 +45,7 @@ #include "text_file_writer.h" #include #include +#include diff --git a/aegisub/src/hotkeys.h b/aegisub/src/hotkeys.h index 86d0244a2..4416424ff 100644 --- a/aegisub/src/hotkeys.h +++ b/aegisub/src/hotkeys.h @@ -43,7 +43,6 @@ /////////// // Headers -#include #include #include #include diff --git a/aegisub/src/idle_field_event.h b/aegisub/src/idle_field_event.h index 83481e77f..d1571f38e 100644 --- a/aegisub/src/idle_field_event.h +++ b/aegisub/src/idle_field_event.h @@ -40,9 +40,9 @@ /////////// // Headers -#include #include #include +#include diff --git a/aegisub/src/include/aegisub/audio_player.h b/aegisub/src/include/aegisub/audio_player.h index d520f858f..7b83b750a 100644 --- a/aegisub/src/include/aegisub/audio_player.h +++ b/aegisub/src/include/aegisub/audio_player.h @@ -40,7 +40,6 @@ /////////// // Headers -#include #include #include #include diff --git a/aegisub/src/include/aegisub/video_provider.h b/aegisub/src/include/aegisub/video_provider.h index 3f77437a4..8f3b5a356 100644 --- a/aegisub/src/include/aegisub/video_provider.h +++ b/aegisub/src/include/aegisub/video_provider.h @@ -40,7 +40,6 @@ ////////// // Headers -#include #include "video_frame.h" #include "aegisub.h" #include "vfr.h" diff --git a/aegisub/src/kana_table.h b/aegisub/src/kana_table.h index 95450c945..82085ace5 100644 --- a/aegisub/src/kana_table.h +++ b/aegisub/src/kana_table.h @@ -38,7 +38,6 @@ /////////// // Headers #include -#include #include diff --git a/aegisub/src/main.cpp b/aegisub/src/main.cpp index c0445d818..1c0b59e8b 100644 --- a/aegisub/src/main.cpp +++ b/aegisub/src/main.cpp @@ -48,7 +48,6 @@ #include #include #include -#include #endif #include "main.h" diff --git a/aegisub/src/main.h b/aegisub/src/main.h index 76e503c49..9e5fcb2c7 100644 --- a/aegisub/src/main.h +++ b/aegisub/src/main.h @@ -42,7 +42,6 @@ #include #include #include -#include #endif #include "aegisublocale.h" diff --git a/aegisub/src/mkv_wrap.h b/aegisub/src/mkv_wrap.h index 504797246..c785d8646 100644 --- a/aegisub/src/mkv_wrap.h +++ b/aegisub/src/mkv_wrap.h @@ -40,7 +40,6 @@ /////////// // Headers -#include #include #include #include diff --git a/aegisub/src/options.cpp b/aegisub/src/options.cpp index ad66b106c..fe80c4325 100644 --- a/aegisub/src/options.cpp +++ b/aegisub/src/options.cpp @@ -46,6 +46,9 @@ #include #include #include +#include +#include + #include "options.h" #include "text_file_reader.h" #include "text_file_writer.h" diff --git a/aegisub/src/options.h b/aegisub/src/options.h index 20202220b..b8ba0d6cf 100644 --- a/aegisub/src/options.h +++ b/aegisub/src/options.h @@ -40,7 +40,6 @@ /////////// // Headers -#include #include #include "variable_data.h" diff --git a/aegisub/src/quicktime_common.cpp b/aegisub/src/quicktime_common.cpp index 0d5c684ce..fc59e91f4 100644 --- a/aegisub/src/quicktime_common.cpp +++ b/aegisub/src/quicktime_common.cpp @@ -38,7 +38,6 @@ #include "quicktime_common.h" #ifdef WITH_QUICKTIME -#include diff --git a/aegisub/src/quicktime_common.h b/aegisub/src/quicktime_common.h index 8d3a7c38e..499f864f0 100644 --- a/aegisub/src/quicktime_common.h +++ b/aegisub/src/quicktime_common.h @@ -40,7 +40,6 @@ #include "config.h" #ifdef WITH_QUICKTIME -#include #include #include "include/aegisub/aegisub.h" diff --git a/aegisub/src/scintilla_text_ctrl.h b/aegisub/src/scintilla_text_ctrl.h index 5cba6ec6e..208b5a51e 100644 --- a/aegisub/src/scintilla_text_ctrl.h +++ b/aegisub/src/scintilla_text_ctrl.h @@ -40,7 +40,6 @@ //////////// // Includes -#include #include diff --git a/aegisub/src/setup.cpp b/aegisub/src/setup.cpp index 722fdede7..0929bdec8 100644 --- a/aegisub/src/setup.cpp +++ b/aegisub/src/setup.cpp @@ -39,7 +39,6 @@ // Headers #include "config.h" -#include diff --git a/aegisub/src/spellchecker_hunspell.cpp b/aegisub/src/spellchecker_hunspell.cpp index 77876ebb3..cf2697bb2 100644 --- a/aegisub/src/spellchecker_hunspell.cpp +++ b/aegisub/src/spellchecker_hunspell.cpp @@ -48,13 +48,11 @@ #include "options.h" #include "charset_conv.h" #include -#include -#include #include #include #include #include - +#include /// @brief Constructor diff --git a/aegisub/src/spellchecker_hunspell.h b/aegisub/src/spellchecker_hunspell.h index cb48ea7cb..19e4bafc4 100644 --- a/aegisub/src/spellchecker_hunspell.h +++ b/aegisub/src/spellchecker_hunspell.h @@ -42,7 +42,6 @@ #include "include/aegisub/spellchecker.h" #include -#include diff --git a/aegisub/src/spellchecker_manager.h b/aegisub/src/spellchecker_manager.h index cddff0a26..c98aae33f 100644 --- a/aegisub/src/spellchecker_manager.h +++ b/aegisub/src/spellchecker_manager.h @@ -40,7 +40,6 @@ /////////// // Headers -#include #include "factory_manager.h" #include "include/aegisub/spellchecker.h" diff --git a/aegisub/src/spline.h b/aegisub/src/spline.h index d52fe9c15..776b78512 100644 --- a/aegisub/src/spline.h +++ b/aegisub/src/spline.h @@ -40,7 +40,6 @@ /////////// // Headers -#include #include #include #include diff --git a/aegisub/src/standard_paths.h b/aegisub/src/standard_paths.h index 856f62747..bc35820b8 100644 --- a/aegisub/src/standard_paths.h +++ b/aegisub/src/standard_paths.h @@ -40,7 +40,6 @@ /////////// // Headers -#include #include diff --git a/aegisub/src/static_bmp.h b/aegisub/src/static_bmp.h index 08f4b710d..a7daa77d0 100644 --- a/aegisub/src/static_bmp.h +++ b/aegisub/src/static_bmp.h @@ -40,7 +40,6 @@ //////////// // Includes -#include #include #include diff --git a/aegisub/src/string_codec.h b/aegisub/src/string_codec.h index f81ff9cf0..3fdb2bea5 100644 --- a/aegisub/src/string_codec.h +++ b/aegisub/src/string_codec.h @@ -59,7 +59,6 @@ /// DOCME #define _STRING_CODEC_H -#include #include wxString inline_string_encode(const wxString &input); diff --git a/aegisub/src/subs_edit_box.h b/aegisub/src/subs_edit_box.h index 7193fefa4..8722b6443 100644 --- a/aegisub/src/subs_edit_box.h +++ b/aegisub/src/subs_edit_box.h @@ -40,8 +40,14 @@ //////////// // Includes -#include #include +#include +#include +#include +#include +#include +#include +#include #include "subs_edit_ctrl.h" diff --git a/aegisub/src/subs_edit_ctrl.cpp b/aegisub/src/subs_edit_ctrl.cpp index 93ea8143a..c857666e2 100644 --- a/aegisub/src/subs_edit_ctrl.cpp +++ b/aegisub/src/subs_edit_ctrl.cpp @@ -39,7 +39,6 @@ // Includes #include "config.h" -#include #include #include "subs_edit_ctrl.h" #include "subs_edit_box.h" diff --git a/aegisub/src/subs_edit_ctrl.h b/aegisub/src/subs_edit_ctrl.h index fc87b60fd..a9cae4557 100644 --- a/aegisub/src/subs_edit_ctrl.h +++ b/aegisub/src/subs_edit_ctrl.h @@ -40,7 +40,6 @@ //////////// // Includes -#include #include "spellchecker_manager.h" #include "thesaurus.h" #include "scintilla_text_ctrl.h" diff --git a/aegisub/src/subs_preview.h b/aegisub/src/subs_preview.h index fa84321c8..157aee1d0 100644 --- a/aegisub/src/subs_preview.h +++ b/aegisub/src/subs_preview.h @@ -40,7 +40,6 @@ //////////// // Includes -#include #include #include diff --git a/aegisub/src/subtitle_format.h b/aegisub/src/subtitle_format.h index a024e3480..921a0e2e6 100644 --- a/aegisub/src/subtitle_format.h +++ b/aegisub/src/subtitle_format.h @@ -40,7 +40,6 @@ /////////// // Headers -#include #include #include #include diff --git a/aegisub/src/subtitles_provider_csri.cpp b/aegisub/src/subtitles_provider_csri.cpp index 3990978a5..d0e7894ae 100644 --- a/aegisub/src/subtitles_provider_csri.cpp +++ b/aegisub/src/subtitles_provider_csri.cpp @@ -42,7 +42,6 @@ #ifdef WITH_CSRI -#include #include "subtitles_provider_csri.h" #include "ass_file.h" #include "video_context.h" diff --git a/aegisub/src/subtitles_provider_csri.h b/aegisub/src/subtitles_provider_csri.h index 320c4c6f7..6bcbcf18d 100644 --- a/aegisub/src/subtitles_provider_csri.h +++ b/aegisub/src/subtitles_provider_csri.h @@ -40,7 +40,6 @@ #ifdef WITH_CSRI -#include #include "include/aegisub/subtitles_provider.h" #ifdef WIN32 diff --git a/aegisub/src/subtitles_provider_manager.h b/aegisub/src/subtitles_provider_manager.h index a34aa979d..a4be44ca0 100644 --- a/aegisub/src/subtitles_provider_manager.h +++ b/aegisub/src/subtitles_provider_manager.h @@ -40,7 +40,6 @@ /////////// // Headers -#include #include "include/aegisub/subtitles_provider.h" #include "video_frame.h" #include "factory_manager.h" diff --git a/aegisub/src/text_file_reader.h b/aegisub/src/text_file_reader.h index 68f32674a..8800e647e 100644 --- a/aegisub/src/text_file_reader.h +++ b/aegisub/src/text_file_reader.h @@ -36,7 +36,6 @@ #pragma once -#include #include #include #include diff --git a/aegisub/src/text_file_writer.h b/aegisub/src/text_file_writer.h index 6ac63d431..d8233f6ab 100644 --- a/aegisub/src/text_file_writer.h +++ b/aegisub/src/text_file_writer.h @@ -40,7 +40,6 @@ /// DOCME #define TEXT_FILE_WRITER_H -#include #include #include #include diff --git a/aegisub/src/thesaurus.h b/aegisub/src/thesaurus.h index a0bb28b2b..0ff9cee14 100644 --- a/aegisub/src/thesaurus.h +++ b/aegisub/src/thesaurus.h @@ -40,7 +40,6 @@ /////////// // Headers -#include #include #include #include diff --git a/aegisub/src/thesaurus_myspell.cpp b/aegisub/src/thesaurus_myspell.cpp index 918c2b919..0d6eceb66 100644 --- a/aegisub/src/thesaurus_myspell.cpp +++ b/aegisub/src/thesaurus_myspell.cpp @@ -39,7 +39,6 @@ // Headers #include "config.h" -#include #include #include #include "thesaurus_myspell.h" diff --git a/aegisub/src/timeedit_ctrl.cpp b/aegisub/src/timeedit_ctrl.cpp index cafc319b8..f7ee4ba73 100644 --- a/aegisub/src/timeedit_ctrl.cpp +++ b/aegisub/src/timeedit_ctrl.cpp @@ -42,6 +42,7 @@ #include #include #include +#include #include "timeedit_ctrl.h" #include "ass_time.h" #include "vfr.h" diff --git a/aegisub/src/timeedit_ctrl.h b/aegisub/src/timeedit_ctrl.h index e576f743f..f74e7c325 100644 --- a/aegisub/src/timeedit_ctrl.h +++ b/aegisub/src/timeedit_ctrl.h @@ -40,7 +40,6 @@ //////////// // Includes -#include #include #include "ass_time.h" diff --git a/aegisub/src/toggle_bitmap.cpp b/aegisub/src/toggle_bitmap.cpp index a9865f764..50a635319 100644 --- a/aegisub/src/toggle_bitmap.cpp +++ b/aegisub/src/toggle_bitmap.cpp @@ -40,7 +40,6 @@ #include "config.h" #include "toggle_bitmap.h" -#include #include #include #include diff --git a/aegisub/src/toggle_bitmap.h b/aegisub/src/toggle_bitmap.h index b98a8d507..688a693ab 100644 --- a/aegisub/src/toggle_bitmap.h +++ b/aegisub/src/toggle_bitmap.h @@ -43,8 +43,8 @@ /////////// // Headers -#include #include +#include diff --git a/aegisub/src/tooltip_manager.h b/aegisub/src/tooltip_manager.h index 06494385a..75ff0fb81 100644 --- a/aegisub/src/tooltip_manager.h +++ b/aegisub/src/tooltip_manager.h @@ -40,7 +40,6 @@ /////////// // Headers -#include #include #include #include diff --git a/aegisub/src/utils.cpp b/aegisub/src/utils.cpp index ee17cf9d1..6906f0767 100644 --- a/aegisub/src/utils.cpp +++ b/aegisub/src/utils.cpp @@ -39,7 +39,6 @@ // Headers #include "config.h" -#include #include #include #include diff --git a/aegisub/src/utils.h b/aegisub/src/utils.h index 7c8656b66..ba40f5fc9 100644 --- a/aegisub/src/utils.h +++ b/aegisub/src/utils.h @@ -41,6 +41,7 @@ /////////// // Headers #include +#include #include #include #include diff --git a/aegisub/src/validators.h b/aegisub/src/validators.h index 2e21d1434..97d292fcc 100644 --- a/aegisub/src/validators.h +++ b/aegisub/src/validators.h @@ -43,7 +43,6 @@ /////////// // Headers -#include #include diff --git a/aegisub/src/variable_data.h b/aegisub/src/variable_data.h index 95dfe493a..2d3a0bc37 100644 --- a/aegisub/src/variable_data.h +++ b/aegisub/src/variable_data.h @@ -40,7 +40,6 @@ /////////// // Headers -#include #include diff --git a/aegisub/src/vfr.h b/aegisub/src/vfr.h index 925fcea87..faf154041 100644 --- a/aegisub/src/vfr.h +++ b/aegisub/src/vfr.h @@ -46,7 +46,6 @@ // Headers #include #include -#include #include #include "include/aegisub/aegisub.h" diff --git a/aegisub/src/vfw_wrap.h b/aegisub/src/vfw_wrap.h index 09a88ad92..c40bd3040 100644 --- a/aegisub/src/vfw_wrap.h +++ b/aegisub/src/vfw_wrap.h @@ -40,7 +40,6 @@ /////////// // Headers -#include diff --git a/aegisub/src/video_box.cpp b/aegisub/src/video_box.cpp index 9d22a70a5..b9f407647 100644 --- a/aegisub/src/video_box.cpp +++ b/aegisub/src/video_box.cpp @@ -39,7 +39,6 @@ // Includes #include "config.h" -#include #include #include #include diff --git a/aegisub/src/video_box.h b/aegisub/src/video_box.h index 8d24a7a2f..65afd6e06 100644 --- a/aegisub/src/video_box.h +++ b/aegisub/src/video_box.h @@ -40,7 +40,6 @@ /////////// // Headers -#include #include #include #include diff --git a/aegisub/src/video_context.h b/aegisub/src/video_context.h index 65b151c27..3c2c40d64 100644 --- a/aegisub/src/video_context.h +++ b/aegisub/src/video_context.h @@ -41,7 +41,6 @@ /////////// // Headers #include -#include #include #include #include diff --git a/aegisub/src/video_display.cpp b/aegisub/src/video_display.cpp index db750f1f5..1322d9b5d 100644 --- a/aegisub/src/video_display.cpp +++ b/aegisub/src/video_display.cpp @@ -46,6 +46,9 @@ #include #endif #include +#include +#include +#include #include "utils.h" #include "video_display.h" #include "video_provider_manager.h" diff --git a/aegisub/src/video_display.h b/aegisub/src/video_display.h index d3ea221cd..ece18eb15 100644 --- a/aegisub/src/video_display.h +++ b/aegisub/src/video_display.h @@ -36,9 +36,9 @@ #pragma once -#include #include #include +#include // Prototypes class VideoSlider; diff --git a/aegisub/src/video_provider_avs.cpp b/aegisub/src/video_provider_avs.cpp index 062d40882..ba40456df 100644 --- a/aegisub/src/video_provider_avs.cpp +++ b/aegisub/src/video_provider_avs.cpp @@ -39,7 +39,6 @@ // Headers #include "config.h" -#include #ifdef WITH_AVISYNTH #include #include diff --git a/aegisub/src/video_provider_avs.h b/aegisub/src/video_provider_avs.h index e38764c84..04693420d 100644 --- a/aegisub/src/video_provider_avs.h +++ b/aegisub/src/video_provider_avs.h @@ -37,7 +37,6 @@ /////////// // Headers -#include #ifdef WITH_AVISYNTH #include "avisynth_wrap.h" #include "include/aegisub/video_provider.h" diff --git a/aegisub/src/video_provider_ffmpegsource.cpp b/aegisub/src/video_provider_ffmpegsource.cpp index 03b2d87a9..fff59c98e 100644 --- a/aegisub/src/video_provider_ffmpegsource.cpp +++ b/aegisub/src/video_provider_ffmpegsource.cpp @@ -42,6 +42,7 @@ // Headers #include #include +#include #include #include "include/aegisub/aegisub.h" #include "video_provider_ffmpegsource.h" diff --git a/aegisub/src/video_provider_ffmpegsource.h b/aegisub/src/video_provider_ffmpegsource.h index 05f44db95..5fcb4a837 100644 --- a/aegisub/src/video_provider_ffmpegsource.h +++ b/aegisub/src/video_provider_ffmpegsource.h @@ -36,7 +36,6 @@ /////////// // Headers -#include #ifdef WITH_FFMPEGSOURCE #include "include/aegisub/video_provider.h" #include "ffmpegsource_common.h" diff --git a/aegisub/src/video_provider_quicktime.h b/aegisub/src/video_provider_quicktime.h index b30f40903..5de18ba4a 100644 --- a/aegisub/src/video_provider_quicktime.h +++ b/aegisub/src/video_provider_quicktime.h @@ -40,7 +40,6 @@ #include "quicktime_common.h" #ifdef WITH_QUICKTIME -#include #include #include #include diff --git a/aegisub/src/video_provider_yuv4mpeg.h b/aegisub/src/video_provider_yuv4mpeg.h index af7d0da1b..f444e5551 100644 --- a/aegisub/src/video_provider_yuv4mpeg.h +++ b/aegisub/src/video_provider_yuv4mpeg.h @@ -38,7 +38,6 @@ #pragma once #include "include/aegisub/video_provider.h" -#include #include #include #include diff --git a/aegisub/src/video_slider.cpp b/aegisub/src/video_slider.cpp index ca0ec8d57..34303c5e7 100644 --- a/aegisub/src/video_slider.cpp +++ b/aegisub/src/video_slider.cpp @@ -39,7 +39,6 @@ // Includes #include "config.h" -#include #include #include "video_slider.h" #include "video_display.h" diff --git a/aegisub/src/video_slider.h b/aegisub/src/video_slider.h index 899319e9c..89c3ce8a4 100644 --- a/aegisub/src/video_slider.h +++ b/aegisub/src/video_slider.h @@ -40,7 +40,6 @@ //////////// // Includes -#include #include diff --git a/aegisub/src/visual_tool.cpp b/aegisub/src/visual_tool.cpp index aee6d76f1..8139f3f3b 100644 --- a/aegisub/src/visual_tool.cpp +++ b/aegisub/src/visual_tool.cpp @@ -45,7 +45,6 @@ #else #include #endif -#include #include "visual_tool.h" #include "video_display.h" #include "video_context.h"