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

Move cajun includes into the cpp files rather than headers so that only files in libaegisub include them.

Browse source 
Originally committed to SVN as r4473.
This commit is contained in:
Thomas Goyne 2010-06-11 02:25:07 +00:00
parent c290b6b811
commit 612b583e2b
5 changed files with 17 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
aegisub/libaegisub/common/mru.cpp
View file

@ -21,6 +21,10 @@
#ifndef LAGI_PRE #ifndef LAGI_PRE
#include <fstream> #include <fstream>
#include <time.h> #include <time.h>
#include "libaegisub/cajun/reader.h"
#include "libaegisub/cajun/writer.h"
#include "libaegisub/cajun/elements.h"
#endif #endif
#include "libaegisub/access.h" #include "libaegisub/access.h"

4
aegisub/libaegisub/common/option.cpp
View file

@ -22,6 +22,10 @@
#include <fstream> #include <fstream>
#include <sstream> #include <sstream>
#include <map> #include <map>
#include "libaegisub/cajun/reader.h"
#include "libaegisub/cajun/writer.h"
#include "libaegisub/cajun/elements.h"
#endif #endif
#include "libaegisub/io.h" #include "libaegisub/io.h"

8
aegisub/libaegisub/include/libaegisub/mru.h
View file

@ -21,14 +21,14 @@
#ifndef LAGI_PRE #ifndef LAGI_PRE
#include <fstream> #include <fstream>
#include <map> #include <map>
#include "libaegisub/cajun/reader.h"
#include "libaegisub/cajun/writer.h"
#include "libaegisub/cajun/elements.h"
#endif #endif
#include <libaegisub/exception.h> #include <libaegisub/exception.h>
namespace json {
class Array;
}
namespace agi { namespace agi {
DEFINE_BASE_EXCEPTION_NOINNER(MRUError,Exception) DEFINE_BASE_EXCEPTION_NOINNER(MRUError,Exception)

13
aegisub/libaegisub/include/libaegisub/option.h
View file

@ -21,15 +21,16 @@
#ifndef LAGI_PRE #ifndef LAGI_PRE
#include <fstream> #include <fstream>
#include "libaegisub/cajun/reader.h"
#include "libaegisub/cajun/writer.h"
#include "libaegisub/cajun/elements.h"
#endif #endif
#include <libaegisub/exception.h> #include <libaegisub/exception.h>
#include <libaegisub/option_value.h> #include <libaegisub/option_value.h>
namespace json {
class Object;
class UnknownElement;
}
namespace agi { namespace agi {
DEFINE_BASE_EXCEPTION_NOINNER(OptionError,Exception) DEFINE_BASE_EXCEPTION_NOINNER(OptionError,Exception)
@ -48,13 +49,9 @@ public:
OptionValueMap() {}; OptionValueMap() {};
}; };
class Options { class Options {
friend class PutOptionVisitor; friend class PutOptionVisitor;
/// Root json::Object, used for loading.
json::UnknownElement config_root;
/// Internal OptionValueMap /// Internal OptionValueMap
OptionValueMap values; OptionValueMap values;

4
aegisub/libaegisub/include/libaegisub/option_value.h
View file

@ -22,10 +22,6 @@
#include <fstream> #include <fstream>
#include <map> #include <map>
#include <stdint.h> #include <stdint.h>
#include "libaegisub/cajun/reader.h"
#include "libaegisub/cajun/writer.h"
#include "libaegisub/cajun/elements.h"
#endif #endif
#include <libaegisub/exception.h> #include <libaegisub/exception.h>