Fix include paths

Originally committed to SVN as r5132.

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 <math.h>

aegisub/libaegisub/common/keyframe.cpp

@@ -20,7 +20,7 @@
 ///
 
 
-#include "config.h"
+#include "../config.h"
 
 #ifndef LAGI_PRE
 #include <algorithm>

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 <math.h>
 

aegisub/src/base_grid.cpp

@@ -46,7 +46,7 @@
 #include <wx/sizer.h>
 #endif
 
-#include "aegisub/hotkey.h"
+#include "include/aegisub/hotkey.h"
 
 #include "base_grid.h"
 

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 {

aegisub/src/command/audio.cpp

@@ -36,7 +36,7 @@
 /// @ingroup command
 ///
 
-#include "config.h"
+#include "../config.h"
 
 #ifndef AGI_PRE
 #include <wx/filedlg.h>
@@ -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.

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

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;
 }
 
 

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)

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.

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.

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.

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.

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:

aegisub/src/command/recent.cpp

@@ -34,7 +34,7 @@
 /// @ingroup command
 ///
 
-#include "config.h"
+#include "../config.h"
 
 #ifndef AGI_PRE
 #include <wx/event.h>
@@ -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.

aegisub/src/command/subtitle.cpp

@@ -36,7 +36,7 @@
 /// @ingroup command
 ///
 
-#include "config.h"
+#include "../config.h"
 
 #ifndef AGI_PRE
 #include <wx/filedlg.h>
@@ -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 {

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.

aegisub/src/command/timecode.cpp

@@ -36,7 +36,7 @@
 /// @ingroup command
 ///
 
-#include "config.h"
+#include "../config.h"
 
 #ifndef AGI_PRE
 #include <wx/filedlg.h>
@@ -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.

aegisub/src/command/tool.cpp

@@ -36,7 +36,7 @@
 /// @ingroup command
 ///
 
-#include "config.h"
+#include "../config.h"
 
 #ifndef AGI_PRE
 #include <wx/utils.h>
@@ -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

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.

aegisub/src/dialog_fonts_collector.h

@@ -44,6 +44,7 @@
 #endif
 
 class AssFile;
+class AssStyle;
 class AssOverrideParameter;
 class DialogFontsCollector;
 class wxZipOutputStream;

aegisub/src/dialog_styling_assistant.cpp

@@ -43,7 +43,7 @@
 #include <wx/recguard.h>
 #endif
 
-#include "aegisub/hotkey.h"
+#include "include/aegisub/hotkey.h"
 
 #include "ass_dialogue.h"
 #include "ass_file.h"

aegisub/src/dialog_translation.cpp

@@ -43,7 +43,7 @@
 #include <wx/settings.h>
 #endif
 
-#include "aegisub/hotkey.h"
+#include "include/aegisub/hotkey.h"
 
 #include "ass_dialogue.h"
 #include "ass_file.h"

aegisub/src/frame_main.cpp

@@ -46,9 +46,9 @@
 
 #include <libaegisub/log.h>
 
-#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"

aegisub/src/frame_main.h

@@ -47,7 +47,7 @@
 #include <wx/timer.h>
 #endif
 
-#include "aegisub/context.h"
+#include "include/aegisub/context.h"
 
 
 class AssFile;

aegisub/src/hotkey.cpp

@@ -31,9 +31,9 @@
 #include <libaegisub/log.h>
 #include <libaegisub/hotkey.h>
 
-#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"

aegisub/src/include/aegisub/context.h

@@ -1,15 +1,15 @@
 #pragma once // sigh.
 
-#include <wx/window.h>
-
-#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 {
 

aegisub/src/main.cpp

@@ -50,11 +50,11 @@
 #include <wx/utils.h>
 #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"

aegisub/src/menu.cpp

@@ -32,7 +32,7 @@
 #include <libaegisub/json.h>
 #include <libaegisub/log.h>
 
-#include "aegisub/menu.h"
+#include "include/aegisub/menu.h"
 #include "command/command.h"
 #include "libresrc/libresrc.h"
 #include "main.h"

aegisub/src/subs_edit_box.cpp

@@ -54,7 +54,7 @@
 #include <wx/spinctrl.h>
 #endif
 
-#include "aegisub/hotkey.h"
+#include "include/aegisub/hotkey.h"
 
 #include "ass_dialogue.h"
 #include "ass_file.h"

aegisub/src/subs_grid.cpp

@@ -46,7 +46,7 @@
 #include <wx/tokenzr.h>
 #endif
 
-#include "aegisub/hotkey.h"
+#include "include/aegisub/hotkey.h"
 #include "include/aegisub/audio_provider.h"
 
 #include "ass_file.h"

aegisub/src/toolbar.cpp

@@ -30,7 +30,7 @@
 #include <libaegisub/json.h>
 #include <libaegisub/log.h>
 
-#include "aegisub/toolbar.h"
+#include "include/aegisub/toolbar.h"
 #include "libresrc/libresrc.h"
 #include "command/command.h"
 

aegisub/src/video_display.cpp

@@ -56,7 +56,7 @@
 #include <GL/glu.h>
 #endif
 
-#include "aegisub/hotkey.h"
+#include "include/aegisub/hotkey.h"
 
 #include "video_display.h"
 #include "selection_controller.h"