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

Timestamp:

Mar 13, 2005, 10:50:43 PM (20 years ago)

Author:

bensch

Message:

orxonox/trunk: all WorldEntities/PWodes now destroy all date they alocate.

this is done with a virtual destructor:
if PNode is deleted it calls for the delete of the virtual destructor, and deletes the data of it.

Location:

orxonox/trunk/src/lib

Files:

• coord/p_node.cc (modified) (2 diffs)
• lang/base_object.cc (modified) (2 diffs)
• lang/base_object.h (modified) (1 diff)

orxonox/trunk/src/lib/coord/p_node.cc

@@ -110 +110 @@
   this->parent = NULL;
   /* there is currently a problem with cleaning up - fix*/
+
+  this->destroy();
 }
 
@@ -128 +130 @@
   /* this deletes all children in the list */
   this->children->destroy ();
+
+  static_cast<BaseObject*>(this)->destroy();
 }
 

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

@@ -26 +26 @@
    \brief standard constructor
 */
-BaseObject::BaseObject () {}
+BaseObject::BaseObject () 
+{
+  this->className = NULL;
+}
 
 
@@ -32 +35 @@
    \brief standard deconstructor
 */
-BaseObject::~BaseObject () {}
+BaseObject::~BaseObject () 
+{
+  this->destroy();
+}
 
+/** 
+    \brief destorys everything BaseObject allocated
+*/
+void BaseObject::destroy(void)
+{
+  //  delete []this->className;
+}
 
 void BaseObject::setClassName (char* className)

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

@@ -15 +15 @@
  public:
   BaseObject ();
-  ~BaseObject ();
+  virtual ~BaseObject ();
+
+  void destroy(void);
 
   void setClassName (char* className);