Changeset 172 for code/branches/objecthierarchie/src/ClassHierarchy.cc

Timestamp:

Nov 6, 2007, 1:40:00 AM (16 years ago)

Author:

landauf

Message:

some features work perfectly,
some features are fucked up,
some features arent yet implemented.

x3n→hair→brightness++;

theres still a lot to do, but i can see the light on the end of the tunnel.
templates, makros, operator overloading, function pointers… the beauty of the beast. i'm in love and still dying piece by piece with every line of code i'm writing.
</film noir>

File:

• code/branches/objecthierarchie/src/ClassHierarchy.cc (modified) (7 diffs)

code/branches/objecthierarchie/src/ClassHierarchy.cc

@@ -1 +1 @@
 #include "ClassHierarchy.h"
+#include "OrxonoxClass.h"
 
 namespace orxonox
@@ -27 +28 @@
         this->allChildren_ = new IdentifierList();
         this->objects_ = new ObjectList();
+    }
+
+    Identifier::~Identifier()
+    {
+        delete this->directParents_;
+        delete this->allParents_;
+        delete this->directChildren_;
+        delete this->allChildren_;
+        delete this->objects_;
+        delete &this->name_;
     }
 
@@ -94 +105 @@
     }
 
-    bool Identifier::isDirectA(Identifier* identifier)
+    bool Identifier::isDirectlyA(Identifier* identifier)
     {
         return (identifier == this);
@@ -190 +201 @@
     }
 
+    std::string IdentifierList::toString()
+    {
+        IdentifierListElement* temp = this->first_;
+        std::string output = "";
+
+        while (temp)
+        {
+            output += temp->identifier_->getName();
+            output += " ";
+
+            temp = temp->next_;
+        }
+
+        return output;
+    }
+
 
     // ###############################
@@ -199 +226 @@
         this->next_ = NULL;
         this->bDirect_ = true;
+    }
+
+    IdentifierListElement::~IdentifierListElement()
+    {
     }
 
@@ -268 +299 @@
     }
 
+    ObjectListElement::~ObjectListElement()
+    {
+    }
+
 
     // ###############################
@@ -284 +319 @@
     ClassHierarchy::ClassHierarchy()
     {
-        this->bCreatingHierarchy_ = false;
+        this->hierarchyCreatingCounter_ = 0;
+    }
+
+    ClassHierarchy::~ClassHierarchy()
+    {
+      this->pointer_ = NULL;
     }
 }