Changeset 1064 for code/trunk/src/orxonox/OrxonoxStableHeaders.h

Timestamp:

Apr 14, 2008, 9:39:57 PM (16 years ago)

Author:

rgrieder

Message:

• replaced all String2Number with ConvertValue
• replaced all tokenize with SubString
• dealt with warnings under msvc
• removed some warnings by placing casts
• bugfix in audio: local variable pushed into member variable std::vector
• updated StableHeaders.h

File:

• code/trunk/src/orxonox/OrxonoxStableHeaders.h (modified) (3 diffs)

code/trunk/src/orxonox/OrxonoxStableHeaders.h

@@ -55 +55 @@
 #include <OgreFrameListener.h>
 #include <OgreLight.h>
+#include <OgreLog.h>
+#include <OgreLogManager.h>
 #include <OgreMath.h>
 #include <OgreMatrix3.h>
@@ -62 +64 @@
 #include <OgreParticleEmitter.h>
 #include <OgreParticleSystem.h>
-#include <OgrePlatform.h>
-#include <OgrePrerequisites.h>
 #include <OgreQuaternion.h>
 #include <OgreResourceGroupManager.h>
@@ -81 +81 @@
 #include <OIS/OIS.h>
 
-/**
-* Some of the not so stable header files.
-* It's not very useful to include them anyway..
-**/
+//-----------------------------------------------------------------------
+// ORXONOX HEADERS
+//-----------------------------------------------------------------------
 
-#include "core/CoreIncludes.h"
-#include "core/BaseObject.h"
-#include "core/Tickable.h"
-#include "core/Error.h"
-#include "core/Loader.h"
-#include "core/XMLPort.h"
-
-#include "network/Synchronisable.h"
-//#include "network/Server.h"
-//#include "network/Client.h"
-
+#include "util/Convert.h"
 #include "util/Math.h"
-#include "util/Sleep.h"
-#include "util/String2Number.h"
-#include "util/Tokenizer.h"
 #include "util/Multitype.h"
 #include "util/MultiTypeMath.h"
 #include "util/MultiTypePrimitive.h"
 #include "util/MultiTypeString.h"
-#include "util/substring.h"
+#include "util/Sleep.h"
+#include "util/String.h"
+#include "util/SubString.h"
 #include "util/XMLIncludes.h"
-
 #include "util/tinyxml/ticpp.h"
 #include "util/tinyxml/tinyxml.h"
 
+#include "core/BaseObject.h"
+#include "core/CommandExecutor.h"
+#include "core/CoreIncludes.h"
+#include "core/ConfigValueIncludes.h"
+#include "core/Debug.h"
+#include "core/Executor.h"
+#include "core/Tickable.h"
+#include "core/XMLPort.h"
+
+#include "network/Synchronisable.h"
+
+#include "OrxonoxPlatform.h"
+#include "OrxonoxPrereqs.h"
+#include "tools/Timer.h"
 #include "objects/Model.h"
 #include "objects/WorldEntity.h"