Finish up singleton refactoring into one giant class

2018-04-28 15:20:18 +02:00
parent 9426a9d633
commit 2f195891cd
34 changed files with 221 additions and 184 deletions
@@ -11,11 +11,13 @@ namespace singletons {

 class FontManager
 {
-    FontManager(const FontManager &) = delete;
-    FontManager(FontManager &&) = delete;
+public:
    FontManager();

-public:
+    FontManager(const FontManager &) = delete;
+    FontManager(FontManager &&) = delete;
+    ~FontManager() = delete;
+
    enum Type : uint8_t {
        Tiny,
        Small,
@@ -27,9 +29,6 @@ public:
        VeryLarge,
    };

-    // FontManager is initialized only once, on first use
-    static FontManager &getInstance();
-
    QFont &getFont(Type type, float scale);
    QFontMetrics &getFontMetrics(Type type, float scale);