Changeset 10555 for code/branches/core7/src/libraries/core/BaseObject.h

Timestamp:

Aug 29, 2015, 5:35:59 PM (10 years ago)

Author:

landauf

Message:

renamed SmartPtr to StrongPtr (now we have weak and strong pointers)

File:

• code/branches/core7/src/libraries/core/BaseObject.h (modified) (5 diffs)

code/branches/core7/src/libraries/core/BaseObject.h

@@ -51 +51 @@
 #include "class/OrxonoxClass.h"
 #include "class/Super.h"
-#include "object/SmartPtr.h"
+#include "object/StrongPtr.h"
 
 namespace orxonox
@@ -138 +138 @@
                 { return this->templates_; }
 
-            inline void setNamespace(const SmartPtr<Namespace>& ns) { this->namespace_ = ns; }
-            inline const SmartPtr<Namespace>& getNamespace() const { return this->namespace_; }
+            inline void setNamespace(const StrongPtr<Namespace>& ns) { this->namespace_ = ns; }
+            inline const StrongPtr<Namespace>& getNamespace() const { return this->namespace_; }
 
             inline void setCreator(BaseObject* creator) { this->creator_ = creator; }
             inline BaseObject* getCreator() const { return this->creator_; }
 
-            inline void setScene(const SmartPtr<Scene>& scene, uint32_t sceneID) { this->scene_ = scene; this->sceneID_=sceneID; }
-            inline const SmartPtr<Scene>& getScene() const { return this->scene_; }
+            inline void setScene(const StrongPtr<Scene>& scene, uint32_t sceneID) { this->scene_ = scene; this->sceneID_=sceneID; }
+            inline const StrongPtr<Scene>& getScene() const { return this->scene_; }
             inline virtual uint32_t getSceneID() const { return this->sceneID_; }
 
-            inline void setGametype(const SmartPtr<Gametype>& gametype)
+            inline void setGametype(const StrongPtr<Gametype>& gametype)
             {
                 if (gametype != this->gametype_)
@@ -157 +157 @@
                 }
             }
-            inline const SmartPtr<Gametype>& getGametype() const { return this->gametype_; }
+            inline const StrongPtr<Gametype>& getGametype() const { return this->gametype_; }
             inline Gametype* getOldGametype() const { return this->oldGametype_; }
             virtual void changedGametype() {}
 
-            inline void setLevel(const SmartPtr<Level>& level)
+            inline void setLevel(const StrongPtr<Level>& level)
             {
                 if (level != this->level_)
@@ -169 +169 @@
                 }
             }
-            inline const SmartPtr<Level>& getLevel() const { return this->level_; }
+            inline const StrongPtr<Level>& getLevel() const { return this->level_; }
             virtual void changedLevel() {}
 
@@ -222 +222 @@
             std::map<std::string, std::string> xmlAttributes_; //!< Lowercase XML attributes
             std::string            loaderIndentation_;         //!< Indentation of the debug output in the Loader
-            SmartPtr<Namespace>    namespace_;
+            StrongPtr<Namespace>   namespace_;
             BaseObject*            creator_;
-            SmartPtr<Scene>        scene_;
+            StrongPtr<Scene>       scene_;
             uint32_t               sceneID_;
-            SmartPtr<Gametype>     gametype_;
+            StrongPtr<Gametype>    gametype_;
             Gametype*              oldGametype_;
-            SmartPtr<Level>        level_;
+            StrongPtr<Level>       level_;
             std::set<Template*>    templates_;