Changeset 3156

Timestamp:

Jun 13, 2009, 4:57:55 PM (15 years ago)

Author:

rgrieder

Message:

Moved the forward declaration I found to the prereqs.h files.

Location:

code/branches/pch/src

Files:

• core/BaseObject.h (modified) (1 diff)
• core/Core.h (modified) (1 diff)
• core/CorePrereqs.h (modified) (1 diff)
• core/Namespace.h (modified) (1 diff)
• core/Super.h (modified) (1 diff)
• core/XMLIncludes.h (deleted)
• core/XMLPort.h (modified) (1 diff)
• orxonox/OrxonoxPrereqs.h (modified) (3 diffs)
• orxonox/gui/GUIManager.h (modified) (1 diff)
• orxonox/sound/SoundBase.h (modified) (1 diff)
• orxonox/sound/SoundManager.h (modified) (1 diff)

code/branches/pch/src/core/BaseObject.h

@@ -53 +53 @@
 #include "OrxonoxClass.h"
 #include "Super.h"
-#include "XMLIncludes.h"
 
 namespace orxonox

code/branches/pch/src/core/Core.h

@@ -44 +44 @@
 #include "OrxonoxClass.h"
 #include "util/OutputHandler.h"
-
-// boost::filesystem header has quite a large tail, use forward declaration
-namespace boost { namespace filesystem
-{
-    struct path_traits;
-    template<class String, class Traits> class basic_path;
-    typedef basic_path< std::string, path_traits> path;
-} }
 
 namespace orxonox

code/branches/pch/src/core/CorePrereqs.h

@@ -195 +195 @@
 }
 
+// Boost
+namespace boost { namespace filesystem
+{
+    struct path_traits;
+    template <class String, class Traits> class basic_path;
+    typedef basic_path<std::string, path_traits> path;
+} }
+
+// TinyXML and TinyXML++
+class TiXmlString;
+class TiXmlOutStream;
+class TiXmlNode;
+class TiXmlHandle;
+class TiXmlDocument;
+class TiXmlElement;
+class TiXmlComment;
+class TiXmlUnknown;
+class TiXmlAttribute;
+class TiXmlText;
+class TiXmlDeclaration;
+class TiXmlParsingData;
+namespace ticpp
+{
+    class Document;
+    class Element;
+    class Declaration;
+    class StylesheetReference;
+    class Text;
+    class Comment;
+    class Attribute;
+}
+namespace orxonox
+{
+    using ticpp::Document;
+    using ticpp::Element;
+    using ticpp::Declaration;
+    using ticpp::StylesheetReference;
+    using ticpp::Text;
+    using ticpp::Comment;
+    using ticpp::Attribute;
+}
+
+
 #endif /* _CorePrereqs_H__ */

code/branches/pch/src/core/Namespace.h

@@ -34 +34 @@
 #include <set>
 #include <string>
-#include "XMLIncludes.h"
 #include "BaseObject.h"
 

code/branches/pch/src/core/Super.h

@@ -70 +70 @@
 
 #include "util/Debug.h"
-#include "XMLIncludes.h"
 #include "Event.h"
 

code/branches/pch/src/core/XMLPort.h

@@ -54 +54 @@
 #include "Executor.h"
 #include "BaseObject.h"
-#include "XMLIncludes.h"
 
 // ------------

code/branches/pch/src/orxonox/OrxonoxPrereqs.h

@@ -299 +299 @@
 namespace CEGUI
 {
+    class DefaultLogger;
     class LuaScriptModule;
 
@@ -307 +308 @@
 
 // Bullet Physics Engine
-
 class btTransform;
 class btVector3;
@@ -327 +327 @@
 class btSequentialImpulseConstraintSolver;
 
-// lua
+// ALUT
+typedef struct ALCcontext_struct ALCcontext;
+typedef struct ALCdevice_struct ALCdevice;
+typedef unsigned int ALuint;
+typedef int ALint;
+
+// Lua
 struct lua_State;
 

code/branches/pch/src/orxonox/gui/GUIManager.h

@@ -45 +45 @@
 
 #include "core/input/InputInterfaces.h"
-
-// Forward declaration
-namespace CEGUI { class DefaultLogger; }
 
 // tolua_begin

code/branches/pch/src/orxonox/sound/SoundBase.h

@@ -30 +30 @@
 
 #include "OrxonoxPrereqs.h"
-#include <string>
-
-// forward declarations
-typedef unsigned int ALuint;
-typedef int ALint;
 
 namespace orxonox

code/branches/pch/src/orxonox/sound/SoundManager.h

@@ -33 +33 @@
 #include "orxonox/objects/Tickable.h"
 
-// forward declarations
-typedef struct ALCcontext_struct ALCcontext;
-typedef struct ALCdevice_struct ALCdevice;
-
 namespace orxonox
 {