Changeset 150 for code/branches/objecthierarchie/src/ClassHierarchy.h

Timestamp:

Nov 2, 2007, 2:28:23 AM (17 years ago)

Author:

landauf

Message:

no idea if this has any chance to work… template-syntax is crap

File:

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

code/branches/objecthierarchie/src/ClassHierarchy.h

@@ -22 +22 @@
     class ObjectList;
     class BaseObject;
+    template <class T>
+    class ClassIdentifier;
 
     class Identifier
@@ -29 +31 @@
 
         public:
-//            static Identifier* registerClass(IdentifierList* parents);
             void addObject(BaseObject* object);
             void removeObject(BaseObject* object);
@@ -40 +41 @@
             bool isDirectParentOf(Identifier* identifier);
 
-        protected:
+        private:
             Identifier();
-            void initialize(IdentifierList* identifier);
-
-            static Identifier* pointer_;
+            void initialize(IdentifierList* parents);
 
             IdentifierList* directParents_;
@@ -54 +53 @@
             std::string name_;
 
-        private:
             bool bCreatedOneObject_;
     };
@@ -61 +59 @@
     class ClassIdentifier : public Identifier
     {
-//        friend class Identifier;
-
         public:
-            static Identifier* registerClass(IdentifierList* parents);
-            static Identifier* getIdentifier();
+            static ClassIdentifier<T>* registerClass(IdentifierList* parents);
+            static ClassIdentifier<T>* getIdentifier();
             static T* create();
 
         private:
             ClassIdentifier();
+
+            static ClassIdentifier<T>* pointer_;
+
     };
 
     #define getStringFromClassName(ClassName) \
         #ClassName
+
+    template <class T>
+    ClassIdentifier<T>* ClassIdentifier<T>::pointer_ = NULL;
 
     template <class T>
@@ -81 +83 @@
 
     template <class T>
-    Identifier* ClassIdentifier<T>::registerClass(IdentifierList* parents)
+    ClassIdentifier<T>* ClassIdentifier<T>::registerClass(IdentifierList* parents)
     {
         if (!pointer_)
@@ -94 +96 @@
 
     template <class T>
-    Identifier* ClassIdentifier<T>::getIdentifier()
+    ClassIdentifier<T>* ClassIdentifier<T>::getIdentifier()
     {
         if (!pointer_)