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

Timestamp:

Mar 12, 2006, 3:00:04 PM (19 years ago)

Author:

bensch

Message:

orxonox/std:: more strings

Location:

branches/std/src/lib/lang

Files:

• base_object.cc (modified) (4 diffs)
• base_object.h (modified) (3 diffs)

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

@@ -34 +34 @@
 BaseObject::BaseObject()
 {
+  this->classID = CL_BASE_OBJECT;
   this->className = "BaseObject";
-  this->classID = CL_BASE_OBJECT;
 
   this->objectName = "";
@@ -78 +78 @@
  * @param className the class name
 */
-void BaseObject::setClassID(ClassID classID, const char* className)
+void BaseObject::setClassID(ClassID classID, const std::string& className)
 {
   //printf("%s(0x%.8X)->%s(0x%.8X)\n", this->className, this->classID, className, classID);
@@ -150 +150 @@
  * @returns true if it is, false otherwise
  */
-bool BaseObject::isA (const char* className) const
+bool BaseObject::isA (const std::string& className) const
 {
   ClassID classID = ClassList::StringToID(className);
@@ -163 +163 @@
  * @returns true on match, false otherwise.
  */
-bool BaseObject::operator==(const char* objectName)
-{
-  return (objectName != NULL && this->objectName == objectName);
+bool BaseObject::operator==(const std::string& objectName)
+{
+  return (this->objectName == objectName);
 }
 

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

@@ -38 +38 @@
 
   /** @returns the className of the corresponding Object */
-  inline const char* getClassName() const { return this->className; };
+  inline const char* getClassName() const { return this->className.c_str(); };
   /** @returns the classID of the corresponding Object */
   inline int getClassID() const { return this->classID; };
@@ -44 +44 @@
 
   bool isA (ClassID classID) const;
-  bool isA (const char* className) const;
+  bool isA (const std::string& className) const;
   void whatIs() const;
 
-  bool operator==(const char* objectName);
+  bool operator==(const std::string& objectName);
   /** @param classID comparer for a ClassID @returns true on match, false otherwise */
   bool operator==(ClassID classID) { return this->isA(classID); };
@@ -55 +55 @@
 
  protected:
-  void setClassID(ClassID classID, const char* className);
+   void setClassID(ClassID classID, const std::string& className);
 
  private:
-    const char*        className;        //!< the name of the class
+    std::string        className;        //!< the name of the class
     long               classID;          //!< this is the id from the class_id.h enumeration
     std::string        objectName;       //!< The name of this object