X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fqtui%2Fqtui.h;h=a6551a865ad59dbbbc81806308566bd3587ebf6d;hp=907fb31b4702df2209cdb1fb3e50052a6cd58d8a;hb=3a3e844f9fcfd12235a0086af75ecd503b621ef4;hpb=37110ceaa070167b4f40ed449ac9ea130503a792

diff --git a/src/qtui/qtui.h b/src/qtui/qtui.h
index 907fb31b..a6551a86 100644
--- a/src/qtui/qtui.h
+++ b/src/qtui/qtui.h
@@ -27,10 +27,7 @@
 #include <QList>
 #include <QObject>
 #include <QString>
-
-#if QT_VERSION >= 0x050000
-#  include <QTemporaryDir>
-#endif
+#include <QTemporaryDir>
 
 #include "abstractnotificationbackend.h"
 #include "graphicalui.h"
@@ -50,12 +47,12 @@ class QtUi : public GraphicalUi
 
 public:
     QtUi();
-    ~QtUi();
+    ~QtUi() override;
 
     MessageModel *createMessageModel(QObject *parent) override;
     AbstractMessageProcessor *createMessageProcessor(QObject *parent) override;
 
-    inline static QtUi *instance();
+    static QtUi *instance();
     inline static QtUiStyle *style();
     inline static MainWin *mainWindow();
 
@@ -129,21 +126,17 @@ private:
     void setupIconTheme();
 
 private:
-    static QtUi *_instance;
-    static MainWin *_mainWin;
     static QList<AbstractNotificationBackend *> _notificationBackends;
     static QList<AbstractNotificationBackend::Notification> _notifications;
 
+    std::unique_ptr<MainWin> _mainWin;
+
     QString _systemIconTheme;
 
-#if QT_VERSION >= 0x050000
     std::unique_ptr<QTemporaryDir> _dummyThemeDir;
-#endif
 
     bool _useSystemTray;
 };
 
-
-QtUi *QtUi::instance() { return _instance ? _instance : new QtUi(); }
 QtUiStyle *QtUi::style() { return qobject_cast<QtUiStyle *>(uiStyle()); }
-MainWin *QtUi::mainWindow() { return _mainWin; }
+MainWin *QtUi::mainWindow() { return instance()->_mainWin.get(); }