Changeset 162 for code/branches/objecthierarchie/src/BaseObject.h

Timestamp:

Nov 5, 2007, 12:52:26 AM (16 years ago)

Author:

landauf

Message:

it starts to work, but there is still much to do.

@bensch: thanks for you mail, but i can't tell you much at the moment - i'm still changing lots of things and i have no idea if everything will work as intendet, so i'll write you as soon as i have reliable informations
</abuse log for pms>

File:

• code/branches/objecthierarchie/src/BaseObject.h (modified) (2 diffs)

code/branches/objecthierarchie/src/BaseObject.h

@@ -3 +3 @@
 
 #include "ClassHierarchy.h"
+#include "OrxonoxClass.h"
 
 namespace orxonox
 {
-    class BaseObject
+    class BaseObject : virtual public OrxonoxClass
     {
         public:
@@ -13 +14 @@
 
             inline bool isA(Identifier* identifier)
-                { this->identifier_->isA(identifier); }
+                { this->getIdentifier()->isA(identifier); }
             inline bool isDirectA(Identifier* identifier)
-                { this->identifier_->isDirectA(identifier); }
+                { this->getIdentifier()->isDirectA(identifier); }
             inline bool isChildOf(Identifier* identifier)
-                { this->identifier_->isChildOf(identifier); }
+                { this->getIdentifier()->isChildOf(identifier); }
             inline bool isDirectChildOf(Identifier* identifier)
-                { this->identifier_->isDirectChildOf(identifier); }
+                { this->getIdentifier()->isDirectChildOf(identifier); }
             inline bool isParentOf(Identifier* identifier)
-                { this->identifier_->isParentOf(identifier); }
+                { this->getIdentifier()->isParentOf(identifier); }
             inline bool isDirectParentOf(Identifier* identifier)
-                { this->identifier_->isDirectParentOf(identifier); }
+                { this->getIdentifier()->isDirectParentOf(identifier); }
 
-            ClassIdentifier<class BaseObject>* identifier_;
+//            Identifier* identifier_;
 
-        protected:
-            IdentifierList* parents_; // INTERN! Don't touch this!
-
-        private:
+//        protected:
+//            IdentifierList* parents_; // INTERN! Don't touch this!
 
     };