Changeset 806 for code/branches/core/src/orxonox/core/Identifier.h

Timestamp:

Feb 12, 2008, 4:43:22 PM (16 years ago)

Author:

landauf

Message:

cleanup

File:

• code/branches/core/src/orxonox/core/Identifier.h (modified) (4 diffs)

code/branches/core/src/orxonox/core/Identifier.h

@@ -106 +106 @@
             bool isParentOf(const Identifier* identifier) const;
 
-//            static std::map<std::string, Identifier*>& getIdentifierMap();
-
             /** @brief Removes all objects of the corresponding class. */
             virtual void removeObjects() const = 0;
@@ -192 +190 @@
             ClassIdentifier<T>* registerClass(const IdentifierList* parents, const std::string& name, bool bRootClass);
             void addObject(T* object);
-//            static ClassIdentifier<T>* getIdentifier();
             void removeObjects() const;
             void setName(const std::string& name);
@@ -244 +241 @@
 
     /**
-        @brief Creates the only instance of this class for the template class T.
-        @return The Identifier itself
-    *//*
-    template <class T>
-    ClassIdentifier<T>* ClassIdentifier<T>::getIdentifier()
-    {
-        static ClassIdentifier<T> theOneAndOnlyInstance = ClassIdentifier<T>();
-        static bool bIdentifierCreated = false;
-
-        if (!bIdentifierCreated)
-        {
-            COUT(4) << "*** Create Identifier Singleton." << std::endl;
-            bIdentifierCreated = true;
-        }
-
-        return &theOneAndOnlyInstance;
-    }
-*/
-    /**
         @brief Sets the name of the class.
         @param name The name
@@ -269 +247 @@
     void ClassIdentifier<T>::setName(const std::string& name)
     {
-//        // Make sure we didn't already set the name, to avoid duplicate entries in the Identifier map
         if (!this->bSetName_)
         {
             this->name_ = name;
-//            this->getIdentifierMap().insert(std::pair<std::string, Identifier*>(name, this));
             this->bSetName_ = true;
         }