Changeset 5867 for code/branches/core5/src/modules/questsystem

Timestamp:

Oct 4, 2009, 12:02:28 AM (15 years ago)

Author:

rgrieder

Message:

Modified Scoped Singleton concept: Derive from Singleton normally, but place an important pre-main() instruction in the source file: ManageScopedSingleton(className, scope) (it's a macro).
This causes the Singleton to be created and destroyed with the Scope. Thus if a Singleton c'tor throws, it is much easier to react accordingly.

Location:

code/branches/core5/src/modules/questsystem

Files:

• QuestManager.cc (modified) (2 diffs)
• QuestManager.h (modified) (3 diffs)
• QuestsystemPrecompiledHeaders.h (modified) (1 diff)
• notifications/NotificationManager.cc (modified) (2 diffs)
• notifications/NotificationManager.h (modified) (2 diffs)

code/branches/core5/src/modules/questsystem/QuestManager.cc

@@ -41 +41 @@
 #include "core/ConsoleCommand.h"
 #include "core/LuaState.h"
+#include "core/ScopedSingletonManager.h"
 #include "infos/PlayerInfo.h"
 #include "overlays/GUIOverlay.h"
@@ -56 +57 @@
     //! Pointer to the current (and single) instance of this class.
     /*static*/ QuestManager* QuestManager::singletonPtr_s = NULL;
+    ManageScopedSingleton(QuestManager, ScopeID::Root);
 
     /**

code/branches/core5/src/modules/questsystem/QuestManager.h

@@ -42 +42 @@
 #include <string>
 
-#include "util/ScopedSingleton.h"
+#include "util/Singleton.h"
 #include "core/OrxonoxClass.h"
 
@@ -59 +59 @@
     class _QuestsystemExport QuestManager
 // tolua_end
-        : public ScopedSingleton<QuestManager, ScopeID::Root>, public orxonox::OrxonoxClass
+        : public Singleton<QuestManager>, public orxonox::OrxonoxClass
     { // tolua_export
 
-            friend class ScopedSingleton<QuestManager, ScopeID::Root>;
+            friend class Singleton<QuestManager>;
             friend class QuestGUI;
 
@@ -70 +70 @@
 
             //! Returns a reference to the single instance of the Quest Manager.
-            static QuestManager& getInstance() { return ScopedSingleton<QuestManager, ScopeID::Root>::getInstance(); } // tolua_export
+            static QuestManager& getInstance() { return Singleton<QuestManager>::getInstance(); } // tolua_export
 
             //! Retreive the main window for the GUI. 

code/branches/core5/src/modules/questsystem/QuestsystemPrecompiledHeaders.h

@@ -51 +51 @@
 #include <OgreColourValue.h> // 16
 
-#include <tinyxml/ticpp.h>        // 14
-#include "util/ScopedSingleton.h" // 13
+#include <tinyxml/ticpp.h>   // 14
+#include "util/Singleton.h"  // 13
 
 ///////////////////////////////////////////

code/branches/core5/src/modules/questsystem/notifications/NotificationManager.cc

@@ -37 +37 @@
 
 #include "core/CoreIncludes.h"
+#include "core/ScopedSingletonManager.h"
 #include "Notification.h"
 #include "interfaces/NotificationListener.h"
@@ -47 +48 @@
 
     NotificationManager* NotificationManager::singletonPtr_s = NULL;
+    ManageScopedSingleton(NotificationManager, ScopeID::Root);
 
     /**

code/branches/core5/src/modules/questsystem/notifications/NotificationManager.h

@@ -41 +41 @@
 #include <string>
 
-#include "util/ScopedSingleton.h"
+#include "util/Singleton.h"
 #include "core/OrxonoxClass.h"
 
@@ -53 +53 @@
         Damian 'Mozork' Frick
     */
-    class _QuestsystemExport NotificationManager : public ScopedSingleton<NotificationManager, ScopeID::Root>, public OrxonoxClass
+    class _QuestsystemExport NotificationManager : public Singleton<NotificationManager>, public OrxonoxClass
     {
-            friend class ScopedSingleton<NotificationManager, ScopeID::Root>;
+            friend class Singleton<NotificationManager>;
         public:
             NotificationManager();