Changeset 715 for code/branches/FICN/src/orxonox/objects/Ambient.cc

Timestamp:

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

Author:

rgrieder

Message:

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

File:

• code/branches/FICN/src/orxonox/objects/Ambient.cc (modified) (3 diffs)

code/branches/FICN/src/orxonox/objects/Ambient.cc

@@ -27 +27 @@
 
 #include <vector>
+#include <string>
 
 #include <OgreSceneManager.h>
@@ -34 +35 @@
 #include "misc/String2Number.h"
 #include "misc/ColourValue.h"
-#include "misc/String.h"
 #include "../core/Debug.h"
 #include "../core/CoreIncludes.h"
@@ -61 +61 @@
         {
 
-                std::vector<String> colourvalues = tokenize(xmlElem->Attribute("colourvalue"),",");
+                std::vector<std::string> colourvalues = tokenize(xmlElem->Attribute("colourvalue"),",");
                 float r, g, b;
                 String2Number<float>(r, colourvalues[0]);