Fix all the headers in *., this includes:

* Wrapping all headers that are in agi_pre.h with AGI_PRE.
  * Sorting alphabetically.
  * Same operation as r3515.

Note: This is broken when precompiled headers are not in use, I'll fix that after this commit so the two changes don't get jumbled up.

Originally committed to SVN as r3525.
This commit is contained in:
Amar Takhar 2009-09-11 02:36:34 +00:00
parent 8eda8f2a9c
commit 774fb0f674
161 changed files with 563 additions and 280 deletions

View file

@ -72,9 +72,9 @@
# endif
#endif
#ifndef AGI_PRE
#include <stdint.h>
#endif
/// DOCME

View file

@ -37,17 +37,18 @@
///////////
// Headers
#ifndef AGI_PRE
#include <vector>
#endif
#include "ass_entry.h"
#include "boost/shared_ptr.hpp"
#include <vector>
/// DOCME
typedef std::vector<unsigned char> DataVec;
/// @class AttachData
/// @brief DOCME
class AttachData {

View file

@ -37,7 +37,11 @@
////////////
// Includes
#ifndef AGI_PRE
#include <vector>
#endif
#include "ass_entry.h"
#include "ass_time.h"

View file

@ -40,7 +40,10 @@
///////////
// Headers
#ifndef AGI_PRE
#include <wx/string.h>
#endif
#include "include/aegisub/exception.h"

View file

@ -40,9 +40,12 @@
///////////
// Headers
#ifndef AGI_PRE
#include <list>
#include <wx/string.h>
#include <wx/window.h>
#include <list>
#endif
//////////////

View file

@ -40,11 +40,14 @@
///////////
// Headers
#include <wx/string.h>
#include <wx/sizer.h>
#ifndef AGI_PRE
#include <wx/arrstr.h>
#include <wx/sizer.h>
#include <wx/string.h>
#include <list>
#include <map>
#endif
//////////////

View file

@ -40,10 +40,14 @@
///////////
// Headers
#ifndef AGI_PRE
#include <fstream>
#include <list>
#include <vector>
#include <wx/arrstr.h>
#endif
//////////////
// Prototypes

View file

@ -36,8 +36,11 @@
#pragma once
#include "ass_dialogue.h"
#ifndef AGI_PRE
#include <vector>
#endif
#include "ass_dialogue.h"
/// DOCME

View file

@ -40,8 +40,11 @@
///////////
// Headers
#ifndef AGI_PRE
#include <list>
#include <vector>
#endif
#include "variable_data.h"

View file

@ -39,7 +39,10 @@
///////////
// Headers
#ifndef AGI_PRE
#include <wx/colour.h>
#endif
#include "ass_entry.h"

View file

@ -43,9 +43,12 @@
////////////
// Includes
#include <wx/arrstr.h>
#ifndef AGI_PRE
#include <list>
#include <wx/arrstr.h>
#endif
//////////////
// Prototypes

View file

@ -40,9 +40,11 @@
///////////
// Headers
#include <wx/string.h>
#ifndef AGI_PRE
#include <stdint.h>
#include <wx/string.h>
#endif
/// DOCME

View file

@ -43,17 +43,20 @@
///////////
// Headers
#include <wx/string.h>
#include <wx/panel.h>
#include <wx/menu.h>
#include <wx/scrolbar.h>
#include <wx/button.h>
#ifndef AGI_PRE
#include <wx/bmpbuttn.h>
#include <wx/button.h>
#include <wx/menu.h>
#include <wx/panel.h>
#include <wx/sashwin.h>
#include <wx/slider.h>
#include <wx/scrolbar.h>
#include <wx/sizer.h>
#include <wx/slider.h>
#include <wx/string.h>
#include <wx/textctrl.h>
#include <wx/tglbtn.h>
#endif
//////////////
// Prototypes

View file

@ -43,12 +43,16 @@
///////////
// Headers
#include <wx/window.h>
#ifndef AGI_PRE
#include <stdint.h>
#include <wx/bitmap.h>
#include <wx/scrolbar.h>
#include <stdint.h>
#include "audio_provider_manager.h"
#include <wx/window.h>
#endif
#include "audio_player_manager.h"
#include "audio_provider_manager.h"
#include "audio_renderer_spectrum.h"

View file

@ -43,10 +43,14 @@
///////////
// Headers
#include <wx/window.h>
#ifndef AGI_PRE
#include <vector>
#include <wx/log.h>
#include <wx/menu.h>
#include <vector>
#include <wx/window.h>
#endif
#include "ass_karaoke.h"

View file

@ -40,12 +40,13 @@
///////////
// Headers
#include <alsa/asoundlib.h>
#include "frame_main.h"
#include "include/aegisub/audio_player.h"
#include "include/aegisub/audio_provider.h"
#include "utils.h"
#include "frame_main.h"
#include <alsa/asoundlib.h>
#include "options.h"
#include "utils.h"

View file

@ -39,12 +39,16 @@
// Headers
#ifdef WITH_DIRECTSOUND
#ifndef AGI_PRE
#include <mmsystem.h>
#endif
#include <dsound.h>
#include "frame_main.h"
#include "include/aegisub/audio_player.h"
#include "include/aegisub/audio_provider.h"
#include "utils.h"
#include "frame_main.h"
#include <mmsystem.h>
#include <dsound.h>
//////////////

View file

@ -40,10 +40,14 @@
///////////
// Headers
#include <wx/event.h>
#include <wx/timer.h>
#include <wx/thread.h>
#ifndef AGI_PRE
#include <stdint.h>
#include <wx/event.h>
#include <wx/thread.h>
#include <wx/timer.h>
#endif
#include "factory_manager.h"
#include "include/aegisub/audio_player.h"

View file

@ -40,12 +40,12 @@
///////////
// Headers
#include "audio_player_manager.h"
#include "frame_main.h"
#include "include/aegisub/audio_player.h"
#include "include/aegisub/audio_provider.h"
#include "utils.h"
#include "frame_main.h"
#include "audio_player_manager.h"
#include "options.h"
#include "utils.h"
#ifdef __WINDOWS__
#include <al.h>

View file

@ -41,8 +41,11 @@
///////////
// Headers
#include <fcntl.h>
#ifndef AGI_PRE
#include <sys/ioctl.h>
#endif
#include <fcntl.h>
#ifdef HAVE_SOUNDCARD_H
# include <soundcard.h>
#else
@ -50,11 +53,13 @@
# include <sys/soundcard.h>
# endif
#endif
#include "frame_main.h"
#include "include/aegisub/audio_player.h"
#include "include/aegisub/audio_provider.h"
#include "utils.h"
#include "frame_main.h"
#include "options.h"
#include "utils.h"
//////////////

View file

@ -47,6 +47,7 @@ extern "C" {
#include <portaudio.h>
}
/// @class PortAudioPlayer
/// @brief PortAudio Player
///

View file

@ -40,12 +40,16 @@
///////////
// Headers
#ifndef AGI_PRE
#include <stdio.h>
#endif
#include <pulse/pulseaudio.h>
#include "include/aegisub/audio_player.h"
#include "include/aegisub/audio_provider.h"
#include "utils.h"
#include "options.h"
#include <pulse/pulseaudio.h>
#include "utils.h"
//////////////

View file

@ -43,7 +43,6 @@
#include "avisynth_wrap.h"
/// DOCME
/// @class AvisynthAudioProvider
/// @brief DOCME

View file

@ -43,7 +43,6 @@
#include "include/aegisub/audio_provider.h"
/// DOCME
/// @class ConvertAudioProvider
/// @brief DOCME

View file

@ -34,6 +34,7 @@
/// @ingroup audio_input
///
#include "include/aegisub/audio_provider.h"

View file

@ -43,7 +43,6 @@
#include "include/aegisub/audio_provider.h"
/// DOCME
/// @class DummyAudioProvider
/// @brief DOCME

View file

@ -41,7 +41,6 @@
#include "ffmpegsource_common.h"
/// DOCME
/// @class FFmpegSourceAudioProvider
/// @brief DOCME

View file

@ -40,9 +40,12 @@
///////////
// Headers
#include "include/aegisub/audio_provider.h"
#ifndef AGI_PRE
#include <wx/file.h>
#include <wx/thread.h>
#endif
#include "include/aegisub/audio_provider.h"

View file

@ -40,10 +40,12 @@
///////////
// Headers
#ifndef AGI_PRE
#include <stdint.h>
#include "factory_manager.h"
#include "include/aegisub/audio_provider.h"
#endif
#include "include/aegisub/audio_provider.h"
#include "factory_manager.h"
/// DOCME

View file

@ -40,15 +40,18 @@
///////////
// Headers
#include "include/aegisub/audio_provider.h"
#ifndef AGI_PRE
#include <vector>
#include <wx/file.h>
#include <wx/thread.h>
#include <vector>
#endif
#ifdef _WINDOWS
#include <windows.h>
#endif
#include "include/aegisub/audio_provider.h"
/// DOCME

View file

@ -40,7 +40,10 @@
#include "quicktime_common.h"
#ifdef WITH_QUICKTIME
#ifndef AGI_PRE
#include <wx/log.h>
#endif
#include "include/aegisub/audio_provider.h"

View file

@ -43,7 +43,6 @@
#include "include/aegisub/audio_provider.h"
/// DOCME
/// @class RAMAudioProvider
/// @brief DOCME

View file

@ -40,10 +40,12 @@
///////////
// Headers
#ifndef AGI_PRE
#include <list>
#include <vector>
#include "include/aegisub/audio_provider.h"
#endif
#include "include/aegisub/audio_provider.h"
/// DOCME

View file

@ -36,9 +36,13 @@
/// Base classes for audio renderers (spectrum, waveform, ...)
#ifndef AGI_PRE
#include <memory>
#include <wx/dc.h>
#include <wx/gdicmn.h>
#include <memory>
#endif
#include "block_cache.h"

View file

@ -42,7 +42,10 @@
/// Include guard for audio_spectrum.h
#define AUDIO_SPECTRUM_H
#ifndef AGI_PRE
#include <stdint.h>
#endif
#include "audio_provider_manager.h"

View file

@ -41,18 +41,22 @@
/// DOCME
#define _AUTO4_BASE_H
#include <wx/string.h>
#include <wx/sizer.h>
#include <wx/gauge.h>
#include <wx/timer.h>
#include <wx/stattext.h>
#include <wx/dialog.h>
#include <wx/textctrl.h>
#ifndef AGI_PRE
#include <vector>
#include <wx/dialog.h>
#include <wx/gauge.h>
#include <wx/sizer.h>
#include <wx/stattext.h>
#include <wx/string.h>
#include <wx/textctrl.h>
#include <wx/timer.h>
#endif
#include "ass_export_filter.h"
#include "subtitle_format.h"
class AssFile;
class AssStyle;
class wxWindow;

View file

@ -41,15 +41,18 @@
/// DOCME
#define _AUTO4_LUA_H
#include "auto4_base.h"
#include <wx/thread.h>
#ifndef AGI_PRE
#include <wx/event.h>
#include <wx/thread.h>
#endif
#include "auto4_base.h"
#ifdef __WINDOWS__
#include "../../contrib/lua51/src/lua.h"
#include "../../contrib/lua51/src/lauxlib.h"
#else
#include "lua.hpp"
#include <lua.hpp>
#endif
class wxWindow;

View file

@ -45,7 +45,10 @@
// Headers
#ifdef WITH_AVISYNTH
#ifndef AGI_PRE
#include <windows.h>
#endif
#include "avisynth.h"

View file

@ -40,11 +40,14 @@
////////////
// Includes
#include <wx/grid.h>
#include <wx/scrolbar.h>
#ifndef AGI_PRE
#include <list>
#include <vector>
#include <wx/grid.h>
#include <wx/scrolbar.h>
#endif
//////////////
// Prototypes

View file

@ -39,9 +39,10 @@
#define BLOCK_CACHE_H
#include <vector>
#ifndef AGI_PRE
#include <algorithm>
#include <vector>
#endif
/// @class BasicDataBlockFactory

View file

@ -40,9 +40,10 @@
////////////
// Includes
#ifndef AGI_PRE
#include <wx/button.h>
#include <wx/textctrl.h>
#endif
/// DOCME

View file

@ -39,15 +39,19 @@
/// DOCME
#define AEGISUB_CHARSET_CONV_H
#ifndef AGI_PRE
#include <iconv.h>
#include <wchar.h>
#include <wx/arrstr.h>
#include <wx/thread.h>
#include <wx/string.h>
#include <wx/strconv.h>
#include <wx/thread.h>
#endif
#include "aegisub_endian.h"
#if !defined(_LIBICONV_VERSION) || _LIBICONV_VERSION < 0x010A || defined(LIBICONV_PLUG)
/// DOCME

View file

@ -42,7 +42,6 @@
#include "../universalchardet/nsUniversalDetector.h"
/// DOCME
/// @class CharSetDetect
/// @brief DOCME

View file

@ -39,9 +39,10 @@
/// DOCME
#define COLORSPACE_H
#ifndef AGI_PRE
#include <wx/colour.h>
#include <wx/string.h>
#endif
/// @brief DOCME

View file

@ -40,8 +40,9 @@
////////////
// Includes
#ifndef AGI_PRE
#include <wx/bmpbuttn.h>
#endif
/// DOCME

View file

@ -40,9 +40,11 @@
////////////
// Includes
#ifndef AGI_PRE
#include <wx/dialog.h>
#include "static_bmp.h"
#endif
#include "static_bmp.h"
/// @class AboutScreen

View file

@ -40,10 +40,11 @@
///////////
// Headers
#ifndef AGI_PRE
#include <wx/dialog.h>
#include <wx/checklst.h>
#include <wx/slider.h>
#endif
/// DOCME

View file

@ -41,14 +41,17 @@
/// DOCME
#define DIALOG_AUTOMATION_H
#ifndef AGI_PRE
#include <vector>
#include <wx/button.h>
#include <wx/dialog.h>
#include <wx/listctrl.h>
#include <wx/button.h>
#include <vector>
#endif
/// DOCME
namespace Automation4 { class ScriptManager; class Script; class AutoloadScriptManager; };
namespace Automation4 { class ScriptManager; class Script; };
/// DOCME

View file

@ -39,17 +39,18 @@
/// DOCME
#define DIALOG_COLORPICKER_H
#include <wx/dialog.h>
#include <wx/spinctrl.h>
#include <wx/colour.h>
#include <wx/bitmap.h>
#include <wx/textctrl.h>
#include <wx/button.h>
#include <wx/choice.h>
#include <wx/statbmp.h>
#ifndef AGI_PRE
#include <vector>
#include <wx/bitmap.h>
#include <wx/button.h>
#include <wx/choice.h>
#include <wx/colour.h>
#include <wx/dialog.h>
#include <wx/spinctrl.h>
#include <wx/statbmp.h>
#include <wx/textctrl.h>
#endif
/// DOCME

View file

@ -38,8 +38,9 @@
#pragma once
#ifndef AGI_PRE
#include <wx/dialog.h>
#endif
//////////////
// Prototypes

View file

@ -39,15 +39,18 @@
/// DOCME
#define _DIALOG_DUMMY_VIDEO_H
#include <wx/dialog.h>
#include <wx/string.h>
#include <wx/stattext.h>
#include <wx/spinctrl.h>
#include <wx/combobox.h>
#ifndef AGI_PRE
#include <wx/checkbox.h>
#include <wx/combobox.h>
#include <wx/dialog.h>
#include <wx/spinctrl.h>
#include <wx/stattext.h>
#include <wx/string.h>
#include <wx/textctrl.h>
#include "video_provider_dummy.h"
#endif
#include "colour_button.h"
#include "video_provider_dummy.h"
/// DOCME

View file

@ -40,15 +40,17 @@
///////////
// Headers
#ifndef AGI_PRE
#include <map>
#include <wx/checklst.h>
#include <wx/choice.h>
#include <wx/dialog.h>
#include <wx/panel.h>
#include <wx/sizer.h>
#include <wx/string.h>
#include <wx/textctrl.h>
#include <wx/checklst.h>
#include <wx/choice.h>
#include <wx/panel.h>
#include <map>
#endif
/// DOCME

View file

@ -40,12 +40,15 @@
////////////
// Includes
#include <wx/stc/stc.h>
#ifndef AGI_PRE
#include <wx/button.h>
#include <wx/stattext.h>
#include <wx/textctrl.h>
#include <wx/dialog.h>
#include <wx/radiobox.h>
#include <wx/stattext.h>
#include <wx/stc/stc.h>
#include <wx/textctrl.h>
#endif
//////////////
// Prototypes

View file

@ -47,7 +47,6 @@
#include "timeedit_ctrl.h"
/// DOCME
/// @class DialogJumpTo
/// @brief DOCME

View file

@ -43,16 +43,20 @@
///////////
// Headers
#ifndef AGI_PRE
#include <vector>
#include <wx/checkbox.h>
#include <wx/combobox.h>
#include <wx/dialog.h>
#include <wx/listctrl.h>
#include <wx/regex.h>
#include <wx/checkbox.h>
#include <wx/dialog.h>
#include <wx/combobox.h>
#include <vector>
#include "options.h"
#include "kana_table.h"
#include "ass_file.h"
#endif
#include "ass_entry.h"
#include "ass_file.h"
#include "kana_table.h"
#include "options.h"
//////////////

View file

@ -40,12 +40,16 @@
////////////
// Includes
#ifndef AGI_PRE
#include <map>
#include <vector>
#include <wx/dialog.h>
#include <wx/listctrl.h>
#include <vector>
#include <map>
#include "options.h"
#endif
#include "hotkeys.h"
#include "options.h"
//////////////

View file

@ -40,9 +40,10 @@
///////////
// Headers
#ifndef AGI_PRE
#include <wx/dialog.h>
#include <wx/checklst.h>
#endif
/// DOCME

View file

@ -43,10 +43,11 @@
///////////
// Headers
#ifndef AGI_PRE
#include <wx/dialog.h>
#include <wx/gauge.h>
#include <wx/stattext.h>
#endif
/// DOCME

View file

@ -40,10 +40,11 @@
///////////
// Headers
#include <wx/textctrl.h>
#include <wx/combobox.h>
#ifndef AGI_PRE
#include <wx/checkbox.h>
#include <wx/combobox.h>
#include <wx/textctrl.h>
#endif
/// DOCME

View file

@ -43,10 +43,12 @@
///////////
// Headers
#ifndef AGI_PRE
#include <wx/checkbox.h>
#include <wx/dialog.h>
#include <wx/string.h>
#include <wx/textctrl.h>
#include <wx/checkbox.h>
#endif
//////////////

View file

@ -40,12 +40,14 @@
///////////
// Headers
#include <wx/dialog.h>
#include <wx/string.h>
#include <wx/combobox.h>
#ifndef AGI_PRE
#include <wx/checkbox.h>
#include <wx/textctrl.h>
#include <wx/combobox.h>
#include <wx/dialog.h>
#include <wx/radiobox.h>
#include <wx/string.h>
#include <wx/textctrl.h>
#endif
//////////////

View file

@ -43,11 +43,14 @@
///////////
// Headers
#include <wx/dialog.h>
#include <wx/textctrl.h>
#ifndef AGI_PRE
#include <wx/checkbox.h>
#include <wx/radiobut.h>
#include <wx/combobox.h>
#include <wx/dialog.h>
#include <wx/radiobox.h>
#include <wx/string.h>
#include <wx/textctrl.h>
#endif
//////////////

View file

@ -43,10 +43,13 @@
///////////
// Headers
#ifndef AGI_PRE
#include <wx/dialog.h>
#include <wx/radiobut.h>
#include <wx/radiobox.h>
#include <wx/listbox.h>
#include <wx/radiobox.h>
#include <wx/radiobut.h>
#endif
#include "timeedit_ctrl.h"

View file

@ -38,12 +38,15 @@
///////////
// Headers
#include <wx/dialog.h>
#include <wx/textctrl.h>
#include <wx/listbox.h>
#include <wx/combobox.h>
#ifndef AGI_PRE
#include <map>
#include <wx/dialog.h>
#include <wx/combobox.h>
#include <wx/listbox.h>
#include <wx/textctrl.h>
#endif
//////////////
// Prototypes

View file

@ -43,9 +43,10 @@
////////////
// Includes
#ifndef AGI_PRE
#include <wx/frame.h>
#include <wx/timer.h>
#endif
/// DOCME

View file

@ -43,11 +43,14 @@
////////////
// Includes
#include <wx/spinctrl.h>
#include <wx/combobox.h>
#ifndef AGI_PRE
#include <wx/checkbox.h>
#include <wx/combobox.h>
#include <wx/radiobox.h>
#include <wx/spinctrl.h>
#include <wx/textctrl.h>
#endif
#include "colour_button.h"

View file

@ -43,11 +43,15 @@
////////////
// Includes
#include <wx/dialog.h>
#include <wx/combobox.h>
#include <wx/listbox.h>
#include <wx/button.h>
#ifndef AGI_PRE
#include <vector>
#include <wx/button.h>
#include <wx/combobox.h>
#include <wx/dialog.h>
#include <wx/listbox.h>
#endif
#include "ass_style_storage.h"

View file

@ -43,11 +43,13 @@
///////////
// Headers
#include <wx/dialog.h>
#include <wx/colour.h>
#include <wx/textctrl.h>
#include <wx/listbox.h>
#ifndef AGI_PRE
#include <wx/checkbox.h>
#include <wx/colour.h>
#include <wx/dialog.h>