Changeset 239 for code/branches/objecthierarchie/src/Identifier.h

Timestamp:

Nov 25, 2007, 2:59:58 AM (16 years ago)

Author:

landauf

Message:

added some "const" qualifiers to the identifier-functions

File:

• code/branches/objecthierarchie/src/Identifier.h (modified) (12 diffs)

code/branches/objecthierarchie/src/Identifier.h

@@ -27 +27 @@
 
         public:
-            virtual void removeObject(OrxonoxClass* object) {};
-
-            virtual BaseObject* fabricate() {};
-
-            bool isA(Identifier* identifier);
-            bool isDirectlyA(Identifier* identifier);
-            bool isChildOf(Identifier* identifier);
-            bool isDirectChildOf(Identifier* identifier);
-            bool isParentOf(Identifier* identifier);
-            bool isDirectParentOf(Identifier* identifier);
-
-            std::string getName() { return this->name_; }
-            IdentifierList* getDirectParents() { return &(this->directParents_); }
-            IdentifierList* getAllParents() { return &(this->allParents_); }
-            IdentifierList* getDirectChildren() { return &(this->directChildren_); }
-            IdentifierList* getAllChildren() { return &(this->allChildren_); }
+            virtual void removeObject(OrxonoxClass* object) const = 0;
+
+            virtual BaseObject* fabricate() const = 0;
+
+            bool isA(const Identifier* identifier) const;
+            bool isDirectlyA(const Identifier* identifier) const;
+            bool isChildOf(const Identifier* identifier) const;
+            bool isDirectChildOf(const Identifier* identifier) const;
+            bool isParentOf(const Identifier* identifier) const;
+            bool isDirectParentOf(const Identifier* identifier) const;
+
+            const std::string& getName() const { return this->name_; }
+            const IdentifierList* getDirectParents() const { return this->directParents_; }
+            const IdentifierList* getAllParents() const { return this->allParents_; }
+            const IdentifierList* getDirectChildren() const { return this->directChildren_; }
+            const IdentifierList* getAllChildren() const { return this->allChildren_; }
 
             static bool isCreatingHierarchy() { return (hierarchyCreatingCounter_s > 0); }
@@ -50 +50 @@
             Identifier(const Identifier& identifier) {}
             virtual ~Identifier();
-            void initialize(IdentifierList* parents);
+            void initialize(const IdentifierList* parents);
 
             static void startCreatingHierarchy()
@@ -68 +68 @@
             }
 
-            IdentifierList directParents_;
-            IdentifierList allParents_;
-            IdentifierList directChildren_;
-            IdentifierList allChildren_;
+            IdentifierList* directParents_;
+            IdentifierList* allParents_;
+            IdentifierList* directChildren_;
+            IdentifierList* allChildren_;
 
             std::string name_;
@@ -92 +92 @@
 
         public:
-            static ClassIdentifier<T>* registerClass(IdentifierList* parents, std::string name, bool bRootClass, bool bIsAbstractClass);
+            static ClassIdentifier<T>* registerClass(const IdentifierList* parents, const std::string& name, bool bRootClass, bool bIsAbstractClass);
             static ClassIdentifier<T>* getIdentifier();
-            BaseObject* fabricate();
-            T* fabricateClass();
+            BaseObject* fabricate() const;
+            T* fabricateClass() const;
             static void addObject(T* object);
-            void removeObject(OrxonoxClass* object);
+            void removeObject(OrxonoxClass* object) const;
 
         private:
@@ -105 +105 @@
 
             static ClassIdentifier<T>* pointer_s;
-            ObjectList<T> objects_s;
+            ObjectList<T>* objects_;
     };
 
@@ -114 +114 @@
     ClassIdentifier<T>::ClassIdentifier()
     {
+        this->objects_ = new ObjectList<T>;
     }
 
@@ -119 +120 @@
     ClassIdentifier<T>::~ClassIdentifier()
     {
+        delete this->objects_;
         this->pointer_s = NULL;
     }
 
     template <class T>
-    BaseObject* ClassIdentifier<T>::fabricate()
+    BaseObject* ClassIdentifier<T>::fabricate() const
     {
         return dynamic_cast<BaseObject*>(this->fabricateClass());
@@ -129 +131 @@
 
     template <class T>
-    T* ClassIdentifier<T>::fabricateClass()
+    T* ClassIdentifier<T>::fabricateClass() const
     {
         if (!this->bIsAbstractClass_)
@@ -144 +146 @@
 
     template <class T>
-    ClassIdentifier<T>* ClassIdentifier<T>::registerClass(IdentifierList* parents, std::string name, bool bRootClass, bool bIsAbstractClass)
+    ClassIdentifier<T>* ClassIdentifier<T>::registerClass(const IdentifierList* parents, const std::string& name, bool bRootClass, bool bIsAbstractClass)
     {
 #if HIERARCHY_VERBOSE
@@ -202 +204 @@
         std::cout << "*** Added object to " << ClassIdentifier<T>::getIdentifier()->getName() << "-list.\n";
 #endif
-        ClassIdentifier<T>::getIdentifier()->objects_s.add(object);
-    }
-
-    template <class T>
-    void ClassIdentifier<T>::removeObject(OrxonoxClass* object)
+        ClassIdentifier<T>::getIdentifier()->objects_->add(object);
+    }
+
+    template <class T>
+    void ClassIdentifier<T>::removeObject(OrxonoxClass* object) const
     {
         bool bIterateForwards = !Identifier::isCreatingHierarchy();
@@ -217 +219 @@
 #endif
 
-        this->objects_s.remove(object, bIterateForwards);
-
-        IdentifierListElement* temp = this->directParents_.first_;
+        this->objects_->remove(object, bIterateForwards);
+
+        IdentifierListElement* temp = this->directParents_->first_;
         while (temp)
         {
@@ -285 +287 @@
             }
 
-            inline Identifier* getIdentifier()
+            inline const Identifier* getIdentifier() const
                 { return this->identifier_; }
-            inline bool isA(Identifier* identifier)
+            inline bool isA(const Identifier* identifier) const
                 { return this->identifier_->isA(identifier); }
-            inline bool isDirectlyA(Identifier* identifier)
+            inline bool isDirectlyA(const Identifier* identifier) const
                 { return this->identifier_->isDirectlyA(identifier); }
-            inline bool isChildOf(Identifier* identifier)
+            inline bool isChildOf(const Identifier* identifier) const
                 { return this->identifier_->isChildOf(identifier); }
-            inline bool isDirectChildOf(Identifier* identifier)
+            inline bool isDirectChildOf(const Identifier* identifier) const
                 { return this->identifier_->isDirectChildOf(identifier); }
-            inline bool isParentOf(Identifier* identifier)
+            inline bool isParentOf(const Identifier* identifier) const
                 { return this->identifier_->isParentOf(identifier); }
-            inline bool isDirectParentOf(Identifier* identifier)
+            inline bool isDirectParentOf(const Identifier* identifier) const
                 { return this->identifier_->isDirectParentOf(identifier); }