X-Git-Url: https://git.quassel-irc.org/?a=blobdiff_plain;ds=sidebyside;f=src%2Fqtui%2Fqtui.h;h=af9ddff3c89fda8c863c9f24c6ef7e30faa25ed4;hb=d438145b28f34b7fdbc7e290aa001e5f3f922207;hp=0e3cad7c47017c23fa370a48df809824e76e2455;hpb=911f181e0e179eb51279c0880eb701a43163b8b5;p=quassel.git

diff --git a/src/qtui/qtui.h b/src/qtui/qtui.h
index 0e3cad7c..af9ddff3 100644
--- a/src/qtui/qtui.h
+++ b/src/qtui/qtui.h
@@ -24,7 +24,9 @@
 #include <tuple>
 #include <vector>
 
-#include <QStringList>
+#include <QList>
+#include <QObject>
+#include <QString>
 
 #if QT_VERSION >= 0x050000
 #  include <QTemporaryDir>
@@ -48,15 +50,17 @@ 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();
 
+    QString debugLog() const;
+
     static bool haveSystemTray();
 
     /* Notifications */
@@ -125,11 +129,11 @@ 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
@@ -139,7 +143,5 @@ private:
     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(); }