Changeset 8a4f12 for molecuilder/src/Actions

Timestamp:

Mar 11, 2010, 2:08:44 PM (16 years ago)

Author:

Tillmann Crueger <crueger@…>

Children:

c3f8c4

Parents:

abab7e

Message:

Changed ActionRegistry to use the new Singleton Mechanism

Location:

molecuilder/src/Actions

Files:

• Action.cpp (modified) (1 diff)
• ActionRegistry.cpp (modified) (3 diffs)
• ActionRegistry.hpp (modified) (2 diffs)

molecuilder/src/Actions/Action.cpp

@@ -17 +17 @@
 {
   if(_doRegister){
-    ActionRegistry::getRegistry()->registerAction(this);
+    ActionRegistry::getInstance().registerAction(this);
   }
 }

molecuilder/src/Actions/ActionRegistry.cpp

@@ -9 +9 @@
 #include "Actions/Action.hpp"
 
+#include "Patterns/Singleton_impl.hpp"
+
 #include <string>
 #include <cassert>
@@ -14 +16 @@
 
 using namespace std;
-
-ActionRegistry *ActionRegistry::theInstance=0;
 
 ActionRegistry::ActionRegistry()
@@ -43 +43 @@
 }
 
-// singleton stuff
-ActionRegistry* ActionRegistry::getRegistry(){
-  if(!theInstance){
-    theInstance = new ActionRegistry();
-  }
-  return theInstance;
-}
-
-void ActionRegistry::purgeRegistry(){
-  if(theInstance){
-    delete theInstance;
-    theInstance = 0;
-  }
-}
+CONSTRUCT_SINGLETON(ActionRegistry)

molecuilder/src/Actions/ActionRegistry.hpp

@@ -12 +12 @@
 #include <map>
 
+#include "Patterns/Singleton.hpp"
+
 class Action;
 
-class ActionRegistry
+class ActionRegistry : public Singleton<ActionRegistry>
 {
+  friend class Singleton<ActionRegistry>;
 public:
   Action* getActionByName(const std::string);
@@ -23 +26 @@
   std::map<const std::string,Action*> actionMap;
 
-// singleton stuff
-public:
-  static ActionRegistry* getRegistry();
-  static void purgeRegistry();
 private:
   ActionRegistry();
   virtual ~ActionRegistry();
-  static ActionRegistry *theInstance;
 };