From e450cb3e7e0d3ebea1c07a1f3177a3963e973995 Mon Sep 17 00:00:00 2001 From: Thomas Goyne Date: Wed, 5 Jan 2011 18:40:37 +0000 Subject: [PATCH] Fix include paths Originally committed to SVN as r5132. --- aegisub/libaegisub/common/hotkey.cpp | 2 +- aegisub/libaegisub/common/keyframe.cpp | 2 +- .../libaegisub/include/libaegisub/hotkey.h | 2 -- aegisub/src/base_grid.cpp | 2 +- aegisub/src/command/app.cpp | 22 +++++++-------- aegisub/src/command/audio.cpp | 9 +++--- aegisub/src/command/automation.cpp | 14 +++++----- aegisub/src/command/command.cpp | 1 + aegisub/src/command/command.h | 2 +- aegisub/src/command/edit.cpp | 15 +++++----- aegisub/src/command/grid.cpp | 10 +++---- aegisub/src/command/help.cpp | 8 +++--- aegisub/src/command/keyframe.cpp | 10 +++---- aegisub/src/command/menu.cpp | 5 ++-- aegisub/src/command/recent.cpp | 12 ++++---- aegisub/src/command/subtitle.cpp | 22 ++++++++------- aegisub/src/command/time.cpp | 14 +++++----- aegisub/src/command/timecode.cpp | 12 ++++---- aegisub/src/command/tool.cpp | 24 ++++++++-------- aegisub/src/command/video.cpp | 28 ++++++++++--------- aegisub/src/dialog_fonts_collector.h | 1 + aegisub/src/dialog_styling_assistant.cpp | 2 +- aegisub/src/dialog_translation.cpp | 2 +- aegisub/src/frame_main.cpp | 7 +++-- aegisub/src/frame_main.h | 2 +- aegisub/src/hotkey.cpp | 4 +-- aegisub/src/include/aegisub/context.h | 20 ++++++------- aegisub/src/main.cpp | 6 ++-- aegisub/src/menu.cpp | 2 +- aegisub/src/subs_edit_box.cpp | 2 +- aegisub/src/subs_grid.cpp | 2 +- aegisub/src/toolbar.cpp | 2 +- aegisub/src/video_display.cpp | 2 +- 33 files changed, 139 insertions(+), 131 deletions(-) diff --git a/aegisub/libaegisub/common/hotkey.cpp b/aegisub/libaegisub/common/hotkey.cpp index a0cfd68fe..847d73d9c 100644 --- a/aegisub/libaegisub/common/hotkey.cpp +++ b/aegisub/libaegisub/common/hotkey.cpp @@ -18,7 +18,7 @@ /// @brief Hotkey handler /// @ingroup hotkey menu event window -#include "config.h" +#include "../config.h" #ifndef LAGI_PRE #include diff --git a/aegisub/libaegisub/common/keyframe.cpp b/aegisub/libaegisub/common/keyframe.cpp index 5230f60de..81fc32703 100644 --- a/aegisub/libaegisub/common/keyframe.cpp +++ b/aegisub/libaegisub/common/keyframe.cpp @@ -20,7 +20,7 @@ /// -#include "config.h" +#include "../config.h" #ifndef LAGI_PRE #include diff --git a/aegisub/libaegisub/include/libaegisub/hotkey.h b/aegisub/libaegisub/include/libaegisub/hotkey.h index a274c5e91..5ebc6585d 100644 --- a/aegisub/libaegisub/include/libaegisub/hotkey.h +++ b/aegisub/libaegisub/include/libaegisub/hotkey.h @@ -18,8 +18,6 @@ /// @brief Hotkey handler /// @ingroup hotkey menu event window -#include "config.h" - #ifndef LAGI_PRE #include diff --git a/aegisub/src/base_grid.cpp b/aegisub/src/base_grid.cpp index 6d3a89801..c66a8dfcf 100644 --- a/aegisub/src/base_grid.cpp +++ b/aegisub/src/base_grid.cpp @@ -46,7 +46,7 @@ #include #endif -#include "aegisub/hotkey.h" +#include "include/aegisub/hotkey.h" #include "base_grid.h" diff --git a/aegisub/src/command/app.cpp b/aegisub/src/command/app.cpp index 67d804be2..b345dd53b 100644 --- a/aegisub/src/command/app.cpp +++ b/aegisub/src/command/app.cpp @@ -36,24 +36,24 @@ /// @ingroup command /// -#include "config.h" +#include "../config.h" #ifndef AGI_PRE #endif #include "command.h" -#include "aegisub/context.h" -#include "main.h" +#include "../include/aegisub/context.h" +#include "../main.h" -#include "dialog_about.h" -#include "audio_controller.h" -#include "frame_main.h" -#include "video_context.h" -#include "utils.h" -#include "dialog_log.h" -#include "preferences.h" -#include "dialog_version_check.h" +#include "../dialog_about.h" +#include "../audio_controller.h" +#include "../frame_main.h" +#include "../video_context.h" +#include "../utils.h" +#include "../dialog_log.h" +#include "../preferences.h" +#include "../dialog_version_check.h" namespace cmd { diff --git a/aegisub/src/command/audio.cpp b/aegisub/src/command/audio.cpp index 06fb685b4..028b6ab49 100644 --- a/aegisub/src/command/audio.cpp +++ b/aegisub/src/command/audio.cpp @@ -36,7 +36,7 @@ /// @ingroup command /// -#include "config.h" +#include "../config.h" #ifndef AGI_PRE #include @@ -44,9 +44,10 @@ #include "command.h" -#include "aegisub/context.h" -#include "compat.h" -#include "main.h" +#include "../audio_controller.h" +#include "../compat.h" +#include "../include/aegisub/context.h" +#include "../main.h" namespace cmd { /// @defgroup cmd-audio Audio commands. diff --git a/aegisub/src/command/automation.cpp b/aegisub/src/command/automation.cpp index 2dd968ef0..25251f755 100644 --- a/aegisub/src/command/automation.cpp +++ b/aegisub/src/command/automation.cpp @@ -36,19 +36,19 @@ /// @ingroup command /// -#include "config.h" +#include "../config.h" #ifndef AGI_PRE #endif #include "command.h" -#include "main.h" -#include "aegisub/context.h" -#include "dialog_automation.h" -#include "auto4_base.h" -#include "video_context.h" -#include "frame_main.h" +#include "../main.h" +#include "../include/aegisub/context.h" +#include "../dialog_automation.h" +#include "../auto4_base.h" +#include "../video_context.h" +#include "../frame_main.h" namespace cmd { /// @defgroup cmd-am Automation commands diff --git a/aegisub/src/command/command.cpp b/aegisub/src/command/command.cpp index 8a6ad2c74..79e81d71d 100644 --- a/aegisub/src/command/command.cpp +++ b/aegisub/src/command/command.cpp @@ -64,6 +64,7 @@ Command* CommandManager::get(std::string name) { } // XXX: throw printf("cmd::id NOT FOUND (%s)\n", name.c_str()); + return 0; } diff --git a/aegisub/src/command/command.h b/aegisub/src/command/command.h index 993b5049e..db7fe8f41 100644 --- a/aegisub/src/command/command.h +++ b/aegisub/src/command/command.h @@ -18,7 +18,7 @@ /// @brief Command base class and main header. /// @ingroup command -#include "aegisub/context.h" +#include "../include/aegisub/context.h" #include "icon.h" DEFINE_BASE_EXCEPTION_NOINNER(CommandError, agi::Exception) diff --git a/aegisub/src/command/edit.cpp b/aegisub/src/command/edit.cpp index 9e20b9b28..275c9706c 100644 --- a/aegisub/src/command/edit.cpp +++ b/aegisub/src/command/edit.cpp @@ -36,19 +36,20 @@ /// @ingroup command /// -#include "config.h" +#include "../config.h" #ifndef AGI_PRE #endif #include "command.h" -#include "aegisub/context.h" -#include "aegisub/context.h" -#include "subs_edit_box.h" -#include "subs_edit_ctrl.h" -#include "dialog_search_replace.h" -#include "video_context.h" +#include "../ass_file.h" +#include "../dialog_search_replace.h" +#include "../include/aegisub/context.h" +#include "../subs_edit_box.h" +#include "../subs_edit_ctrl.h" +#include "../subs_grid.h" +#include "../video_context.h" namespace cmd { /// @defgroup cmd-edit Editing commands. diff --git a/aegisub/src/command/grid.cpp b/aegisub/src/command/grid.cpp index b3427f361..80d0bd60f 100644 --- a/aegisub/src/command/grid.cpp +++ b/aegisub/src/command/grid.cpp @@ -36,17 +36,17 @@ /// @ingroup command /// -#include "config.h" +#include "../config.h" #ifndef AGI_PRE #endif #include "command.h" -#include "aegisub/context.h" -#include "subs_grid.h" -#include "main.h" -#include "frame_main.h" +#include "../include/aegisub/context.h" +#include "../subs_grid.h" +#include "../main.h" +#include "../frame_main.h" namespace cmd { /// @defgroup cmd-grid Subtitle grid commands. diff --git a/aegisub/src/command/help.cpp b/aegisub/src/command/help.cpp index 15f4012ec..9982df193 100644 --- a/aegisub/src/command/help.cpp +++ b/aegisub/src/command/help.cpp @@ -36,16 +36,16 @@ /// @ingroup command /// -#include "config.h" +#include "../config.h" #ifndef AGI_PRE #endif #include "command.h" -#include "aegisub/context.h" +#include "../include/aegisub/context.h" -#include "help_button.h" // help_contents -#include "main.h" +#include "../help_button.h" // help_contents +#include "../main.h" namespace cmd { /// @defgroup cmd-help Help commands. diff --git a/aegisub/src/command/keyframe.cpp b/aegisub/src/command/keyframe.cpp index 02b7e1d87..b361b24b9 100644 --- a/aegisub/src/command/keyframe.cpp +++ b/aegisub/src/command/keyframe.cpp @@ -36,17 +36,17 @@ /// @ingroup command /// -#include "config.h" +#include "../config.h" #ifndef AGI_PRE #endif #include "command.h" -#include "aegisub/context.h" -#include "main.h" -#include "compat.h" -#include "video_context.h" +#include "../include/aegisub/context.h" +#include "../main.h" +#include "../compat.h" +#include "../video_context.h" namespace cmd { /// @defgroup cmd-keyframed Keyframe commands. diff --git a/aegisub/src/command/menu.cpp b/aegisub/src/command/menu.cpp index 15496e8e9..b7f25d3a8 100644 --- a/aegisub/src/command/menu.cpp +++ b/aegisub/src/command/menu.cpp @@ -34,14 +34,14 @@ /// @ingroup command /// -#include "config.h" +#include "../config.h" #ifndef AGI_PRE #endif #include "command.h" -#include "aegisub/context.h" +#include "../include/aegisub/context.h" namespace cmd { /// @defgroup cmd-menu Main menu dropdown and submenu related commands. @@ -87,7 +87,6 @@ public: } }; - /// Sort lines by column. class main_edit_sort_lines: public Command { public: diff --git a/aegisub/src/command/recent.cpp b/aegisub/src/command/recent.cpp index bee22cd2b..d5dc81b41 100644 --- a/aegisub/src/command/recent.cpp +++ b/aegisub/src/command/recent.cpp @@ -34,7 +34,7 @@ /// @ingroup command /// -#include "config.h" +#include "../config.h" #ifndef AGI_PRE #include @@ -42,11 +42,11 @@ #include "command.h" -#include "aegisub/context.h" -#include "main.h" -#include "frame_main.h" -#include "compat.h" -#include "video_context.h" +#include "../include/aegisub/context.h" +#include "../main.h" +#include "../frame_main.h" +#include "../compat.h" +#include "../video_context.h" namespace cmd { /// @defgroup cmd-recent MRU (Most Recently Used) commands. diff --git a/aegisub/src/command/subtitle.cpp b/aegisub/src/command/subtitle.cpp index 22cbc55cd..527021028 100644 --- a/aegisub/src/command/subtitle.cpp +++ b/aegisub/src/command/subtitle.cpp @@ -36,7 +36,7 @@ /// @ingroup command /// -#include "config.h" +#include "../config.h" #ifndef AGI_PRE #include @@ -47,15 +47,17 @@ #include "command.h" -#include "aegisub/context.h" -#include "dialog_search_replace.h" -#include "dialog_attachments.h" -#include "video_context.h" -#include "main.h" -#include "frame_main.h" -#include "compat.h" -#include "dialog_properties.h" -#include "dialog_spellchecker.h" +#include "../ass_file.h" +#include "../compat.h" +#include "../dialog_attachments.h" +#include "../dialog_properties.h" +#include "../dialog_search_replace.h" +#include "../dialog_spellchecker.h" +#include "../frame_main.h" +#include "../include/aegisub/context.h" +#include "../main.h" +#include "../subs_grid.h" +#include "../video_context.h" namespace cmd { diff --git a/aegisub/src/command/time.cpp b/aegisub/src/command/time.cpp index 832377a56..60b52fec1 100644 --- a/aegisub/src/command/time.cpp +++ b/aegisub/src/command/time.cpp @@ -36,19 +36,19 @@ /// @ingroup command /// -#include "config.h" +#include "../config.h" #ifndef AGI_PRE #endif #include "command.h" -#include "aegisub/context.h" -#include "subs_grid.h" -#include "video_context.h" -#include "ass_dialogue.h" -#include "dialog_shift_times.h" -#include "ass_file.h" +#include "../include/aegisub/context.h" +#include "../subs_grid.h" +#include "../video_context.h" +#include "../ass_dialogue.h" +#include "../dialog_shift_times.h" +#include "../ass_file.h" namespace cmd { /// @defgroup cmd-time Time manipulation commands. diff --git a/aegisub/src/command/timecode.cpp b/aegisub/src/command/timecode.cpp index 8123a747c..5b85ae8c0 100644 --- a/aegisub/src/command/timecode.cpp +++ b/aegisub/src/command/timecode.cpp @@ -36,7 +36,7 @@ /// @ingroup command /// -#include "config.h" +#include "../config.h" #ifndef AGI_PRE #include @@ -44,11 +44,11 @@ #include "command.h" -#include "aegisub/context.h" -#include "video_context.h" -#include "main.h" -#include "compat.h" -#include "subs_edit_box.h" +#include "../include/aegisub/context.h" +#include "../video_context.h" +#include "../main.h" +#include "../compat.h" +#include "../subs_edit_box.h" namespace cmd { /// @defgroup cmd-timecode Timecode commands. diff --git a/aegisub/src/command/tool.cpp b/aegisub/src/command/tool.cpp index 79c230508..dca15707e 100644 --- a/aegisub/src/command/tool.cpp +++ b/aegisub/src/command/tool.cpp @@ -36,7 +36,7 @@ /// @ingroup command /// -#include "config.h" +#include "../config.h" #ifndef AGI_PRE #include @@ -44,17 +44,19 @@ #include "command.h" -#include "aegisub/context.h" +#include "../include/aegisub/context.h" -#include "dialog_fonts_collector.h" -#include "standard_paths.h" // tool_assdraw -#include "video_context.h" // tool_font_collector -#include "dialog_resample.h" -#include "dialog_selection.h" -#include "dialog_style_manager.h" -#include "dialog_timing_processor.h" -#include "dialog_translation.h" -#include "dialog_kara_timing_copy.h" +#include "../dialog_fonts_collector.h" +#include "../standard_paths.h" // tool_assdraw +#include "../video_context.h" // tool_font_collector +#include "../dialog_resample.h" +#include "../dialog_selection.h" +#include "../dialog_styling_assistant.h" +#include "../dialog_style_manager.h" +#include "../dialog_timing_processor.h" +#include "../dialog_translation.h" +#include "../dialog_kara_timing_copy.h" +#include "../subs_grid.h" namespace cmd { /// @defgroup cmd-tool Various tool and utilities diff --git a/aegisub/src/command/video.cpp b/aegisub/src/command/video.cpp index 30d0752ee..170245710 100644 --- a/aegisub/src/command/video.cpp +++ b/aegisub/src/command/video.cpp @@ -36,25 +36,27 @@ /// @ingroup command /// -#include "config.h" +#include "../config.h" #ifndef AGI_PRE #endif #include "command.h" -#include "aegisub/context.h" -#include "video_context.h" -#include "main.h" -#include "utils.h" -#include "frame_main.h" -#include "video_display.h" -#include "dialog_detached_video.h" -#include "dialog_video_details.h" -#include "video_slider.h" -#include "dialog_dummy_video.h" -#include "compat.h" -#include "dialog_jumpto.h" +#include "../compat.h" +#include "../frame_main.h" +#include "../main.h" +#include "../include/aegisub/context.h" +#include "../dialog_detached_video.h" +#include "../dialog_dummy_video.h" +#include "../dialog_jumpto.h" +#include "../dialog_video_details.h" +#include "../subs_grid.h" +#include "../utils.h" +#include "../video_box.h" +#include "../video_context.h" +#include "../video_display.h" +#include "../video_slider.h" namespace cmd { /// @defgroup cmd-video Video commands. diff --git a/aegisub/src/dialog_fonts_collector.h b/aegisub/src/dialog_fonts_collector.h index 7be8a6827..79b3937f3 100644 --- a/aegisub/src/dialog_fonts_collector.h +++ b/aegisub/src/dialog_fonts_collector.h @@ -44,6 +44,7 @@ #endif class AssFile; +class AssStyle; class AssOverrideParameter; class DialogFontsCollector; class wxZipOutputStream; diff --git a/aegisub/src/dialog_styling_assistant.cpp b/aegisub/src/dialog_styling_assistant.cpp index 6aceca72b..b696fac3f 100644 --- a/aegisub/src/dialog_styling_assistant.cpp +++ b/aegisub/src/dialog_styling_assistant.cpp @@ -43,7 +43,7 @@ #include #endif -#include "aegisub/hotkey.h" +#include "include/aegisub/hotkey.h" #include "ass_dialogue.h" #include "ass_file.h" diff --git a/aegisub/src/dialog_translation.cpp b/aegisub/src/dialog_translation.cpp index c93d3530d..12874fc6f 100644 --- a/aegisub/src/dialog_translation.cpp +++ b/aegisub/src/dialog_translation.cpp @@ -43,7 +43,7 @@ #include #endif -#include "aegisub/hotkey.h" +#include "include/aegisub/hotkey.h" #include "ass_dialogue.h" #include "ass_file.h" diff --git a/aegisub/src/frame_main.cpp b/aegisub/src/frame_main.cpp index fe7c9e555..f3ccf7292 100644 --- a/aegisub/src/frame_main.cpp +++ b/aegisub/src/frame_main.cpp @@ -46,9 +46,9 @@ #include -#include "aegisub/menu.h" -#include "aegisub/toolbar.h" -#include "aegisub/hotkey.h" +#include "include/aegisub/menu.h" +#include "include/aegisub/toolbar.h" +#include "include/aegisub/hotkey.h" #include "ass_file.h" #include "selection_controller.h" @@ -64,6 +64,7 @@ #include "command/command.h" #include "dialog_detached_video.h" #include "dialog_search_replace.h" +#include "dialog_styling_assistant.h" #include "dialog_version_check.h" #include "drop.h" #include "frame_main.h" diff --git a/aegisub/src/frame_main.h b/aegisub/src/frame_main.h index aa6e115ac..b60f7418a 100644 --- a/aegisub/src/frame_main.h +++ b/aegisub/src/frame_main.h @@ -47,7 +47,7 @@ #include #endif -#include "aegisub/context.h" +#include "include/aegisub/context.h" class AssFile; diff --git a/aegisub/src/hotkey.cpp b/aegisub/src/hotkey.cpp index f5e354a9f..77cb77d51 100644 --- a/aegisub/src/hotkey.cpp +++ b/aegisub/src/hotkey.cpp @@ -31,9 +31,9 @@ #include #include -#include "aegisub/hotkey.h" +#include "include/aegisub/hotkey.h" -#include "aegisub/toolbar.h" +#include "include/aegisub/toolbar.h" #include "libresrc/libresrc.h" #include "command/command.h" #include "frame_main.h" diff --git a/aegisub/src/include/aegisub/context.h b/aegisub/src/include/aegisub/context.h index 86636a0bc..bd533b2d1 100644 --- a/aegisub/src/include/aegisub/context.h +++ b/aegisub/src/include/aegisub/context.h @@ -1,15 +1,15 @@ #pragma once // sigh. -#include - -#include "ass_file.h" -#include "subs_grid.h" -#include "audio_box.h" -#include "video_box.h" -#include "dialog_detached_video.h" -#include "auto4_base.h" -#include "dialog_styling_assistant.h" -#include "audio_controller.h" +class wxWindow; +class DialogStyling; +class AudioBox; +class AudioController; +class DialogDetachedVideo; +class AssFile; +namespace Automation4 { class ScriptManager; } +class SubsEditBox; +class SubtitlesGrid; +class VideoBox; namespace agi { diff --git a/aegisub/src/main.cpp b/aegisub/src/main.cpp index a512d06b6..11cc860e5 100644 --- a/aegisub/src/main.cpp +++ b/aegisub/src/main.cpp @@ -50,11 +50,11 @@ #include #endif -#include "aegisub/menu.h" +#include "include/aegisub/menu.h" #include "command/command.h" #include "command/icon.h" -#include "aegisub/toolbar.h" -#include "aegisub/hotkey.h" +#include "include/aegisub/toolbar.h" +#include "include/aegisub/hotkey.h" #include "ass_dialogue.h" #include "ass_export_filter.h" diff --git a/aegisub/src/menu.cpp b/aegisub/src/menu.cpp index 616227a97..1d5381ef2 100644 --- a/aegisub/src/menu.cpp +++ b/aegisub/src/menu.cpp @@ -32,7 +32,7 @@ #include #include -#include "aegisub/menu.h" +#include "include/aegisub/menu.h" #include "command/command.h" #include "libresrc/libresrc.h" #include "main.h" diff --git a/aegisub/src/subs_edit_box.cpp b/aegisub/src/subs_edit_box.cpp index e905191bf..d07bc8933 100644 --- a/aegisub/src/subs_edit_box.cpp +++ b/aegisub/src/subs_edit_box.cpp @@ -54,7 +54,7 @@ #include #endif -#include "aegisub/hotkey.h" +#include "include/aegisub/hotkey.h" #include "ass_dialogue.h" #include "ass_file.h" diff --git a/aegisub/src/subs_grid.cpp b/aegisub/src/subs_grid.cpp index 1922f95f7..b0355637d 100644 --- a/aegisub/src/subs_grid.cpp +++ b/aegisub/src/subs_grid.cpp @@ -46,7 +46,7 @@ #include #endif -#include "aegisub/hotkey.h" +#include "include/aegisub/hotkey.h" #include "include/aegisub/audio_provider.h" #include "ass_file.h" diff --git a/aegisub/src/toolbar.cpp b/aegisub/src/toolbar.cpp index 9b1ccc0fa..8bd23b5c4 100644 --- a/aegisub/src/toolbar.cpp +++ b/aegisub/src/toolbar.cpp @@ -30,7 +30,7 @@ #include #include -#include "aegisub/toolbar.h" +#include "include/aegisub/toolbar.h" #include "libresrc/libresrc.h" #include "command/command.h" diff --git a/aegisub/src/video_display.cpp b/aegisub/src/video_display.cpp index 2c70f9b29..053b6ecc0 100644 --- a/aegisub/src/video_display.cpp +++ b/aegisub/src/video_display.cpp @@ -56,7 +56,7 @@ #include #endif -#include "aegisub/hotkey.h" +#include "include/aegisub/hotkey.h" #include "video_display.h" #include "selection_controller.h"