Changes in src/UIElements/UIFactory.hpp [d7940e:dbb474]

File:

• src/UIElements/UIFactory.hpp (modified) (4 diffs)

src/UIElements/UIFactory.hpp

@@ -17 +17 @@
 
 struct menuPopulaters;
-
-#include "Patterns/Singleton.hpp"
-
 /**
  * Abstract Factory to create any kind of User interface object needed by the programm.
@@ -27 +24 @@
  * UIs can be handled in a concise abstract way.
  */
-class UIFactory : public Singleton<UIFactory,false>
+class UIFactory
 {
 
@@ -48 +45 @@
   UIFactory();
 
+// singleton stuff
+private:
+  static UIFactory *theFactory;
+
 public:
   /**
@@ -54 +55 @@
   static void makeUserInterface(InterfaceTypes type);
 
+  /**
+   * get the previously created factory
+   */
+  static UIFactory* get();
+
+  /**
+   * Destroy the created factory.
+   *
+   * Make sure that all UIElements that were created by the factory are destroyed before calling this method.
+   */
+  static void purgeInstance();
 };