Changeset 715 for code/branches/FICN/src/loader

Timestamp:

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

Author:

rgrieder

Message:

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

Location:

code/branches/FICN/src/loader

Files:

• LevelLoader.cc (modified) (2 diffs)
• LevelLoader.h (modified) (3 diffs)

code/branches/FICN/src/loader/LevelLoader.cc

@@ -42 +42 @@
 {
 
-  LevelLoader::LevelLoader(orxonox::String file, orxonox::String path)
+  LevelLoader::LevelLoader(std::string file, std::string path)
   {
     valid_ = false;
@@ -155 +155 @@
 
               tElem = tNode->ToElement();
-              orxonox::String elemVal = tElem->Value();
+              std::string elemVal = tElem->Value();
               if (elemVal == "ogg")
               {

code/branches/FICN/src/loader/LevelLoader.h

@@ -9 +9 @@
 #define _LevelLoader_H__
 
+#include <string>
+
 #include "LoaderPrereqs.h"
-
-#include "misc/String.h"
 #include "tinyxml/tinyxml.h"
 
@@ -23 +23 @@
   public:
     // Constructors, loads the level file and some information data
-    LevelLoader(orxonox::String file, orxonox::String dir = "levels");
+    LevelLoader(std::string file, std::string dir = "levels");
     // Destructor
     virtual ~LevelLoader();
@@ -30 +30 @@
 
     // Getters
-    inline orxonox::String name() {return name_; };
-    inline orxonox::String description() {return description_; };
-    inline orxonox::String image() {return image_; };
+    inline std::string name() {return name_; };
+    inline std::string description() {return description_; };
+    inline std::string image() {return image_; };
   private:
     //! Level information
-    orxonox::String name_;
-    orxonox::String description_;
-    orxonox::String image_;
-    orxonox::String loadingBackgroundColor_;
-    orxonox::String loadingBackgroundImage_;
-    orxonox::String loadingBarImage_;
-    orxonox::String loadingBarTop_;
-    orxonox::String loadingBarLeft_;
-    orxonox::String loadingBarWidth_;
-    orxonox::String loadingBarHeight_;
+    std::string name_;
+    std::string description_;
+    std::string image_;
+    std::string loadingBackgroundColor_;
+    std::string loadingBackgroundImage_;
+    std::string loadingBarImage_;
+    std::string loadingBarTop_;
+    std::string loadingBarLeft_;
+    std::string loadingBarWidth_;
+    std::string loadingBarHeight_;
 
     //! Set to true if it was possible to load the level file