Changeset 9565 for code/branches/core6/src/libraries/core/class/Identifiable.cc

Timestamp:

Mar 24, 2013, 6:34:23 PM (11 years ago)

Author:

landauf

Message:

moved functions and attributes needed to identify the class from OrxonoxClass to Identifiable

File:

• code/branches/core6/src/libraries/core/class/Identifiable.cc (copied) (copied from code/branches/core6/src/libraries/core/class/OrxonoxClass.cc) (6 diffs)

code/branches/core6/src/libraries/core/class/Identifiable.cc

@@ -32 +32 @@
 */
 
-#include "OrxonoxClass.h"
+#include "Identifiable.h"
 
 #include <cassert>
@@ -44 +44 @@
         @brief Constructor: Sets the default values.
     */
-    OrxonoxClass::OrxonoxClass()
+    Identifiable::Identifiable()
     {
         this->identifier_ = 0;
         this->parents_ = 0;
         this->metaList_ = new MetaObjectList();
-        this->referenceCount_ = 0;
-        this->requestedDestruction_ = false;
         // Optimisation
         this->objectPointers_.reserve(6);
@@ -56 +54 @@
 
     /**
-        @brief Destructor: Removes the object from the object-lists, notifies all DestructionListener (for example @ref WeakPtr "weak pointers") that this object is being deleted.
+        @brief Destructor: Removes the object from the object-lists
     */
-    OrxonoxClass::~OrxonoxClass()
+    Identifiable::~Identifiable()
     {
 //        if (!this->requestedDestruction_)
 //            orxout(internal_warning) << "Destroyed object without destroy() (" << this->getIdentifier()->getName() << ')' << endl;
-
-        assert(this->referenceCount_ <= 0);
 
         this->unregisterObject();
@@ -70 +66 @@
         if (this->parents_)
             delete this->parents_;
-
-        // notify all destruction listeners
-        for (std::set<DestructionListener*>::iterator it = this->destructionListeners_.begin(); it != this->destructionListeners_.end(); )
-            (*(it++))->objectDeleted();
-    }
-
-    /**
-        @brief Deletes the object if no @ref orxonox::SmartPtr "smart pointers" point to this object. Otherwise schedules the object to be deleted as soon as possible.
-    */
-    void OrxonoxClass::destroy()
-    {
-        assert(this); // Just in case someone tries to delete a NULL pointer
-        this->requestedDestruction_ = true;
-        if (this->referenceCount_ == 0)
-        {
-            this->preDestroy();
-            if (this->referenceCount_ == 0)
-                delete this;
-        }
     }
 
@@ -94 +71 @@
         @brief Removes this object from the object-lists.
     */
-    void OrxonoxClass::unregisterObject()
+    void Identifiable::unregisterObject()
     {
         if (this->metaList_)
@@ -102 +79 @@
 
     /// Returns true if the object's class is of the given type or a derivative.
-    bool OrxonoxClass::isA(const Identifier* identifier)
+    bool Identifiable::isA(const Identifier* identifier)
         { return this->getIdentifier()->isA(identifier); }
     /// Returns true if the object's class is exactly of the given type.
-    bool OrxonoxClass::isExactlyA(const Identifier* identifier)
+    bool Identifiable::isExactlyA(const Identifier* identifier)
         { return this->getIdentifier()->isExactlyA(identifier); }
     /// Returns true if the object's class is a child of the given type.
-    bool OrxonoxClass::isChildOf(const Identifier* identifier)
+    bool Identifiable::isChildOf(const Identifier* identifier)
         { return this->getIdentifier()->isChildOf(identifier); }
     /// Returns true if the object's class is a direct child of the given type.
-    bool OrxonoxClass::isDirectChildOf(const Identifier* identifier)
+    bool Identifiable::isDirectChildOf(const Identifier* identifier)
         { return this->getIdentifier()->isDirectChildOf(identifier); }
     /// Returns true if the object's class is a parent of the given type.
-    bool OrxonoxClass::isParentOf(const Identifier* identifier)
+    bool Identifiable::isParentOf(const Identifier* identifier)
         { return this->getIdentifier()->isParentOf(identifier); }
     /// Returns true if the object's class is a direct parent of the given type.
-    bool OrxonoxClass::isDirectParentOf(const Identifier* identifier)
+    bool Identifiable::isDirectParentOf(const Identifier* identifier)
         { return this->getIdentifier()->isDirectParentOf(identifier); }
 
 
     /// Returns true if the object's class is of the given type or a derivative.
-    bool OrxonoxClass::isA(const OrxonoxClass* object)
+    bool Identifiable::isA(const Identifiable* object)
         { return this->getIdentifier()->isA(object->getIdentifier()); }
     /// Returns true if the object's class is exactly of the given type.
-    bool OrxonoxClass::isExactlyA(const OrxonoxClass* object)
+    bool Identifiable::isExactlyA(const Identifiable* object)
         { return this->getIdentifier()->isExactlyA(object->getIdentifier()); }
     /// Returns true if the object's class is a child of the given type.
-    bool OrxonoxClass::isChildOf(const OrxonoxClass* object)
+    bool Identifiable::isChildOf(const Identifiable* object)
         { return this->getIdentifier()->isChildOf(object->getIdentifier()); }
     /// Returns true if the object's class is a direct child of the given type.
-    bool OrxonoxClass::isDirectChildOf(const OrxonoxClass* object)
+    bool Identifiable::isDirectChildOf(const Identifiable* object)
         { return this->getIdentifier()->isDirectChildOf(object->getIdentifier()); }
     /// Returns true if the object's class is a parent of the given type.
-    bool OrxonoxClass::isParentOf(const OrxonoxClass* object)
+    bool Identifiable::isParentOf(const Identifiable* object)
         { return this->getIdentifier()->isParentOf(object->getIdentifier()); }
     /// Returns true if the object's class is a direct child of the given type.
-    bool OrxonoxClass::isDirectParentOf(const OrxonoxClass* object)
+    bool Identifiable::isDirectParentOf(const Identifiable* object)
         { return this->getIdentifier()->isDirectParentOf(object->getIdentifier()); }
 }