Changeset 5850 for code/branches/core5/src/orxonox/LevelManager.h

Timestamp:

Oct 1, 2009, 11:44:53 AM (16 years ago)

Author:

rgrieder

Message:

Moved the singleton creation/destruction mess to the Core class by using just two possible Scopes:

• ScopeID::Root for singletons that may always persists
• ScopeID::Graphics for singletons that only work when graphics was loaded

File:

• code/branches/core5/src/orxonox/LevelManager.h (modified) (3 diffs)

code/branches/core5/src/orxonox/LevelManager.h

@@ -36 +36 @@
 #include <string>
 
-#include "util/Singleton.h"
+#include "util/ScopedSingleton.h"
 #include "core/OrxonoxClass.h"
 
@@ -44 +44 @@
     class _OrxonoxExport LevelManager
     // tolua_end
-        : public Singleton<LevelManager>, public OrxonoxClass
+        : public ScopedSingleton<LevelManager, ScopeID::Root>, public OrxonoxClass
     { // tolua_export
-            friend class Singleton<LevelManager>;
+            friend class ScopedSingleton<LevelManager, ScopeID::Root>;
         public:
             LevelManager();
@@ -63 +63 @@
 
             static LevelManager* getInstancePtr() { return singletonPtr_s; }
-            static LevelManager& getInstance()    { return Singleton<LevelManager>::getInstance(); } // tolua_export
+            static LevelManager& getInstance()    { return ScopedSingleton<LevelManager, ScopeID::Root>::getInstance(); } // tolua_export
 
         private: