Changeset 4591 in orxonox.OLD for orxonox/trunk/src/lib

Timestamp:

Jun 10, 2005, 6:21:25 PM (19 years ago)

Author:

bensch

Message:

orxonox/trunk: restructure class_list.h so it supports inheritance-diagram

Location:

orxonox/trunk/src/lib/lang

Files:

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

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

@@ -1 +1 @@
 
 
-/* 
+/*
    orxonox - the future of 3D-vertical-scrollers
 
@@ -30 +30 @@
 {
   this->className = NULL;
-  this->id = -1;
+  this->classID = CL_BASE_OBJECT;
   this->finalized = false;
 
@@ -42 +42 @@
    \brief standard deconstructor
 */
-BaseObject::~BaseObject () 
+BaseObject::~BaseObject ()
 {
   //  delete []this->className;
@@ -57 +57 @@
   // name setup
   LoadParam<BaseObject>(root, "name", this, &BaseObject::setName)
-    .describe("the name of the Object at hand");
+  .describe("the name of the Object at hand");
 }
 
@@ -65 +65 @@
    \param className the class name
 */
-void BaseObject::setClassID(int id, const char* className)
+void BaseObject::setClassID(long classID, const char* className)
 {
-  this->id = id;
-  this->className = className;
+  this->setClassID(classID);
+  this->setClassName(className);
 }
 
@@ -76 +76 @@
    \param id a number for the class from class_list.h enumeration
 */
-void BaseObject::setClassID (int id)
+void BaseObject::setClassID (long classID)
 {
-  this->id = id;
+  this->classID = classID;
 }
 
@@ -106 +106 @@
 
 /**
-  \brief set the name of the node
-
-  for debug purposes realy usefull, not used to work properly
-*/
-void BaseObject::setName (const char* newName)
+  \brief set the name of the Object
+ */
+void BaseObject::setName (const char* objectName)
 {
   if (this->objectName)
     delete []this->objectName;
-  if (newName)
+  if (objectName)
     {
-      this->objectName = new char[strlen(newName)+1];
-      strcpy(this->objectName, newName);
+      this->objectName = new char[strlen(objectName)+1];
+      strcpy(this->objectName, objectName);
     }
-  else 
+  else
     this->objectName = NULL;
 }

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

@@ -1 @@
-/*! 
+/*!
     \file base_object.h
     \brief Definition of the base object class.
@@ -30 +30 @@
   void setName (const char* newName);
   /** \brief returns the Name of this Object */
-  const char* getName (void)const { return this->objectName; };
+  inline const char* getName (void)const { return this->objectName; };
 
   /** \returns the className of the corresponding Object */
-  inline const char* getClassName(void) const { return this->className;};
+  inline const char* getClassName(void) const { return this->className; };
   /** \returns the classID of the corresponding Object */
-  inline int getClassID(void) const { return this->id; }
+  inline int getClassID(void) const { return this->classID; }
 
   //  bool isA (char* className);
@@ -44 +44 @@
 
  protected:
-  void setClassID(int id);
+  void setClassID(long classID);
   void setClassName(const char* className);
-  void setClassID(int id, const char* className);
+  void setClassID(long classID, const char* className);
 
   /** \brief this finalizes an object and makes it ready to be garbage collected */
@@ -52 +52 @@
 
  private:
-  const char*    className;        //!< the name of the class 
-  int            id;               //!< this is the id from the class_list.h enumeration
+  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
-
-  char*          objectName;       //!< The name of this object               
 };