Changeset 4742 in orxonox.OLD for orxonox/trunk/src/lib/lang

Timestamp:

Jun 30, 2005, 4:38:33 PM (19 years ago)

Author:

bensch

Message:

orxonox/trunk: BaseObject now only knows setClassID → standartisation

Location:

orxonox/trunk/src/lib/lang

Files:

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

orxonox/trunk/src/lib/lang/base_object.cc

@@ -68 +68 @@
 void BaseObject::setClassID(long classID, const char* className)
 {
-  this->setClassID(classID);
-  this->setClassName(className);
-}
-
-
-/**
-   \brief sets the class identifier
-   \param id a number for the class from class_list.h enumeration
-*/
-void BaseObject::setClassID (long classID)
-{
   this->classID |= classID;
-}
-
-
-/**
-   \brief sets the class identifiers
-   \param className the class name
-*/
-void BaseObject::setClassName(const char* className)
-{
   this->className = className;
 }
@@ -95 +75 @@
   \brief set the name of the Object
  */
-             void BaseObject::setName (const char* objectName)
+void BaseObject::setName (const char* objectName)
 {
   if (this->objectName)

orxonox/trunk/src/lib/lang/base_object.h

@@ -4 +4 @@
 
     This is a global handler for all classes.
-
-    \todo isA()
 */
 
@@ -12 +10 @@
 #define _BASE_OBJECT_H
 
-#include "class_list.h"
+#include "class_id.h"
 #ifndef NULL
 #define NULL 0x0        //!< NULL
@@ -45 +43 @@
 
  protected:
-  void setClassID(long classID);
-  void setClassName(const char* className);
   void setClassID(long classID, const char* className);
 
@@ -52 +48 @@
   void finalize(void) { this->finalized = true; };
 
- private:
-  const char*    className;        //!< the name of the class
-  long           classID;          //!< this is the id from the class_list.h enumeration
-  char*          objectName;       //!< The name of this object
+  private:
+    static void addToClassList(BaseObject* object, ClassID id, const char* className);
 
-  bool           finalized;        //!< is true if the object is ready to be garbage collected
+  private:
+    const char*        className;        //!< the name of the class
+    long               classID;          //!< this is the id from the class_list.h enumeration
+    char*              objectName;       //!< The name of this object
+
+    bool               finalized;        //!< is true if the object is ready to be garbage collected
+
+//    static ClassList*  classList;
 };