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

Timestamp:

Mar 10, 2006, 7:18:03 PM (19 years ago)

Author:

bensch

Message:

orxonox/trunk: now the branche works again, as it did before

Location:

branches/std/src/lib/lang

Files:

• base_object.cc (modified) (7 diffs)
• base_object.h (modified) (2 diffs)

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

@@ -37 +37 @@
   this->classID = CL_BASE_OBJECT;
 
-  this->objectName = NULL;
+  this->objectName = "";
   this->classList = NULL;
   this->xmlElem = NULL;
@@ -52 +52 @@
 
   //  delete []this->className;
-  if (this->objectName)
-    delete[] this->objectName;
   if (this->xmlElem != NULL)
     delete this->xmlElem;
@@ -97 +95 @@
 void BaseObject::setName (const std::string& objectName)
 {
-  if (this->objectName)
-    delete[] this->objectName;
-  if (!objectName.empty())
-  {
-    this->objectName = new char[objectName.size()+1];
-    strcpy(this->objectName, objectName.c_str());
-  }
-  else
-    this->objectName = NULL;
+  printf("TEST\n");
+  this->objectName = objectName;
+  printf("TEST2\n");
 }
 
@@ -175 +167 @@
 bool BaseObject::operator==(const char* objectName)
 {
-  if (likely(this->objectName != NULL && objectName != NULL))
-    return (strcmp(this->objectName, objectName)) ? false : true;
+  return (objectName != NULL && this->objectName == objectName);
 }
 
@@ -197 +188 @@
 int BaseObject::writeState( const byte * data, int length, int sender )
 {
-  SYNCHELP_READ_BEGIN();
-
-  if ( objectName )
+  /// FIXME STD
+
+  /*  SYNCHELP_READ_BEGIN();
+
+  if ( !objectName.empty() )
   {
     delete[] objectName;
@@ -211 +204 @@
   }
 
-  return SYNCHELP_READ_N;
+  return SYNCHELP_READ_N;*/
 }
 
@@ -222 +215 @@
 int BaseObject::readState( byte * data, int maxLength )
 {
-  SYNCHELP_WRITE_BEGIN();
+///FIXME STD
+  /*  SYNCHELP_WRITE_BEGIN();
 
   //PRINTF(0)("objectname = %s\n", this->objectName);
   SYNCHELP_WRITE_STRING( this->objectName, NWT_BO_NAME );
 
-  return SYNCHELP_WRITE_N;
-}
+  return SYNCHELP_WRITE_N;*/
+}

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

@@ -33 +33 @@
   void setName (const std::string& newName);
   /** returns the Name of this Object */
-  inline const char* getName ()const { return this->objectName; };
+  inline const char* getName ()const { return this->objectName.c_str(); };
   /** @returns the XML-Element with whicht this Object was loaded */
   inline TiXmlNode* getXmlElem() const { return this->xmlElem; };
@@ -60 +60 @@
     const char*        className;        //!< the name of the class
     long               classID;          //!< this is the id from the class_id.h enumeration
-    char*              objectName;       //!< The name of this object
+    std::string        objectName;       //!< The name of this object
 
     ClassList*         classList;        //!< Pointer to the ClassList this Object is inside of