Changeset 810

Timestamp:

Feb 13, 2008, 2:58:55 AM (17 years ago)

Author:

landauf

Message:

Added copyconstructor to the SubclassIdentifier (this class is still a hack after the changes with the ClassManager).

Location:

code/branches/core/src/orxonox/core

Files:

• ClassManager.h (modified) (1 diff)
• Identifier.h (modified) (1 diff)

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

@@ -134 +134 @@
         static std::string unknownClassName = std::string("unknown");
 
-        if (ClassManager<T>::getSingleton()->bInitialized)
+        if (ClassManager<T>::getSingleton()->bInitialized_)
             return ClassManager<T>::getSingleton()->identifier_->getName();
         else

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

@@ -299 +299 @@
             SubclassIdentifier()
             {
-                T* temp = new T;
-                this->subclassIdentifier_ = temp->getIdentifier();
-                delete temp;
+                std::string name = ClassManager<T>::getName();
+
+                if (name != "unknown")
+                    this->subclassIdentifier_ = ClassManager<T>::getIdentifier(name);
+                else
+                    this->subclassIdentifier_ = 0;
 
                 this->identifier_ = this->subclassIdentifier_;
+            }
+
+            /**
+                @brief Copyconstructor: Assigns the given Identifier.
+                @param identifier The Identifier
+            */
+            SubclassIdentifier(Identifier* identifier)
+            {
+                std::string name = ClassManager<T>::getName();
+
+                if (name != "unknown")
+                    this->subclassIdentifier_ = ClassManager<T>::getIdentifier(name);
+                else
+                    this->subclassIdentifier_ = 0;
+
+                this->identifier_ = identifier;
             }