Gui: simplify singleton of PropertyItemFactory

hlorus · Apr 23, 2024 · 68bfbd0 · 68bfbd0
1 parent 1c39969
commit 68bfbd0
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 15 deletions.
diff --git a/src/Gui/propertyeditor/PropertyItem.cpp b/src/Gui/propertyeditor/PropertyItem.cpp
@@ -82,20 +82,10 @@ float fromPercent(int value)
 
 }
 
-Gui::PropertyEditor::PropertyItemFactory* Gui::PropertyEditor::PropertyItemFactory::_singleton = nullptr;
-
 PropertyItemFactory& PropertyItemFactory::instance()
 {
-    if (!_singleton) {
-        _singleton = new PropertyItemFactory;
-    }
-    return *_singleton;
-}
-
-void PropertyItemFactory::destruct ()
-{
-    delete _singleton;
-    _singleton = nullptr;
+    static PropertyItemFactory inst;
+    return inst;
 }
 
 PropertyItem* PropertyItemFactory::createPropertyItem (const char* sName) const

diff --git a/src/Gui/propertyeditor/PropertyItem.h b/src/Gui/propertyeditor/PropertyItem.h
@@ -90,13 +90,10 @@ class GuiExport PropertyItemFactory : public Base::Factory
 {
 public:
     static PropertyItemFactory& instance();
-    static void destruct ();
 
     PropertyItem* createPropertyItem (const char* sName) const;
 
 private:
-    static PropertyItemFactory* _singleton;
-
     PropertyItemFactory() = default;
     ~PropertyItemFactory() override = default;
 };