Changeset 715 for code/branches/FICN/src/orxonox/objects/Mesh.h

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/Mesh.h (modified) (2 diffs)

code/branches/FICN/src/orxonox/objects/Mesh.h

@@ -1 +1 @@
 #ifndef _Mesh_H__
 #define _Mesh_H__
+
+#include <string>
 
 #include <OgreEntity.h>
 
 #include "../OrxonoxPrereqs.h"
-
-#include "misc/String.h"
 
 namespace orxonox
@@ -15 +15 @@
             Mesh();
             ~Mesh();
-            void setMesh(const String& file);
+            void setMesh(const std::string& file);
 
             inline Ogre::Entity* getEntity()
                 { return this->entity_; }
 
-            inline const String& getName() const
+            inline const std::string& getName() const
                 { return this->entity_->getName(); }