Changes in src/UIElements/UIFactory.cpp [9fe36b:d7940e]

File:

• src/UIElements/UIFactory.cpp (modified) (3 diffs)

src/UIElements/UIFactory.cpp

@@ -8 +8 @@
 
 #include <cassert>
+#include "Patterns/Singleton_impl.hpp"
 #include "UIElements/UIFactory.hpp"
 
 // all factories that can be used:
 #include "UIElements/TextUIFactory.hpp"
-#ifdef USE_GUI_QT
-#include "UIElements/QT4/QTUIFactory.hpp"
-#endif
-
-UIFactory *UIFactory::theFactory = 0;
 
 UIFactory::UIFactory()
@@ -30 +26 @@
 
 void UIFactory::makeUserInterface(InterfaceTypes type) {
-  assert(theFactory == 0 && "makeUserInterface should only be called once");
   switch(type) {
     case Text :
-      theFactory = new TextUIFactory();
+      setInstance(new TextUIFactory());
       break;
-#ifdef USE_GUI_QT
-    case QT4 :
-      theFactory = new QTUIFactory();
-      break;
-#endif
+
     default:
       assert(0 && "No such Factory in stock");
@@ -46 +37 @@
 }
 
-UIFactory* UIFactory::get(){
-  assert(theFactory != 0 && "No UserInterface created prior to factory access");
-  return theFactory;
-}
-
-
-void UIFactory::purgeInstance(){
-  if(theFactory) {
-    delete theFactory;
-    theFactory = 0;
-  }
-}
+CONSTRUCT_SINGLETON(UIFactory)