From: James Turner Date: Sat, 30 Jul 2011 09:48:37 +0000 (+0100) Subject: Clean header dependencies of condition.hxx - introduce a new header, propsfwd.hxx... X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=3ac5ff0cac4dfecc62e6deb440bb0aa309ff42c9;p=simgear.git Clean header dependencies of condition.hxx - introduce a new header, propsfwd.hxx, for common case of headers that only need SGPropertyNode_ptr and SGCondition_ptr --- diff --git a/simgear/props/CMakeLists.txt b/simgear/props/CMakeLists.txt index f347df45..46d81b35 100644 --- a/simgear/props/CMakeLists.txt +++ b/simgear/props/CMakeLists.txt @@ -8,6 +8,7 @@ set(HEADERS propertyObject.hxx props.hxx props_io.hxx + propsfwd.hxx tiedpropertylist.hxx ) diff --git a/simgear/props/condition.hxx b/simgear/props/condition.hxx index 719f6879..f18e4b84 100644 --- a/simgear/props/condition.hxx +++ b/simgear/props/condition.hxx @@ -10,11 +10,11 @@ #ifndef __SG_CONDITION_HXX #define __SG_CONDITION_HXX -#include -#include -#include #include - +#include + +class SGPropertyNode; + //////////////////////////////////////////////////////////////////////// // Conditions. //////////////////////////////////////////////////////////////////////// diff --git a/simgear/props/props_io.hxx b/simgear/props/props_io.hxx index 92c3bef3..743866a1 100644 --- a/simgear/props/props_io.hxx +++ b/simgear/props/props_io.hxx @@ -15,11 +15,7 @@ #include #include -#include - #include -#include -#include #include /** diff --git a/simgear/props/propsfwd.hxx b/simgear/props/propsfwd.hxx new file mode 100644 index 00000000..00e3697f --- /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 + +class SGPropertyNode; + +typedef SGSharedPtr SGPropertyNode_ptr; +typedef SGSharedPtr SGConstPropertyNode_ptr; + +class SGCondition; + +#endif // of SG_PROPS_FWD_HXX diff --git a/simgear/sound/xmlsound.cxx b/simgear/sound/xmlsound.cxx index 3e90752e..f3471d4e 100644 --- a/simgear/sound/xmlsound.cxx +++ b/simgear/sound/xmlsound.cxx @@ -30,6 +30,7 @@ #include #include +#include #include #include #include diff --git a/simgear/sound/xmlsound.hxx b/simgear/sound/xmlsound.hxx index 0b3f132a..95582aab 100644 --- a/simgear/sound/xmlsound.hxx +++ b/simgear/sound/xmlsound.hxx @@ -36,7 +36,8 @@ #include #include -#include + +#include #include "sample_group.hxx" #include "sample_openal.hxx"