Changeset 3366 for code/branches/resource/src/core/GUIManager.h

Timestamp:

Jul 29, 2009, 10:27:10 PM (15 years ago)

Author:

rgrieder

Message:

Derived all singletons implemented in a usual manner from orxonox::Singleton<T>.
This resolves inconsistencies with the singletonPtr_s variable in case of exceptions (asserts were being triggered then).
And while at it replaced singletonRef_s with singletonPtr_s for it to be less misleading (as fabian has already pointed out).

File:

• code/branches/resource/src/core/GUIManager.h (modified) (4 diffs)

code/branches/resource/src/core/GUIManager.h

@@ -45 +45 @@
 
 #include "util/OgreForwardRefs.h"
+#include "util/Singleton.h"
 #include "input/InputHandler.h"
 
@@ -60 +61 @@
         Those input events are then injected into CEGUI in Lua.
     */
-    class _CoreExport GUIManager : public InputHandler
+    class _CoreExport GUIManager : public Singleton<GUIManager>, public InputHandler
     {
+        friend class Singleton<GUIManager>;
     public:
         GUIManager(Ogre::RenderWindow* renderWindow);
@@ -73 +75 @@
         void setCamera(Ogre::Camera* camera);
 
-        static GUIManager& getInstance()    { assert(singletonRef_s); return *singletonRef_s; }
-        static GUIManager* getInstancePtr() { return singletonRef_s; }
+        static GUIManager* getInstancePtr() { return singletonPtr_s; }
 
     private:
@@ -99 +100 @@
         lua_State*               luaState_;         //!< Lua state, access point to the Lua engine
 
-        static GUIManager*       singletonRef_s;    //!< Singleton reference to GUIManager
+        static GUIManager*       singletonPtr_s;    //!< Singleton reference to GUIManager
 
     };