Changeset 715 for code/branches/FICN/src/orxonox/Orxonox.h

Timestamp:

Dec 28, 2007, 11:33:10 PM (18 years ago)

Author:

rgrieder

Message:

• the master has spoken…
• misc/String.h is not anymore..

File:

• code/branches/FICN/src/orxonox/Orxonox.h (modified) (6 diffs)

code/branches/FICN/src/orxonox/Orxonox.h

@@ -8 +8 @@
 #define _Orxonox_H__
 
+#include <string>
+
 #include <OgrePrerequisites.h>
 #include <OIS/OISPrereqs.h>
@@ -13 +15 @@
 #include "OrxonoxPrereqs.h"
 #include "loader/LoaderPrereqs.h"
-
-#include "misc/String.h"
 #include "GraphicsEngine.h"
 
@@ -32 +32 @@
   {
     public:
-      void init(int argc, char **argv, String path);
+      void init(int argc, char **argv, std::string path);
       void start();
       // not sure if this should be private
@@ -48 +48 @@
       virtual ~Orxonox();
       // init functions
-      void serverInit(String path);
-      void clientInit(String path);
-      void standaloneInit(String path);
+      void serverInit(std::string path);
+      void clientInit(std::string path);
+      void standaloneInit(std::string path);
       // run functions
-      void playableServer(String path);
+      void playableServer(std::string path);
       void standalone();
       void defineResources();
@@ -66 +66 @@
     private:
       GraphicsEngine*       ogre_;      //!< our dearest graphics engine <3
-      String           dataPath_;  //!< path to data
+      std::string           dataPath_;  //!< path to data
       loader::LevelLoader*  loader_;    //!< level loader builds the scene
       audio::AudioManager*  auMan_;     //!< audio manager
@@ -79 +79 @@
       // this is used to identify the mode (server/client/...) we're in
       gameMode              mode_;
-      String           serverIp_;
+      std::string           serverIp_;
   };
 }