Changeset 9371 in orxonox.OLD for branches/proxy/src/lib/lang

Timestamp:

Jul 20, 2006, 11:08:16 PM (19 years ago)

Author:

bensch

Message:

orxonox/trunk: ORXONOX is now completely std::stringed

Location:

branches/proxy/src/lib/lang

Files:

• base_object.h (modified) (1 diff)
• class_list.cc (modified) (5 diffs)

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

@@ -35 +35 @@
   void setName (const std::string& newName);
   /** returns the Name of this Object */
-  inline const char* getName ()const { return this->objectName.c_str(); };
+  inline const std::string& getName() const { return this->objectName; };
+  /** returns the Name of this Object as a C-compliant string (const char*) */
+  inline const char* getCName() const { return this->objectName.c_str(); };
   /** @returns the XML-Element with whicht this Object was loaded */
   inline TiXmlNode* getXmlElem() const { return this->xmlElem; };
 
   /** @returns the className of the corresponding Object */
-  inline const char* getClassName() const { return this->className.c_str(); };
+  inline const std::string& getClassName() const { return this->className; }
+  /** @returns the className of the corresponding Object as a C-compliant string (const char*) */
+  inline const char* getClassCName() const { return this->className.c_str(); };
   /** @returns the classID of the corresponding Object */
   inline int getClassID() const { return this->classID; };

branches/proxy/src/lib/lang/class_list.cc

@@ -207 +207 @@
       std::list<BaseObject*>::iterator bo;
       for (bo = cl->objectList.begin(); bo != cl->objectList.end(); bo++)
-        if ((*bo)->getName() != NULL && objectName == (*bo)->getName())
+        if (objectName == (*bo)->getName())
           return (*bo);
     }
@@ -218 +218 @@
       std::list<BaseObject*>::iterator bo;
       for (bo = (*cl).objectList.begin(); bo != (*cl).objectList.end(); bo++)
-        if ((*bo)->getName() != NULL && objectName == (*bo)->getName())
+        if (objectName == (*bo)->getName())
           return (*bo);
     }
@@ -241 +241 @@
     std::list<BaseObject*>::iterator bo;
     for (bo = cl->objectList.begin(); bo != cl->objectList.end(); bo++)
-      if ((*bo)->getName() != NULL && objectName == (*bo)->getName())
+      if (objectName == (*bo)->getName())
         return (*bo);
   }
@@ -286 +286 @@
     std::list<BaseObject*>::iterator bo;
     for (bo = cl->objectList.begin(); bo != cl->objectList.end(); bo++)
-      if ((*bo)->getName() != NULL && objectName == (*bo)->getName())
+      if (objectName == (*bo)->getName())
         return true;
   }
@@ -380 +380 @@
         for (bo = (*cl).objectList.begin(); bo != (*cl).objectList.end(); bo++)
         {
-          PRINT(0)("|   %s::%s::(0x%.8X->%p ", (*bo)->getClassName(), (*bo)->getName(), (*bo)->getClassID(), (*bo));
+          PRINT(0)("|   %s::%s::(0x%.8X->%p ", (*bo)->getClassCName(), (*bo)->getCName(), (*bo)->getClassID(), (*bo));
           if (debugLevel == 3)
             ClassList::whatIs(*bo);