Clean header dependencies of condition.hxx - introduce a new header, propsfwd.hxx...

diff --git a/simgear/props/CMakeLists.txt b/simgear/props/CMakeLists.txt
index f347df457d687ebadd1ec6b4d06bfea3d3c412e0..46d81b35626808cbdcff1bb952d05f5ec864e372 100644 (file)
--- a/simgear/props/CMakeLists.txt
+++ b/simgear/props/CMakeLists.txt
@@ -8,6 +8,7 @@ set(HEADERS
     propertyObject.hxx
     props.hxx
     props_io.hxx
     propertyObject.hxx
     props.hxx
     props_io.hxx

+    propsfwd.hxx

     tiedpropertylist.hxx
     )
 
     tiedpropertylist.hxx
     )
 

diff --git a/simgear/props/condition.hxx b/simgear/props/condition.hxx
index 719f68795411ad609664557e4079d5494f3be63f..f18e4b84b210191c7267d2c932ef7f30e509d10f 100644 (file)
--- a/simgear/props/condition.hxx
+++ b/simgear/props/condition.hxx
@@ -10,11 +10,11 @@
 #ifndef __SG_CONDITION_HXX
 #define __SG_CONDITION_HXX
 
 #ifndef __SG_CONDITION_HXX
 #define __SG_CONDITION_HXX
 

-#include <simgear/debug/logstream.hxx>
-#include <simgear/props/props.hxx>
-#include <simgear/props/props_io.hxx>

 #include <simgear/structure/SGReferenced.hxx>
 #include <simgear/structure/SGReferenced.hxx>

-\f
+#include <simgear/structure/SGSharedPtr.hxx>
+
+class SGPropertyNode;
+

 ////////////////////////////////////////////////////////////////////////
 // Conditions.
 ////////////////////////////////////////////////////////////////////////
 ////////////////////////////////////////////////////////////////////////
 // Conditions.
 ////////////////////////////////////////////////////////////////////////

diff --git a/simgear/props/props_io.hxx b/simgear/props/props_io.hxx
index 92c3bef378f14d733edaf79bac33f90a2980e62a..743866a1b9754183742714623b31cb2697674bf9 100644 (file)
--- a/simgear/props/props_io.hxx
+++ b/simgear/props/props_io.hxx
@@ -15,11 +15,7 @@
 #include <simgear/compiler.h>
 #include <simgear/props/props.hxx>
 
 #include <simgear/compiler.h>
 #include <simgear/props/props.hxx>
 

-#include <stdio.h>
-

 #include <string>
 #include <string>

-#include <vector>
-#include <map>

 #include <iosfwd>
 
 /**
 #include <iosfwd>
 
 /**

diff --git a/simgear/props/propsfwd.hxx b/simgear/props/propsfwd.hxx
new file mode 100644 (file)
index 0000000..00e3697
--- /dev/null
+++ b/simgear/props/propsfwd.hxx
@@ -0,0 +1,18 @@
+/**
+ * \file propsfwwd.hxx
+ * Forward declarations for properties (and related structures)
+ */
+ 
+#ifndef SG_PROPS_FWD_HXX
+#define SG_PROPS_FWD_HXX
+
+#include <simgear/structure/SGSharedPtr.hxx>
+
+class SGPropertyNode;
+ 
+typedef SGSharedPtr<SGPropertyNode> SGPropertyNode_ptr;
+typedef SGSharedPtr<const SGPropertyNode> SGConstPropertyNode_ptr;
+ 
+class SGCondition; 
+
+#endif // of SG_PROPS_FWD_HXX

diff --git a/simgear/sound/xmlsound.cxx b/simgear/sound/xmlsound.cxx
index 3e90752ea3f8e9f7a7a6f7bb7993152b336aaf0a..f3471d4ef0c2c9cfdf2d1b2203f34b8eb071c9e2 100644 (file)
--- a/simgear/sound/xmlsound.cxx
+++ b/simgear/sound/xmlsound.cxx
@@ -30,6 +30,7 @@
 #include <string.h>
 
 #include <simgear/debug/logstream.hxx>
 #include <string.h>
 
 #include <simgear/debug/logstream.hxx>

+#include <simgear/props/props.hxx>

 #include <simgear/props/condition.hxx>
 #include <simgear/math/SGMath.hxx>
 #include <simgear/structure/exception.hxx>
 #include <simgear/props/condition.hxx>
 #include <simgear/math/SGMath.hxx>
 #include <simgear/structure/exception.hxx>

diff --git a/simgear/sound/xmlsound.hxx b/simgear/sound/xmlsound.hxx
index 0b3f132a45b546237ff782ef862f2db5250789d8..95582aab12ca65cda2c5f8ec924653965c565464 100644 (file)
--- a/simgear/sound/xmlsound.hxx
+++ b/simgear/sound/xmlsound.hxx
@@ -36,7 +36,8 @@
 #include <vector>
 
 #include <simgear/compiler.h>
 #include <vector>
 
 #include <simgear/compiler.h>

-#include <simgear/props/condition.hxx>
+
+#include <simgear/props/propsfwd.hxx>

 
 #include "sample_group.hxx"
 #include "sample_openal.hxx"
 
 #include "sample_group.hxx"
 #include "sample_openal.hxx"