Kill the #ifndef AGI_PRE guards

They don't actually improve compilation performance and make it more
annoying to modify what things are in the precompiled header.

aegisub/libaegisub/common/cajun/elements.cpp

@@ -11,10 +11,8 @@ Author: Terry Caton
 
 #include "libaegisub/cajun/visitor.h"
 
-#ifndef LAGI_PRE
 #include <algorithm>
 #include <cassert>
-#endif
 
 namespace {
 	using namespace json;

aegisub/libaegisub/common/cajun/reader.cpp

@@ -8,11 +8,9 @@ Author: Terry Caton
 
 #include "libaegisub/cajun/reader.h"
 
-#ifndef LAGI_PRE
 #include <cassert>
 #include <set>
 #include <sstream>
-#endif
 
 /*
 

aegisub/libaegisub/common/cajun/writer.cpp

@@ -8,11 +8,9 @@ Author: Terry Caton
 
 #include "libaegisub/cajun/writer.h"
 
-#ifndef LAGI_PRE
 #include <cmath>
 #include <iostream>
 #include <iomanip>
-#endif
 
 /*
 

aegisub/libaegisub/common/charset_6937.cpp

@@ -20,10 +20,8 @@
 
 #include "charset_6937.h"
 
-#ifndef LAGI_PRE
 #include <algorithm>
 #include <cerrno>
-#endif
 
 #include <iconv.h>
 

aegisub/libaegisub/common/charset_conv.cpp

@@ -16,13 +16,11 @@
 /// @brief Wrapper for libiconv to present a more C++-friendly API
 /// @ingroup libaegisub
 
-#ifndef LAGI_PRE
 #include <errno.h>
 #include <cstdint>
 
 #include <cassert>
 #include <map>
-#endif
 
 #include "../config.h"
 

aegisub/libaegisub/common/charset_ucd.h

@@ -18,9 +18,7 @@
 
 #include "libaegisub/charset.h"
 
-#ifndef LAGI_PRE
 #include <string>
-#endif
 
 #ifndef _WIN32
 #define _X86_ 1

aegisub/libaegisub/common/hotkey.cpp

@@ -18,12 +18,10 @@
 
 #include "../config.h"
 
-#ifndef LAGI_PRE
 #include <algorithm>
 #include <cmath>
 #include <memory>
 #include <tuple>
-#endif
 
 #include "libaegisub/hotkey.h"
 

aegisub/libaegisub/common/io.cpp

@@ -16,13 +16,11 @@
 /// @brief Windows IO methods.
 /// @ingroup libaegisub
 
-#ifndef LAGI_PRE
 #include <sys/stat.h>
 #include <errno.h>
 
 #include <iostream>
 #include <fstream>
-#endif
 
 #include <libaegisub/access.h>
 #include <libaegisub/charset_conv_win.h>

aegisub/libaegisub/common/json.cpp

@@ -18,10 +18,8 @@
 
 #include "../config.h"
 
-#ifndef LAGI_PRE
 #include <fstream>
 #include <sstream>
-#endif
 
 #include "libaegisub/io.h"
 #include "libaegisub/json.h"

aegisub/libaegisub/common/keyframe.cpp

@@ -20,10 +20,8 @@
 
 #include "../config.h"
 
-#ifndef LAGI_PRE
 #include <algorithm>
 #include <fstream>
-#endif
 
 #include "libaegisub/io.h"
 #include "libaegisub/line_iterator.h"

aegisub/libaegisub/common/log.cpp

@@ -18,14 +18,12 @@
 
 #include "../config.h"
 
-#ifndef LAGI_PRE
 #include <algorithm>
 #include <cstdio>
 #include <cstring>
 #include <functional>
 #include <memory>
 #include <sstream>
-#endif
 
 #include "libaegisub/cajun/elements.h"
 #include "libaegisub/cajun/writer.h"

aegisub/libaegisub/common/option.cpp

@@ -20,13 +20,11 @@
 
 #include "libaegisub/option.h"
 
-#ifndef LAGI_PRE
 #include <cassert>
 #include <fstream>
 #include <map>
 #include <memory>
 #include <sstream>
-#endif
 
 #include "libaegisub/cajun/reader.h"
 #include "libaegisub/cajun/writer.h"

aegisub/libaegisub/common/option_visit.cpp

@@ -21,10 +21,8 @@
 
 #include "option_visit.h"
 
-#ifndef LAGI_PRE
 #include <cassert>
 #include <cmath>
-#endif
 
 #include <libaegisub/color.h>
 #include <libaegisub/log.h>

aegisub/libaegisub/common/option_visit.h

@@ -21,9 +21,7 @@
 #include "libaegisub/cajun/elements.h"
 #include "libaegisub/cajun/visitor.h"
 
-#ifndef LAGI_PRE
 #include <vector>
-#endif
 
 namespace agi {
 

aegisub/libaegisub/common/parser.h

@@ -12,9 +12,7 @@
 // ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
 // OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 
-#ifndef LAGI_PRE
 #include <string>
-#endif
 
 namespace agi {
 	struct Color;

aegisub/libaegisub/common/thesaurus.cpp

@@ -26,9 +26,7 @@
 #include <boost/phoenix/operator/comparison.hpp>
 #include <boost/phoenix/core/argument.hpp>
 
-#ifndef LAGI_PRE
 #include <cstdlib>
-#endif
 
 using boost::phoenix::placeholders::_1;
 

aegisub/libaegisub/common/util.cpp

@@ -16,13 +16,11 @@
 /// @brief Unix utility methods.
 /// @ingroup libaegisub
 
-#ifndef LAGI_PRE
 #include <errno.h>
 
 #include <climits>
 #include <cstdio>
 #include <locale>
-#endif
 
 #include "libaegisub/util.h"
 

aegisub/libaegisub/common/vfr.cpp

@@ -18,14 +18,12 @@
 
 #include "libaegisub/vfr.h"
 
-#ifndef LAGI_PRE
 #include <algorithm>
 #include <cmath>
 #include <functional>
 #include <iterator>
 #include <list>
 #include <numeric>
-#endif
 
 #include "libaegisub/charset.h"
 #include "libaegisub/io.h"

aegisub/libaegisub/config.h

@@ -1,4 +1,3 @@
-#ifndef LAGI_PRE
 
 #ifdef _WIN32 // Windows specific settings
 #define HAVE_PTHREAD 1
@@ -8,4 +7,3 @@
 #include "../acconf.h"
 
 #endif // _WIN32
-#endif // LAGI_PRE

aegisub/libaegisub/include/libaegisub/ass/dialogue_parser.h

@@ -14,9 +14,7 @@
 //
 // Aegisub Project http://www.aegisub.org/
 
-#ifndef LAGI_PRE
 #include <vector>
-#endif
 
 #undef ERROR
 

aegisub/libaegisub/include/libaegisub/background_runner.h

@@ -18,11 +18,9 @@
 
 #pragma once
 
-#ifndef LAGI_PRE
 #include <cstdint>
 #include <functional>
 #include <string>
-#endif
 
 namespace agi {
 	/// @class ProgressSink

aegisub/libaegisub/include/libaegisub/cajun/elements.h

@@ -8,14 +8,12 @@ Author: Terry Caton
 
 #pragma once
 
-#ifndef LAGI_PRE
 #include <cstdint>
 #include <deque>
 #include <list>
 #include <map>
 #include <string>
 #include <stdexcept>
-#endif
 
 namespace json
 {

aegisub/libaegisub/include/libaegisub/cajun/reader.h

@@ -10,10 +10,8 @@ Author: Terry Caton
 
 #include "elements.h"
 
-#ifndef LAGI_PRE
 #include <iostream>
 #include <vector>
-#endif
 
 namespace json
 {

aegisub/libaegisub/include/libaegisub/cajun/writer.h

@@ -11,9 +11,7 @@ Author: Terry Caton
 #include "elements.h"
 #include "visitor.h"
 
-#ifndef LAGI_PRE
 #include <ostream>
-#endif
 
 namespace json {
 

aegisub/libaegisub/include/libaegisub/calltip_provider.h

@@ -14,11 +14,9 @@
 //
 // Aegisub Project http://www.aegisub.org/
 
-#ifndef LAGI_PRE
 #include <map>
 #include <string>
 #include <vector>
-#endif
 
 namespace agi {
 	namespace ass { struct DialogueToken; }

aegisub/libaegisub/include/libaegisub/charset.h

@@ -16,12 +16,10 @@
 /// @brief Character set detection and manipulation utilities.
 /// @ingroup libaegisub
 
-#ifndef LAGI_PRE
 #include <fstream>
 #include <functional>
 #include <string>
 #include <vector>
-#endif
 #include <libaegisub/exception.h>
 
 namespace agi {

aegisub/libaegisub/include/libaegisub/charset_conv.h

@@ -18,11 +18,9 @@
 
 #pragma once
 
-#ifndef LAGI_PRE
 #include <cstring>
 #include <string>
 #include <vector>
-#endif
 
 #include <libaegisub/exception.h>
 #include <libaegisub/scoped_ptr.h>

aegisub/libaegisub/include/libaegisub/color.h

@@ -14,9 +14,7 @@
 
 #pragma once
 
-#ifndef LAGI_PRE
 #include <string>
-#endif
 
 namespace agi {
 	struct Color {

aegisub/libaegisub/include/libaegisub/hotkey.h

@@ -16,12 +16,10 @@
 /// @brief Hotkey handler
 /// @ingroup hotkey menu event window
 
-#ifndef LAGI_PRE
 #include <map>
 #include <memory>
 #include <string>
 #include <vector>
-#endif
 
 #include <libaegisub/signal.h>
 

aegisub/libaegisub/include/libaegisub/io.h

@@ -16,10 +16,8 @@
 /// @brief Public interface for IO methods.
 /// @ingroup libaegisub
 
-#ifndef LAGI_PRE
 #include <string>
 #include <fstream>
-#endif
 
 #include <libaegisub/exception.h>
 

aegisub/libaegisub/include/libaegisub/keyframe.h

@@ -17,9 +17,7 @@
 /// @ingroup libaegisub
 ///
 
-#ifndef LAGI_PRE
 #include <vector>
-#endif
 
 #include "exception.h"
 

aegisub/libaegisub/include/libaegisub/line_iterator.h

@@ -18,13 +18,11 @@
 
 #pragma once
 
-#ifndef LAGI_PRE
 #include <iterator>
 #include <memory>
 #include <sstream>
 
 #include <cstdint>
-#endif
 
 #include <libaegisub/charset_conv.h>
 

aegisub/libaegisub/include/libaegisub/line_wrap.h

@@ -15,12 +15,10 @@
 /// @file line_wrap.h
 /// @brief Generic paragraph formatting logic
 
-#ifndef LAGI_PRE
 #include <algorithm>
 #include <climits>
 #include <numeric>
 #include <vector>
-#endif
 
 namespace agi {
 	enum WrapMode {

aegisub/libaegisub/include/libaegisub/log.h

@@ -16,7 +16,6 @@
 /// @brief Logging
 /// @ingroup libaegisub
 
-#ifndef LAGI_PRE
 #include <cstdint>
 
 #include <cstdio>
@@ -31,7 +30,6 @@
 # include <strstream>
 #endif
 #include <vector>
-#endif
 #include <libaegisub/types.h>
 
 // These macros below aren't a perm solution, it will depend on how annoying they are through

aegisub/libaegisub/include/libaegisub/mru.h

@@ -16,12 +16,10 @@
 /// @brief Public interface for MRU (Most Recently Used) lists.
 /// @ingroup libaegisub
 
-#ifndef LAGI_PRE
 #include <deque>
 #include <fstream>
 #include <list>
 #include <map>
-#endif
 
 #include <libaegisub/exception.h>
 

aegisub/libaegisub/include/libaegisub/option.h

@@ -18,10 +18,8 @@
 
 #pragma once
 
-#ifndef LAGI_PRE
 #include <fstream>
 #include <map>
-#endif
 
 #include <libaegisub/exception.h>
 

aegisub/libaegisub/include/libaegisub/option_value.h

@@ -16,12 +16,10 @@
 /// @brief Container for holding an actual option value.
 /// @ingroup libaegisub
 
-#ifndef LAGI_PRE
 #include <cstdint>
 
 #include <fstream>
 #include <vector>
-#endif
 
 #include <libaegisub/color.h>
 #include <libaegisub/exception.h>

aegisub/libaegisub/include/libaegisub/signal.h

@@ -18,12 +18,10 @@
 
 #pragma once
 
-#ifndef LAGI_PRE
 #include <boost/container/map.hpp>
 
 #include <functional>
 #include <memory>
-#endif
 
 namespace agi {
 	namespace signal {

aegisub/libaegisub/include/libaegisub/spellchecker.h

@@ -16,10 +16,8 @@
 
 #pragma once
 
-#ifndef LAGI_PRE
 #include <string>
 #include <vector>
-#endif
 
 namespace agi {
 class SpellChecker {

aegisub/libaegisub/include/libaegisub/thesaurus.h

@@ -18,12 +18,10 @@
 
 #include <libaegisub/scoped_ptr.h>
 
-#ifndef LAGI_PRE
 #include <iosfwd>
 #include <map>
 #include <string>
 #include <vector>
-#endif
 
 namespace agi {
 

aegisub/libaegisub/include/libaegisub/types.h

@@ -16,14 +16,12 @@
 /// @brief Platform specific types.
 /// @ingroup libaegisub
 
-#ifndef LAGI_PRE
 #ifdef HAVE_SYS_TIME_H
 #  include <sys/time.h>
 #else
 #  include <time.h>
 #endif
 
-#endif // LAGI_PRE
 
 #pragma once
 

aegisub/libaegisub/include/libaegisub/util.h

@@ -16,12 +16,10 @@
 /// @brief Public interface for general utilities.
 /// @ingroup libaegisub
 
-#ifndef LAGI_PRE
 #include <cstdint>
 
 #include <string>
 #include <algorithm>
-#endif // LAGI_PRE
 
 #include <libaegisub/types.h>
 

aegisub/libaegisub/include/libaegisub/util_osx.h

@@ -28,9 +28,7 @@
 /// When linking with this library, be sure to add '-framework CoreFoundation'
 /// to the GCC commandline.
 
-#ifndef LAGI_PRE
 #include <string>
-#endif
 
 namespace agi {
     namespace util {

aegisub/libaegisub/include/libaegisub/util_win.h

@@ -16,9 +16,7 @@
 /// @brief Public interface for Windows utilities.
 /// @ingroup libaegisub windows
 
-#ifndef LAGI_PRE
 #include <string>
-#endif
 
 #define WIN32_LEAN_AND_MEAN
 #include <windows.h>

aegisub/libaegisub/include/libaegisub/vfr.h

@@ -18,12 +18,10 @@
 
 #pragma once
 
-#ifndef LAGI_PRE
 #include <string>
 #include <vector>
 
 #include <cstdint>
-#endif
 
 #include <libaegisub/exception.h>
 

aegisub/libaegisub/lagi_pre.h

@@ -1,7 +1,5 @@
 #include "config.h"
 
-#define LAGI_PRE
-
 // Common C
 #include <cassert>
 #include <cerrno>

aegisub/libaegisub/unix/access.cpp

@@ -20,13 +20,11 @@
 
 #include "libaegisub/access.h"
 
-#ifndef LAGI_PRE
 #include <sys/stat.h>
 #include <errno.h>
 
 #include <iostream>
 #include <fstream>
-#endif
 
 #include <unistd.h>
 

aegisub/libaegisub/unix/log.cpp

@@ -18,11 +18,9 @@
 
 #include "config.h"
 
-#ifndef LAGI_PRE
 #include <cstdio>
 #include <ctime>
 #include <cstring>
-#endif
 
 #include <unistd.h>
 

aegisub/libaegisub/unix/util.cpp

@@ -22,7 +22,6 @@
 
 #include "libaegisub/access.h"
 
-#ifndef LAGI_PRE
 #include <stdarg.h>
 #include <stdio.h>
 #include <sys/statvfs.h>
@@ -34,7 +33,6 @@
 
 #include <string>
 #include <fstream>
-#endif
 
 #include <string.h>
 

aegisub/libaegisub/windows/access.cpp

@@ -16,12 +16,10 @@
 /// @brief Windows access methods.
 /// @ingroup libaegisub windows
 
-#ifndef LAGI_PRE
 #include <windows.h>
 
 #include <iostream>
 #include <fstream>
-#endif
 
 #include <libaegisub/access.h>
 

aegisub/libaegisub/windows/log_win.cpp

@@ -16,11 +16,9 @@
 /// @brief Windows logging
 /// @ingroup libaegisub
 
-#ifndef LAGI_PRE
 #include <stdio.h>
 #include <time.h>
 #include <string.h>
-#endif
 
 #include "libaegisub/log.h"
 

aegisub/libaegisub/windows/util_win.cpp

@@ -16,7 +16,6 @@
 /// @brief Windows utility methods.
 /// @ingroup libaegisub windows
 
-#ifndef LAGI_PRE
 #include <stdarg.h>
 #include <stdio.h>
 
@@ -24,7 +23,6 @@
 #include <fstream>
 
 #include <windows.h>
-#endif
 
 #include "libaegisub/access.h"
 #include "libaegisub/charset_conv_win.h"

aegisub/src/aegisub_endian.h

@@ -70,9 +70,7 @@
 # endif
 #endif
 
-#ifndef AGI_PRE
 #include <cstdint>
-#endif
 
 
 /// DOCME

aegisub/src/aegisublocale.cpp

@@ -36,7 +36,6 @@
 
 #include "aegisublocale.h"
 
-#ifndef AGI_PRE
 #include <algorithm>
 #include <clocale>
 #include <functional>
@@ -46,7 +45,6 @@
 #include <wx/intl.h>
 #include <wx/stdpaths.h>
 #include <wx/choicdlg.h> // Keep this last so wxUSE_CHOICEDLG is set.
-#endif
 
 #include "standard_paths.h"
 

aegisub/src/aegisublocale.h

@@ -32,9 +32,7 @@
 /// @ingroup utility
 ///
 
-#ifndef AGI_PRE
 #include <wx/string.h>
-#endif
 
 class wxTranslations;
 

aegisub/src/agi_pre.h

@@ -50,8 +50,6 @@
 
 #include "../libaegisub/lagi_pre.h"
 
-#define AGI_PRE
-
 // General headers
 #include <array>
 #include <clocale>

aegisub/src/ass_attachment.cpp

@@ -34,11 +34,9 @@
 
 #include "config.h"
 
-#ifndef AGI_PRE
 #include <wx/filename.h>
 
 #include <istream>
-#endif
 
 #include "ass_attachment.h"
 

aegisub/src/ass_attachment.h

@@ -32,10 +32,8 @@
 /// @ingroup subs_storage
 ///
 
-#ifndef AGI_PRE
 #include <memory>
 #include <vector>
-#endif
 
 #include "ass_entry.h"
 

aegisub/src/ass_dialogue.cpp

@@ -33,14 +33,12 @@
 
 #include "config.h"
 
-#ifndef AGI_PRE
 #include <fstream>
 #include <list>
 #include <vector>
 
 #include <wx/regex.h>
 #include <wx/tokenzr.h>
-#endif
 
 #include "ass_dialogue.h"
 #include "ass_override.h"

aegisub/src/ass_dialogue.h

@@ -32,9 +32,7 @@
 /// @ingroup subs_storage
 ///
 
-#ifndef AGI_PRE
 #include <vector>
-#endif
 
 #include "ass_entry.h"
 #include "ass_time.h"

aegisub/src/ass_entry.h

@@ -34,9 +34,7 @@
 
 #pragma once
 
-#ifndef AGI_PRE
 #include <wx/string.h>
-#endif
 
 #include <boost/intrusive/list_hook.hpp>
 

aegisub/src/ass_export_filter.cpp

@@ -34,9 +34,7 @@
 
 #include "config.h"
 
-#ifndef AGI_PRE
 #include <algorithm>
-#endif
 
 #include "ass_export_filter.h"
 #include "utils.h"

aegisub/src/ass_export_filter.h

@@ -34,13 +34,11 @@
 
 #pragma once
 
-#ifndef AGI_PRE
 #include <memory>
 #include <vector>
 
 #include <wx/string.h>
 #include <wx/window.h>
-#endif
 
 class AssFile;
 class AssExportFilter;

aegisub/src/ass_exporter.cpp

@@ -41,9 +41,7 @@
 
 #include <libaegisub/scoped_ptr.h>
 
-#ifndef AGI_PRE
 #include <algorithm>
-#endif
 
 static inline FilterList::const_iterator filter_list_begin() {
 	return AssExportFilterChain::GetFilterList()->begin();

aegisub/src/ass_exporter.h

@@ -32,14 +32,12 @@
 /// @ingroup export
 ///
 
-#ifndef AGI_PRE
 #include <wx/arrstr.h>
 #include <wx/sizer.h>
 #include <wx/string.h>
 
 #include <map>
 #include <vector>
-#endif
 
 class AssExportFilter;
 class AssFile;

aegisub/src/ass_file.cpp

@@ -35,7 +35,6 @@
 
 #include "ass_file.h"
 
-#ifndef AGI_PRE
 #include <algorithm>
 #include <fstream>
 #include <inttypes.h>
@@ -44,7 +43,6 @@
 #include <wx/filename.h>
 #include <wx/log.h>
 #include <wx/msgdlg.h>
-#endif
 
 #include "ass_attachment.h"
 #include "ass_dialogue.h"

aegisub/src/ass_file.h

@@ -32,14 +32,12 @@
 /// @ingroup subs_storage
 ///
 
-#ifndef AGI_PRE
 #include <boost/container/list.hpp>
 
 #include <set>
 #include <vector>
 
 #include <wx/arrstr.h>
-#endif
 
 #include <boost/intrusive/list.hpp>
 

aegisub/src/ass_karaoke.cpp

@@ -29,9 +29,7 @@
 #include "include/aegisub/context.h"
 #include "selection_controller.h"
 
-#ifndef AGI_PRE
 #include <wx/intl.h>
-#endif
 
 wxString AssKaraoke::Syllable::GetText(bool k_tag) const {
 	wxString ret;

aegisub/src/ass_karaoke.h

@@ -20,13 +20,11 @@
 ///
 
 
-#ifndef AGI_PRE
 #include <map>
 #include <set>
 #include <vector>
 
 #include <wx/string.h>
-#endif
 
 #include <libaegisub/signal.h>
 

aegisub/src/ass_override.cpp

@@ -35,10 +35,8 @@
 
 #include "config.h"
 
-#ifndef AGI_PRE
 #include <wx/log.h>
 #include <wx/tokenzr.h>
-#endif
 
 #include <libaegisub/log.h>
 

aegisub/src/ass_override.h

@@ -32,9 +32,7 @@
 /// @ingroup subs_storage
 ///
 
-#ifndef AGI_PRE
 #include <vector>
-#endif
 
 #include "variable_data.h"
 

aegisub/src/ass_parser.cpp

@@ -22,11 +22,9 @@
 #include "ass_style.h"
 #include "subtitle_format.h"
 
-#ifndef AGI_PRE
 #include <algorithm>
 
 #include <wx/log.h>
-#endif
 
 AssParser::AssParser(AssFile *target, int version)
 : target(target)

aegisub/src/ass_parser.h

@@ -12,13 +12,11 @@
 // ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
 // OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 
-#ifndef AGI_PRE
 #include <array>
 #include <map>
 #include <memory>
 
 #include <wx/string.h>
-#endif
 
 #include "ass_entry.h"
 

aegisub/src/ass_style.cpp

@@ -34,12 +34,10 @@
 
 #include "config.h"
 
-#ifndef AGI_PRE
 #include <cctype>
 
 #include <wx/intl.h>
 #include <wx/tokenzr.h>
-#endif
 
 #include "ass_style.h"
 #include "compat.h"

aegisub/src/ass_style.h

@@ -32,11 +32,9 @@
 /// @ingroup subs_storage
 ///
 
-#ifndef AGI_PRE
 #include <array>
 
 #include <wx/colour.h>
-#endif
 
 #include "ass_entry.h"
 

aegisub/src/ass_style_storage.cpp

@@ -36,9 +36,7 @@
 
 #include "ass_style_storage.h"
 
-#ifndef AGI_PRE
 #include <functional>
-#endif
 
 #include "ass_style.h"
 #include "standard_paths.h"

aegisub/src/ass_style_storage.h

@@ -32,11 +32,9 @@
 /// @ingroup style_editor
 ///
 
-#ifndef AGI_PRE
 #include <deque>
 
 #include <wx/arrstr.h>
-#endif
 
 class AssStyle;
 

aegisub/src/ass_time.cpp

@@ -36,12 +36,10 @@
 
 #include "ass_time.h"
 
-#ifndef AGI_PRE
 #include <algorithm>
 #include <cmath>
 
 #include <wx/tokenzr.h>
-#endif
 
 #include "utils.h"
 

aegisub/src/ass_time.h

@@ -34,9 +34,7 @@
 
 #pragma once
 
-#ifndef AGI_PRE
 #include <wx/string.h>
-#endif
 
 #include <libaegisub/vfr.h>
 

aegisub/src/audio_box.cpp

@@ -34,7 +34,6 @@
 
 #include "config.h"
 
-#ifndef AGI_PRE
 #include <cmath>
 
 #include <wx/bmpbuttn.h>
@@ -49,7 +48,6 @@
 #include <wx/tglbtn.h>
 #include <wx/toolbar.h>
 #include <wx/laywin.h> // Keep this last so wxSW_3D is set.
-#endif
 
 #include <libaegisub/log.h>
 

aegisub/src/audio_box.h

@@ -32,9 +32,7 @@
 /// @ingroup audio_ui
 ///
 
-#ifndef AGI_PRE
 #include <wx/sashwin.h>
-#endif
 
 #include <libaegisub/signal.h>
 

aegisub/src/audio_colorscheme.cpp

@@ -34,9 +34,7 @@
 
 #include "config.h"
 
-#ifndef AGI_PRE
 #include <algorithm>
-#endif
 
 #include "audio_colorscheme.h"
 

aegisub/src/audio_colorscheme.h

@@ -34,11 +34,9 @@
 /// Manage colour schemes for the audio display
 
 
-#ifndef AGI_PRE
 #include <vector>
 
 #include <wx/colour.h>
-#endif
 
 #include "utils.h"
 

aegisub/src/audio_controller.cpp

@@ -34,11 +34,9 @@
 
 #include "config.h"
 
-#ifndef AGI_PRE
 #include <algorithm>
 
 #include <wx/filename.h>
-#endif
 
 #include <libaegisub/io.h>
 

aegisub/src/audio_controller.h

@@ -33,7 +33,6 @@
 
 #pragma once
 
-#ifndef AGI_PRE
 #include <cassert>
 #include <cstdint>
 #include <memory>
@@ -45,7 +44,6 @@
 #include <wx/timer.h>
 #include <wx/pen.h>
 #include <wx/power.h>
-#endif
 
 #include <libaegisub/exception.h>
 #include <libaegisub/scoped_ptr.h>

aegisub/src/audio_display.cpp

@@ -37,13 +37,11 @@
 
 #include "audio_display.h"
 
-#ifndef AGI_PRE
 #include <algorithm>
 
 #include <wx/dcbuffer.h>
 #include <wx/dcclient.h>
 #include <wx/mousestate.h>
-#endif
 
 #include "ass_time.h"
 #include "audio_colorscheme.h"

aegisub/src/audio_display.h

@@ -33,7 +33,6 @@
 /// @ingroup audio_ui
 ///
 
-#ifndef AGI_PRE
 #include <deque>
 #include <map>
 #include <cstdint>
@@ -42,7 +41,6 @@
 #include <wx/string.h>
 #include <wx/timer.h>
 #include <wx/window.h>
-#endif
 
 #include <libaegisub/scoped_ptr.h>
 #include <libaegisub/signal.h>

aegisub/src/audio_karaoke.cpp

@@ -23,7 +23,6 @@
 
 #include "audio_karaoke.h"
 
-#ifndef AGI_PRE
 #include <algorithm>
 #include <numeric>
 
@@ -36,7 +35,6 @@
 #include <wx/settings.h>
 #include <wx/sizer.h>
 #include <wx/tokenzr.h>
-#endif
 
 #include "include/aegisub/context.h"
 

aegisub/src/audio_karaoke.h

@@ -19,14 +19,12 @@
 /// @ingroup audio_ui
 ///
 
-#ifndef AGI_PRE
 #include <set>
 #include <vector>
 
 #include <wx/bitmap.h>
 #include <wx/timer.h>
 #include <wx/window.h>
-#endif
 
 #include <libaegisub/scoped_ptr.h>
 #include <libaegisub/signal.h>

aegisub/src/audio_marker.cpp

@@ -28,9 +28,7 @@
 #include "pen.h"
 #include "video_context.h"
 
-#ifndef AGI_PRE
 #include <algorithm>
-#endif
 
 class AudioMarkerKeyframe : public AudioMarker {
 	Pen *style;

aegisub/src/audio_marker.h

@@ -24,11 +24,9 @@
 #include <libaegisub/scoped_ptr.h>
 #include <libaegisub/signal.h>
 
-#ifndef AGI_PRE
 #include <vector>
 
 #include <wx/string.h>
-#endif
 
 class AudioMarkerKeyframe;
 class Pen;

aegisub/src/audio_player_alsa.cpp

@@ -46,11 +46,9 @@
 #include "frame_main.h"
 #include "main.h"
 
-#ifndef AGI_PRE
 #include <algorithm>
 
 #include <inttypes.h>
-#endif
 
 class PthreadMutexLocker {
 	pthread_mutex_t &mutex;

aegisub/src/audio_player_dsound.h

@@ -34,9 +34,7 @@
 
 #ifdef WITH_DIRECTSOUND
 
-#ifndef AGI_PRE
 #include <mmsystem.h>
-#endif
 
 #include <dsound.h>
 

aegisub/src/audio_player_dsound2.cpp

@@ -36,9 +36,7 @@
 
 #ifdef WITH_DIRECTSOUND
 
-#ifndef AGI_PRE
 #include <mmsystem.h>
-#endif
 #include <process.h>
 #include <dsound.h>
 

aegisub/src/audio_player_openal.h

@@ -47,11 +47,9 @@
 #include <AL/alc.h>
 #endif
 
-#ifndef AGI_PRE
 #include <vector>
 
 #include <wx/timer.h>
-#endif
 
 /// DOCME
 /// @class OpenALPlayer

aegisub/src/audio_player_oss.cpp

@@ -34,9 +34,7 @@
 
 #ifdef WITH_OSS
 
-#ifndef AGI_PRE
 #include <sys/param.h>
-#endif
 
 #include <libaegisub/log.h>
 

aegisub/src/audio_player_oss.h

@@ -33,11 +33,9 @@
 ///
 
 #ifdef WITH_OSS
-#ifndef AGI_PRE
 #include <sys/ioctl.h>
 
 #include <wx/thread.h>
-#endif
 
 #include <fcntl.h>
 #ifdef HAVE_SOUNDCARD_H

aegisub/src/audio_player_portaudio.h

@@ -40,11 +40,9 @@ extern "C" {
 #include <portaudio.h>
 }
 
-#ifndef AGI_PRE
 #include <map>
 #include <string>
 #include <vector>
-#endif
 
 class wxArrayString;
 

aegisub/src/audio_player_pulse.cpp

@@ -36,11 +36,9 @@
 
 #ifdef WITH_LIBPULSE
 
-#ifndef AGI_PRE
 #include <cstdio>
 
 #include <wx/thread.h>
-#endif
 
 #include "audio_player_pulse.h"
 

aegisub/src/audio_provider.cpp

@@ -35,9 +35,7 @@
 
 #include "config.h"
 
-#ifndef AGI_PRE
 #include <wx/thread.h>
-#endif
 
 #include "audio_controller.h"
 #ifdef WITH_AVISYNTH