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

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.cc (modified) (10 diffs)

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

@@ -153 +153 @@
    * @param path path to config (in home dir or something)
    */
-  void Orxonox::init(int argc, char **argv, String path)
+  void Orxonox::init(int argc, char **argv, std::string path)
   {
     //TODO: find config file (assuming executable directory)
     //TODO: read config file
     //TODO: give config file to Ogre
-    String mode;
+    std::string mode;
 //     if(argc>=2)
-//       mode = String(argv[1]);
+//       mode = std::string(argv[1]);
 //     else
 //       mode = "";
@@ -169 +169 @@
     //mode = "presentation";
     if(ar.errorHandling()) die();
-    if(mode == String("server"))
+    if(mode == std::string("server"))
     {
       serverInit(path);
       mode_ = SERVER;
     }
-    else if(mode == String("client"))
+    else if(mode == std::string("client"))
     {
       clientInit(path);
       mode_ = CLIENT;
     }
-    else if(mode == String("presentation"))
+    else if(mode == std::string("presentation"))
     {
       serverInit(path);
@@ -243 +243 @@
   }
 
-  void Orxonox::standaloneInit(String path)
+  void Orxonox::standaloneInit(std::string path)
   {
     ogre_->setConfigPath(path);
@@ -262 +262 @@
   }
 
-  void Orxonox::playableServer(String path)
+  void Orxonox::playableServer(std::string path)
   {
     ogre_->setConfigPath(path);
@@ -296 +296 @@
   }
 
-  void Orxonox::serverInit(String path)
+  void Orxonox::serverInit(std::string path)
   {
     COUT(2) << "initialising server" << std::endl;
@@ -306 +306 @@
   }
 
-  void Orxonox::clientInit(String path)
+  void Orxonox::clientInit(std::string path)
   {
     COUT(2) << "initialising client" << std::endl;
@@ -321 +321 @@
   void Orxonox::defineResources()
   {
-    String secName, typeName, archName;
+    std::string secName, typeName, archName;
     Ogre::ConfigFile cf;
 #if OGRE_PLATFORM == OGRE_PLATFORM_APPLE
@@ -340 +340 @@
         archName = i->second;
 #if OGRE_PLATFORM == OGRE_PLATFORM_APPLE
-        Ogre::ResourceGroupManager::getSingleton().addResourceLocation( String(macBundlePath() + "/" + archName), typeName, secName);
+        Ogre::ResourceGroupManager::getSingleton().addResourceLocation( std::string(macBundlePath() + "/" + archName), typeName, secName);
 #else
         Ogre::ResourceGroupManager::getSingleton().addResourceLocation( archName, typeName, secName);
@@ -426 +426 @@
     // fixes auto repeat problem
     #if defined OIS_LINUX_PLATFORM
-      pl.insert(std::make_pair(String("XAutoRepeatOn"), String("true")));
+      pl.insert(std::make_pair(std::string("XAutoRepeatOn"), std::string("true")));
     #endif
 
@@ -432 +432 @@
     win->getCustomAttribute("WINDOW", &windowHnd);
     windowHndStr << windowHnd;
-    pl.insert(std::make_pair(String("WINDOW"), windowHndStr.str()));
+    pl.insert(std::make_pair(std::string("WINDOW"), windowHndStr.str()));
     inputManager_ = OIS::InputManager::createInputSystem(pl);