Changeset 8423 for code/trunk/src/libraries/core/GUIManager.h

Timestamp:

May 9, 2011, 5:06:49 AM (13 years ago)

Author:

rgrieder

Message:

Added and incorporated new class DestructionHelper: instead of doing the destruction of certain singletons implicitly via scoped_ptrs and ScopeGuards, use a method named destroy() that essentially achieves the same, but makes the destruction sequence obvious.

File:

• code/trunk/src/libraries/core/GUIManager.h (modified) (5 diffs)

code/trunk/src/libraries/core/GUIManager.h

@@ -44 +44 @@
 #include <CEGUIVersion.h>
 #include <boost/shared_ptr.hpp>
-#include <loki/ScopeGuard.h>
 
+#include "util/DestructionHelper.h"
 #include "util/OgreForwardRefs.h"
 #include "util/TriBool.h"
@@ -83 +83 @@
     public:
         GUIManager(const std::pair<int, int>& mousePosition);
+
         //! Leave empty and use cleanup() instead
         ~GUIManager() {}
+        /// Destructor that also executes when object fails to construct
+        void destroy();
 
         void setConfigValues(void);
@@ -134 +137 @@
         GUIManager(const GUIManager& instance); //!< private and undefined copy c'tor (this is a singleton class)
 
-        /// Destructor that also executes when object fails to construct
-        void cleanup();
-
         void executeCode(const std::string& str);
 
@@ -156 +156 @@
         virtual void windowResized(unsigned int newWidth, unsigned int newHeight);
         virtual void windowFocusChanged(bool bFocus);
-
-        /// Surrogate for the destructor
-        Loki::ObjScopeGuardImpl0<GUIManager, void (GUIManager::*)()> destroyer_;
 
 #ifdef ORXONOX_OLD_CEGUI
@@ -180 +177 @@
         Ogre::Camera*                        camera_;           //!< Camera used to render the scene with the GUI
 
+        /// Helper object that executes the surrogate destructor destroy()
+        DestructionHelper<GUIManager>        destructionHelper_;
+
         static GUIManager*                   singletonPtr_s;    //!< Singleton reference to GUIManager