Changeset 715 for code/branches/FICN/src/orxonox/objects/WorldEntity.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/WorldEntity.cc (modified) (6 diffs)

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

@@ -26 +26 @@
  */
 
+#include <string>
 #include <sstream>
 
@@ -31 +32 @@
 #include "misc/Tokenizer.h"
 #include "misc/String2Number.h"
-#include "misc/String.h"
 #include "../core/CoreIncludes.h"
 #include "../Orxonox.h"
@@ -88 +88 @@
         if (xmlElem->Attribute("position"))
         {
-            std::vector<String> pos = tokenize(xmlElem->Attribute("position"),",");
+            std::vector<std::string> pos = tokenize(xmlElem->Attribute("position"),",");
             float x, y, z;
             String2Number<float>(x, pos[0]);
@@ -98 +98 @@
         if (xmlElem->Attribute("direction"))
         {
-            std::vector<String> pos = tokenize(xmlElem->Attribute("direction"),",");
+            std::vector<std::string> pos = tokenize(xmlElem->Attribute("direction"),",");
             float x, y, z;
             String2Number<float>(x, pos[0]);
@@ -125 +125 @@
         if (xmlElem->Attribute("scale"))
         {
-            String scaleStr = xmlElem->Attribute("scale");
+            std::string scaleStr = xmlElem->Attribute("scale");
             float scale;
             String2Number<float>(scale, scaleStr);
@@ -133 +133 @@
         if (xmlElem->Attribute("rotationAxis"))
         {
-            std::vector<String> pos = tokenize(xmlElem->Attribute("rotationAxis"),",");
+            std::vector<std::string> pos = tokenize(xmlElem->Attribute("rotationAxis"),",");
             float x, y, z;
             String2Number<float>(x, pos[0]);