Changeset 7203 in orxonox.OLD for branches/std/src/lib/lang

Timestamp:

Mar 9, 2006, 5:28:10 PM (19 years ago)

Author:

bensch

Message:

orxonox/trunk: compiles again, BUT well…. i do not expect it to run anymore

Location:

branches/std/src/lib/lang

Files:

• base_object.cc (modified) (1 diff)
• base_object.h (modified) (2 diffs)

branches/std/src/lib/lang/base_object.cc

@@ -95 +95 @@
  * @brief set the name of the Object
  */
-void BaseObject::setName (const char* objectName)
+void BaseObject::setName (const std::string& objectName)
 {
   if (this->objectName)
     delete[] this->objectName;
-  if (objectName != NULL)
-  {
-    this->objectName = new char[strlen(objectName)+1];
-    strcpy(this->objectName, objectName);
+  if (!objectName.empty())
+  {
+    this->objectName = new char[objectName.size()+1];
+    strcpy(this->objectName, objectName.c_str());
   }
   else

branches/std/src/lib/lang/base_object.h

@@ -16 +16 @@
 #endif
 
+#include <string>
 #include "stdincl.h"
 
@@ -30 +31 @@
 
   virtual void loadParams(const TiXmlElement* root);
-  void setName (const char* newName);
+  void setName (const std::string& newName);
   /** returns the Name of this Object */
   inline const char* getName ()const { return this->objectName; };