From 612b583e2bac43d6ac642ab50a60770891a95588 Mon Sep 17 00:00:00 2001
From: Thomas Goyne <plorkyeran@aegisub.org>
Date: Fri, 11 Jun 2010 02:25:07 +0000
Subject: [PATCH] Move cajun includes into the cpp files rather than headers so
 that only files in libaegisub include them.

Originally committed to SVN as r4473.
---
 aegisub/libaegisub/common/mru.cpp                   |  4 ++++
 aegisub/libaegisub/common/option.cpp                |  4 ++++
 aegisub/libaegisub/include/libaegisub/mru.h         |  8 ++++----
 aegisub/libaegisub/include/libaegisub/option.h      | 13 +++++--------
 .../libaegisub/include/libaegisub/option_value.h    |  4 ----
 5 files changed, 17 insertions(+), 16 deletions(-)

diff --git a/aegisub/libaegisub/common/mru.cpp b/aegisub/libaegisub/common/mru.cpp
index 123b88762..6fa53c08a 100644
--- a/aegisub/libaegisub/common/mru.cpp
+++ b/aegisub/libaegisub/common/mru.cpp
@@ -21,6 +21,10 @@
 #ifndef LAGI_PRE
 #include <fstream>
 #include <time.h>
+
+#include "libaegisub/cajun/reader.h"
+#include "libaegisub/cajun/writer.h"
+#include "libaegisub/cajun/elements.h"
 #endif
 
 #include "libaegisub/access.h"
diff --git a/aegisub/libaegisub/common/option.cpp b/aegisub/libaegisub/common/option.cpp
index d87ffb4db..dec290ef1 100644
--- a/aegisub/libaegisub/common/option.cpp
+++ b/aegisub/libaegisub/common/option.cpp
@@ -22,6 +22,10 @@
 #include <fstream>
 #include <sstream>
 #include <map>
+
+#include "libaegisub/cajun/reader.h"
+#include "libaegisub/cajun/writer.h"
+#include "libaegisub/cajun/elements.h"
 #endif
 
 #include "libaegisub/io.h"
diff --git a/aegisub/libaegisub/include/libaegisub/mru.h b/aegisub/libaegisub/include/libaegisub/mru.h
index a7f148fcf..887486ef4 100644
--- a/aegisub/libaegisub/include/libaegisub/mru.h
+++ b/aegisub/libaegisub/include/libaegisub/mru.h
@@ -21,14 +21,14 @@
 #ifndef LAGI_PRE
 #include <fstream>
 #include <map>
-
-#include "libaegisub/cajun/reader.h"
-#include "libaegisub/cajun/writer.h"
-#include "libaegisub/cajun/elements.h"
 #endif
 
 #include <libaegisub/exception.h>
 
+namespace json {
+	class Array;
+}
+
 namespace agi {
 
 DEFINE_BASE_EXCEPTION_NOINNER(MRUError,Exception)
diff --git a/aegisub/libaegisub/include/libaegisub/option.h b/aegisub/libaegisub/include/libaegisub/option.h
index 6e9e8defb..e9712c67e 100644
--- a/aegisub/libaegisub/include/libaegisub/option.h
+++ b/aegisub/libaegisub/include/libaegisub/option.h
@@ -21,15 +21,16 @@
 
 #ifndef LAGI_PRE
 #include <fstream>
-
-#include "libaegisub/cajun/reader.h"
-#include "libaegisub/cajun/writer.h"
-#include "libaegisub/cajun/elements.h"
 #endif
 
 #include <libaegisub/exception.h>
 #include <libaegisub/option_value.h>
 
+namespace json {
+	class Object;
+	class UnknownElement;
+}
+
 namespace agi {
 
 DEFINE_BASE_EXCEPTION_NOINNER(OptionError,Exception)
@@ -48,13 +49,9 @@ public:
 	OptionValueMap() {};
 };
 
-
 class Options {
 	friend class PutOptionVisitor;
 
-	/// Root json::Object, used for loading.
-	json::UnknownElement config_root;
-
 	/// Internal OptionValueMap
 	OptionValueMap values;
 
diff --git a/aegisub/libaegisub/include/libaegisub/option_value.h b/aegisub/libaegisub/include/libaegisub/option_value.h
index 0266a9b91..2c39f5079 100644
--- a/aegisub/libaegisub/include/libaegisub/option_value.h
+++ b/aegisub/libaegisub/include/libaegisub/option_value.h
@@ -22,10 +22,6 @@
 #include <fstream>
 #include <map>
 #include <stdint.h>
-
-#include "libaegisub/cajun/reader.h"
-#include "libaegisub/cajun/writer.h"
-#include "libaegisub/cajun/elements.h"
 #endif
 
 #include <libaegisub/exception.h>