Changeset 715 for code/branches/FICN/src/orxonox/core/OrxonoxClass.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/core/OrxonoxClass.h (modified) (3 diffs)

code/branches/FICN/src/orxonox/core/OrxonoxClass.h

@@ -37 +37 @@
 #define _OrxonoxClass_H__
 
+#include <string>
+
 #include "CorePrereqs.h"
-
-#include "misc/String.h"
 #include "MetaObjectList.h"
 #include "Identifier.h"
@@ -132 +132 @@
 
             /** @brief Sets the name of the object. @param name The name */
-            inline virtual void setName(const String& name) { this->name_ = name; }
+            inline virtual void setName(const std::string& name) { this->name_ = name; }
 
             /** @returns the name of the object. */
-            inline const String& getName() const { return this->name_; }
+            inline const std::string& getName() const { return this->name_; }
 
             /** @brief Sets the state of the objects activity. @param bActive True = active */
@@ -154 +154 @@
             MetaObjectList metaList_;       //!< MetaObjectList, containing all ObjectLists and ObjectListElements the object is registered in
 
-            String name_;              //!< The name of the object
+            std::string name_;              //!< The name of the object
             bool bActive_;                  //!< True = the object is active
             bool bVisible_;                 //!< True = the object is visible