[Orxonox-commit 624] r3156 - in branches/pch/src: core orxonox orxonox/gui orxonox/sound
rgrieder at orxonox.net
rgrieder at orxonox.net
Sat Jun 13 16:57:56 CEST 2009
Author: rgrieder
Date: 2009-06-13 16:57:55 +0200 (Sat, 13 Jun 2009)
New Revision: 3156
Removed:
branches/pch/src/core/XMLIncludes.h
Modified:
branches/pch/src/core/BaseObject.h
branches/pch/src/core/Core.h
branches/pch/src/core/CorePrereqs.h
branches/pch/src/core/Namespace.h
branches/pch/src/core/Super.h
branches/pch/src/core/XMLPort.h
branches/pch/src/orxonox/OrxonoxPrereqs.h
branches/pch/src/orxonox/gui/GUIManager.h
branches/pch/src/orxonox/sound/SoundBase.h
branches/pch/src/orxonox/sound/SoundManager.h
Log:
Moved the forward declaration I found to the prereqs.h files.
Modified: branches/pch/src/core/BaseObject.h
===================================================================
--- branches/pch/src/core/BaseObject.h 2009-06-13 14:55:17 UTC (rev 3155)
+++ branches/pch/src/core/BaseObject.h 2009-06-13 14:57:55 UTC (rev 3156)
@@ -52,7 +52,6 @@
#include "util/mbool.h"
#include "OrxonoxClass.h"
#include "Super.h"
-#include "XMLIncludes.h"
namespace orxonox
{
Modified: branches/pch/src/core/Core.h
===================================================================
--- branches/pch/src/core/Core.h 2009-06-13 14:55:17 UTC (rev 3155)
+++ branches/pch/src/core/Core.h 2009-06-13 14:57:55 UTC (rev 3156)
@@ -44,14 +44,6 @@
#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
{
//! The Core class is a singleton, only used to configure some config-values.
Modified: branches/pch/src/core/CorePrereqs.h
===================================================================
--- branches/pch/src/core/CorePrereqs.h 2009-06-13 14:55:17 UTC (rev 3155)
+++ branches/pch/src/core/CorePrereqs.h 2009-06-13 14:57:55 UTC (rev 3156)
@@ -194,4 +194,47 @@
class object;
}
+// 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__ */
Modified: branches/pch/src/core/Namespace.h
===================================================================
--- branches/pch/src/core/Namespace.h 2009-06-13 14:55:17 UTC (rev 3155)
+++ branches/pch/src/core/Namespace.h 2009-06-13 14:57:55 UTC (rev 3156)
@@ -33,7 +33,6 @@
#include <set>
#include <string>
-#include "XMLIncludes.h"
#include "BaseObject.h"
namespace orxonox
Modified: branches/pch/src/core/Super.h
===================================================================
--- branches/pch/src/core/Super.h 2009-06-13 14:55:17 UTC (rev 3155)
+++ branches/pch/src/core/Super.h 2009-06-13 14:57:55 UTC (rev 3156)
@@ -69,7 +69,6 @@
#include "CorePrereqs.h"
#include "util/Debug.h"
-#include "XMLIncludes.h"
#include "Event.h"
///////////////////////
Deleted: branches/pch/src/core/XMLIncludes.h
===================================================================
--- branches/pch/src/core/XMLIncludes.h 2009-06-13 14:55:17 UTC (rev 3155)
+++ branches/pch/src/core/XMLIncludes.h 2009-06-13 14:57:55 UTC (rev 3156)
@@ -1,73 +0,0 @@
-/*
- * ORXONOX - the hottest 3D action shooter ever to exist
- * > www.orxonox.net <
- *
- *
- * License notice:
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- *
- * Author:
- * Fabian 'x3n' Landau
- * Co-authors:
- * ...
- *
- */
-
-/**
- @file
- @brief Forward declarations of some XML classes.
-*/
-
-#include "CorePrereqs.h"
-
-//-----------------------------------------------------------------------
-// Forward declarations
-//-----------------------------------------------------------------------
-
-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;
-}
Modified: branches/pch/src/core/XMLPort.h
===================================================================
--- branches/pch/src/core/XMLPort.h 2009-06-13 14:55:17 UTC (rev 3155)
+++ branches/pch/src/core/XMLPort.h 2009-06-13 14:57:55 UTC (rev 3156)
@@ -53,7 +53,6 @@
#include "Identifier.h"
#include "Executor.h"
#include "BaseObject.h"
-#include "XMLIncludes.h"
// ------------
// XMLPortParam
Modified: branches/pch/src/orxonox/OrxonoxPrereqs.h
===================================================================
--- branches/pch/src/orxonox/OrxonoxPrereqs.h 2009-06-13 14:55:17 UTC (rev 3155)
+++ branches/pch/src/orxonox/OrxonoxPrereqs.h 2009-06-13 14:57:55 UTC (rev 3156)
@@ -298,6 +298,7 @@
namespace CEGUI
{
+ class DefaultLogger;
class LuaScriptModule;
class OgreCEGUIRenderer;
@@ -306,7 +307,6 @@
}
// Bullet Physics Engine
-
class btTransform;
class btVector3;
@@ -326,7 +326,13 @@
class btCollisionDispatcher;
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;
#endif /* _OrxonoxPrereqs_H__ */
Modified: branches/pch/src/orxonox/gui/GUIManager.h
===================================================================
--- branches/pch/src/orxonox/gui/GUIManager.h 2009-06-13 14:55:17 UTC (rev 3155)
+++ branches/pch/src/orxonox/gui/GUIManager.h 2009-06-13 14:57:55 UTC (rev 3156)
@@ -45,9 +45,6 @@
#include "core/input/InputInterfaces.h"
-// Forward declaration
-namespace CEGUI { class DefaultLogger; }
-
// tolua_begin
namespace orxonox
{
Modified: branches/pch/src/orxonox/sound/SoundBase.h
===================================================================
--- branches/pch/src/orxonox/sound/SoundBase.h 2009-06-13 14:55:17 UTC (rev 3155)
+++ branches/pch/src/orxonox/sound/SoundBase.h 2009-06-13 14:57:55 UTC (rev 3156)
@@ -29,12 +29,7 @@
#define _SoundBase_H__
#include "OrxonoxPrereqs.h"
-#include <string>
-// forward declarations
-typedef unsigned int ALuint;
-typedef int ALint;
-
namespace orxonox
{
/**
Modified: branches/pch/src/orxonox/sound/SoundManager.h
===================================================================
--- branches/pch/src/orxonox/sound/SoundManager.h 2009-06-13 14:55:17 UTC (rev 3155)
+++ branches/pch/src/orxonox/sound/SoundManager.h 2009-06-13 14:57:55 UTC (rev 3156)
@@ -32,10 +32,6 @@
#include <list>
#include "orxonox/objects/Tickable.h"
-// forward declarations
-typedef struct ALCcontext_struct ALCcontext;
-typedef struct ALCdevice_struct ALCdevice;
-
namespace orxonox
{
/**
More information about the Orxonox-commit
mailing list