mantarimay/Aegisub
1
0
Fork 0
forked from mia/Aegisub
Code Pull requests Activity

Fix include paths

Browse source 
Originally committed to SVN as r5132.
This commit is contained in:
Thomas Goyne 2011-01-05 18:40:37 +00:00
parent c6b65d8b82
commit e450cb3e7e
33 changed files with 139 additions and 131 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
aegisub/libaegisub/common/hotkey.cpp
View file

@ -18,7 +18,7 @@
/// @brief Hotkey handler /// @brief Hotkey handler
/// @ingroup hotkey menu event window /// @ingroup hotkey menu event window
#include "config.h" #include "../config.h"
#ifndef LAGI_PRE #ifndef LAGI_PRE
#include <math.h> #include <math.h>

2
aegisub/libaegisub/common/keyframe.cpp
View file

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

2
aegisub/libaegisub/include/libaegisub/hotkey.h
View file

@ -18,8 +18,6 @@
/// @brief Hotkey handler /// @brief Hotkey handler
/// @ingroup hotkey menu event window /// @ingroup hotkey menu event window
#include "config.h"
#ifndef LAGI_PRE #ifndef LAGI_PRE
#include <math.h> #include <math.h>

2
aegisub/src/base_grid.cpp
View file

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

22
aegisub/src/command/app.cpp
View file

@ -36,24 +36,24 @@
/// @ingroup command /// @ingroup command
/// ///
#include "config.h" #include "../config.h"
#ifndef AGI_PRE #ifndef AGI_PRE
#endif #endif
#include "command.h" #include "command.h"
#include "aegisub/context.h" #include "../include/aegisub/context.h"
#include "main.h" #include "../main.h"
#include "dialog_about.h" #include "../dialog_about.h"
#include "audio_controller.h" #include "../audio_controller.h"
#include "frame_main.h" #include "../frame_main.h"
#include "video_context.h" #include "../video_context.h"
#include "utils.h" #include "../utils.h"
#include "dialog_log.h" #include "../dialog_log.h"
#include "preferences.h" #include "../preferences.h"
#include "dialog_version_check.h" #include "../dialog_version_check.h"
namespace cmd { namespace cmd {

9
aegisub/src/command/audio.cpp
View file

@ -36,7 +36,7 @@
/// @ingroup command /// @ingroup command
/// ///
#include "config.h" #include "../config.h"
#ifndef AGI_PRE #ifndef AGI_PRE
#include <wx/filedlg.h> #include <wx/filedlg.h>
@ -44,9 +44,10 @@
#include "command.h" #include "command.h"
#include "aegisub/context.h" #include "../audio_controller.h"
#include "compat.h" #include "../compat.h"
#include "main.h" #include "../include/aegisub/context.h"
#include "../main.h"
namespace cmd { namespace cmd {
/// @defgroup cmd-audio Audio commands. /// @defgroup cmd-audio Audio commands.

14
aegisub/src/command/automation.cpp
View file

@ -36,19 +36,19 @@
/// @ingroup command /// @ingroup command
/// ///
#include "config.h" #include "../config.h"
#ifndef AGI_PRE #ifndef AGI_PRE
#endif #endif
#include "command.h" #include "command.h"
#include "main.h" #include "../main.h"
#include "aegisub/context.h" #include "../include/aegisub/context.h"
#include "dialog_automation.h" #include "../dialog_automation.h"
#include "auto4_base.h" #include "../auto4_base.h"
#include "video_context.h" #include "../video_context.h"
#include "frame_main.h" #include "../frame_main.h"
namespace cmd { namespace cmd {
/// @defgroup cmd-am Automation commands /// @defgroup cmd-am Automation commands

1
aegisub/src/command/command.cpp
View file

@ -64,6 +64,7 @@ Command* CommandManager::get(std::string name) {
} }
// XXX: throw // XXX: throw
printf("cmd::id NOT FOUND (%s)\n", name.c_str()); printf("cmd::id NOT FOUND (%s)\n", name.c_str());
return 0;
} }

2
aegisub/src/command/command.h
View file

@ -18,7 +18,7 @@
/// @brief Command base class and main header. /// @brief Command base class and main header.
/// @ingroup command /// @ingroup command
#include "aegisub/context.h" #include "../include/aegisub/context.h"
#include "icon.h" #include "icon.h"
DEFINE_BASE_EXCEPTION_NOINNER(CommandError, agi::Exception) DEFINE_BASE_EXCEPTION_NOINNER(CommandError, agi::Exception)

15
aegisub/src/command/edit.cpp
View file

@ -36,19 +36,20 @@
/// @ingroup command /// @ingroup command
/// ///
#include "config.h" #include "../config.h"
#ifndef AGI_PRE #ifndef AGI_PRE
#endif #endif
#include "command.h" #include "command.h"
#include "aegisub/context.h" #include "../ass_file.h"
#include "aegisub/context.h" #include "../dialog_search_replace.h"
#include "subs_edit_box.h" #include "../include/aegisub/context.h"
#include "subs_edit_ctrl.h" #include "../subs_edit_box.h"
#include "dialog_search_replace.h" #include "../subs_edit_ctrl.h"
#include "video_context.h" #include "../subs_grid.h"
#include "../video_context.h"
namespace cmd { namespace cmd {
/// @defgroup cmd-edit Editing commands. /// @defgroup cmd-edit Editing commands.

10
aegisub/src/command/grid.cpp
View file

@ -36,17 +36,17 @@
/// @ingroup command /// @ingroup command
/// ///
#include "config.h" #include "../config.h"
#ifndef AGI_PRE #ifndef AGI_PRE
#endif #endif
#include "command.h" #include "command.h"
#include "aegisub/context.h" #include "../include/aegisub/context.h"
#include "subs_grid.h" #include "../subs_grid.h"
#include "main.h" #include "../main.h"
#include "frame_main.h" #include "../frame_main.h"
namespace cmd { namespace cmd {
/// @defgroup cmd-grid Subtitle grid commands. /// @defgroup cmd-grid Subtitle grid commands.

8
aegisub/src/command/help.cpp
View file

@ -36,16 +36,16 @@
/// @ingroup command /// @ingroup command
/// ///
#include "config.h" #include "../config.h"
#ifndef AGI_PRE #ifndef AGI_PRE
#endif #endif
#include "command.h" #include "command.h"
#include "aegisub/context.h" #include "../include/aegisub/context.h"
#include "help_button.h" // help_contents #include "../help_button.h" // help_contents
#include "main.h" #include "../main.h"
namespace cmd { namespace cmd {
/// @defgroup cmd-help Help commands. /// @defgroup cmd-help Help commands.

10
aegisub/src/command/keyframe.cpp
View file

@ -36,17 +36,17 @@
/// @ingroup command /// @ingroup command
/// ///
#include "config.h" #include "../config.h"
#ifndef AGI_PRE #ifndef AGI_PRE
#endif #endif
#include "command.h" #include "command.h"
#include "aegisub/context.h" #include "../include/aegisub/context.h"
#include "main.h" #include "../main.h"
#include "compat.h" #include "../compat.h"
#include "video_context.h" #include "../video_context.h"
namespace cmd { namespace cmd {
/// @defgroup cmd-keyframed Keyframe commands. /// @defgroup cmd-keyframed Keyframe commands.

5
aegisub/src/command/menu.cpp
View file

@ -34,14 +34,14 @@
/// @ingroup command /// @ingroup command
/// ///
#include "config.h" #include "../config.h"
#ifndef AGI_PRE #ifndef AGI_PRE
#endif #endif
#include "command.h" #include "command.h"
#include "aegisub/context.h" #include "../include/aegisub/context.h"
namespace cmd { namespace cmd {
/// @defgroup cmd-menu Main menu dropdown and submenu related commands. /// @defgroup cmd-menu Main menu dropdown and submenu related commands.
@ -87,7 +87,6 @@ public:
} }
}; };
/// Sort lines by column. /// Sort lines by column.
class main_edit_sort_lines: public Command { class main_edit_sort_lines: public Command {
public: public:

12
aegisub/src/command/recent.cpp
View file

@ -34,7 +34,7 @@
/// @ingroup command /// @ingroup command
/// ///
#include "config.h" #include "../config.h"
#ifndef AGI_PRE #ifndef AGI_PRE
#include <wx/event.h> #include <wx/event.h>
@ -42,11 +42,11 @@
#include "command.h" #include "command.h"
#include "aegisub/context.h" #include "../include/aegisub/context.h"
#include "main.h" #include "../main.h"
#include "frame_main.h" #include "../frame_main.h"
#include "compat.h" #include "../compat.h"
#include "video_context.h" #include "../video_context.h"
namespace cmd { namespace cmd {
/// @defgroup cmd-recent MRU (Most Recently Used) commands. /// @defgroup cmd-recent MRU (Most Recently Used) commands.

22
aegisub/src/command/subtitle.cpp
View file

@ -36,7 +36,7 @@
/// @ingroup command /// @ingroup command
/// ///
#include "config.h" #include "../config.h"
#ifndef AGI_PRE #ifndef AGI_PRE
#include <wx/filedlg.h> #include <wx/filedlg.h>
@ -47,15 +47,17 @@
#include "command.h" #include "command.h"
#include "aegisub/context.h" #include "../ass_file.h"
#include "dialog_search_replace.h" #include "../compat.h"
#include "dialog_attachments.h" #include "../dialog_attachments.h"
#include "video_context.h" #include "../dialog_properties.h"
#include "main.h" #include "../dialog_search_replace.h"
#include "frame_main.h" #include "../dialog_spellchecker.h"
#include "compat.h" #include "../frame_main.h"
#include "dialog_properties.h" #include "../include/aegisub/context.h"
#include "dialog_spellchecker.h" #include "../main.h"
#include "../subs_grid.h"
#include "../video_context.h"
namespace cmd { namespace cmd {

14
aegisub/src/command/time.cpp
View file

@ -36,19 +36,19 @@
/// @ingroup command /// @ingroup command
/// ///
#include "config.h" #include "../config.h"
#ifndef AGI_PRE #ifndef AGI_PRE
#endif #endif
#include "command.h" #include "command.h"
#include "aegisub/context.h" #include "../include/aegisub/context.h"
#include "subs_grid.h" #include "../subs_grid.h"
#include "video_context.h" #include "../video_context.h"
#include "ass_dialogue.h" #include "../ass_dialogue.h"
#include "dialog_shift_times.h" #include "../dialog_shift_times.h"
#include "ass_file.h" #include "../ass_file.h"
namespace cmd { namespace cmd {
/// @defgroup cmd-time Time manipulation commands. /// @defgroup cmd-time Time manipulation commands.

12
aegisub/src/command/timecode.cpp
View file

@ -36,7 +36,7 @@
/// @ingroup command /// @ingroup command
/// ///
#include "config.h" #include "../config.h"
#ifndef AGI_PRE #ifndef AGI_PRE
#include <wx/filedlg.h> #include <wx/filedlg.h>
@ -44,11 +44,11 @@
#include "command.h" #include "command.h"
#include "aegisub/context.h" #include "../include/aegisub/context.h"
#include "video_context.h" #include "../video_context.h"
#include "main.h" #include "../main.h"
#include "compat.h" #include "../compat.h"
#include "subs_edit_box.h" #include "../subs_edit_box.h"
namespace cmd { namespace cmd {
/// @defgroup cmd-timecode Timecode commands. /// @defgroup cmd-timecode Timecode commands.

24
aegisub/src/command/tool.cpp
View file

@ -36,7 +36,7 @@
/// @ingroup command /// @ingroup command
/// ///
#include "config.h" #include "../config.h"
#ifndef AGI_PRE #ifndef AGI_PRE
#include <wx/utils.h> #include <wx/utils.h>
@ -44,17 +44,19 @@
#include "command.h" #include "command.h"
#include "aegisub/context.h" #include "../include/aegisub/context.h"
#include "dialog_fonts_collector.h" #include "../dialog_fonts_collector.h"
#include "standard_paths.h" // tool_assdraw #include "../standard_paths.h" // tool_assdraw
#include "video_context.h" // tool_font_collector #include "../video_context.h" // tool_font_collector
#include "dialog_resample.h" #include "../dialog_resample.h"
#include "dialog_selection.h" #include "../dialog_selection.h"
#include "dialog_style_manager.h" #include "../dialog_styling_assistant.h"
#include "dialog_timing_processor.h" #include "../dialog_style_manager.h"
#include "dialog_translation.h" #include "../dialog_timing_processor.h"
#include "dialog_kara_timing_copy.h" #include "../dialog_translation.h"
#include "../dialog_kara_timing_copy.h"
#include "../subs_grid.h"
namespace cmd { namespace cmd {
/// @defgroup cmd-tool Various tool and utilities /// @defgroup cmd-tool Various tool and utilities

28
aegisub/src/command/video.cpp
View file

@ -36,25 +36,27 @@
/// @ingroup command /// @ingroup command
/// ///
#include "config.h" #include "../config.h"
#ifndef AGI_PRE #ifndef AGI_PRE
#endif #endif
#include "command.h" #include "command.h"
#include "aegisub/context.h" #include "../compat.h"
#include "video_context.h" #include "../frame_main.h"
#include "main.h" #include "../main.h"
#include "utils.h" #include "../include/aegisub/context.h"
#include "frame_main.h" #include "../dialog_detached_video.h"
#include "video_display.h" #include "../dialog_dummy_video.h"
#include "dialog_detached_video.h" #include "../dialog_jumpto.h"
#include "dialog_video_details.h" #include "../dialog_video_details.h"
#include "video_slider.h" #include "../subs_grid.h"
#include "dialog_dummy_video.h" #include "../utils.h"
#include "compat.h" #include "../video_box.h"
#include "dialog_jumpto.h" #include "../video_context.h"
#include "../video_display.h"
#include "../video_slider.h"
namespace cmd { namespace cmd {
/// @defgroup cmd-video Video commands. /// @defgroup cmd-video Video commands.

1
aegisub/src/dialog_fonts_collector.h
View file

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

2
aegisub/src/dialog_styling_assistant.cpp
View file

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

2
aegisub/src/dialog_translation.cpp
View file

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

7
aegisub/src/frame_main.cpp
View file

@ -46,9 +46,9 @@
#include <libaegisub/log.h> #include <libaegisub/log.h>
#include "aegisub/menu.h" #include "include/aegisub/menu.h"
#include "aegisub/toolbar.h" #include "include/aegisub/toolbar.h"
#include "aegisub/hotkey.h" #include "include/aegisub/hotkey.h"
#include "ass_file.h" #include "ass_file.h"
#include "selection_controller.h" #include "selection_controller.h"
@ -64,6 +64,7 @@
#include "command/command.h" #include "command/command.h"
#include "dialog_detached_video.h" #include "dialog_detached_video.h"
#include "dialog_search_replace.h" #include "dialog_search_replace.h"
#include "dialog_styling_assistant.h"
#include "dialog_version_check.h" #include "dialog_version_check.h"
#include "drop.h" #include "drop.h"
#include "frame_main.h" #include "frame_main.h"

2
aegisub/src/frame_main.h
View file

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

4
aegisub/src/hotkey.cpp
View file

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

20
aegisub/src/include/aegisub/context.h
View file

@ -1,15 +1,15 @@
#pragma once // sigh. #pragma once // sigh.
#include <wx/window.h> class wxWindow;
class DialogStyling;
#include "ass_file.h" class AudioBox;
#include "subs_grid.h" class AudioController;
#include "audio_box.h" class DialogDetachedVideo;
#include "video_box.h" class AssFile;
#include "dialog_detached_video.h" namespace Automation4 { class ScriptManager; }
#include "auto4_base.h" class SubsEditBox;
#include "dialog_styling_assistant.h" class SubtitlesGrid;
#include "audio_controller.h" class VideoBox;
namespace agi { namespace agi {

6
aegisub/src/main.cpp
View file

@ -50,11 +50,11 @@
#include <wx/utils.h> #include <wx/utils.h>
#endif #endif
#include "aegisub/menu.h" #include "include/aegisub/menu.h"
#include "command/command.h" #include "command/command.h"
#include "command/icon.h" #include "command/icon.h"
#include "aegisub/toolbar.h" #include "include/aegisub/toolbar.h"
#include "aegisub/hotkey.h" #include "include/aegisub/hotkey.h"
#include "ass_dialogue.h" #include "ass_dialogue.h"
#include "ass_export_filter.h" #include "ass_export_filter.h"

2
aegisub/src/menu.cpp
View file

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

2
aegisub/src/subs_edit_box.cpp
View file

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

2
aegisub/src/subs_grid.cpp
View file

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

2
aegisub/src/toolbar.cpp
View file

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

2
aegisub/src/video_display.cpp
View file

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