qtui: Fix quit sequence and lifetime issues

[quassel.git] / src / qtui / qtui.h

diff --git a/src/qtui/qtui.h b/src/qtui/qtui.h
index f85d225..af9ddff 100644 (file)
--- a/src/qtui/qtui.h
+++ b/src/qtui/qtui.h
@@ -49,7 +49,8 @@ class QtUi : public GraphicalUi
     Q_OBJECT
 
 public:
     Q_OBJECT
 
 public:

-    ~QtUi();
+    QtUi();
+    ~QtUi() override;

 
     MessageModel *createMessageModel(QObject *parent) override;
     AbstractMessageProcessor *createMessageProcessor(QObject *parent) override;
 
     MessageModel *createMessageModel(QObject *parent) override;
     AbstractMessageProcessor *createMessageProcessor(QObject *parent) override;


@@ -122,18 +123,17 @@ private slots:
     void useSystemTrayChanged(const QVariant &);
 
 private:
     void useSystemTrayChanged(const QVariant &);
 
 private:

-    QtUi();
-

     /**
      * Sets up icon theme handling.
      */
     void setupIconTheme();
 
 private:
     /**
      * Sets up icon theme handling.
      */
     void setupIconTheme();
 
 private:

-    static MainWin *_mainWin;

     static QList<AbstractNotificationBackend *> _notificationBackends;
     static QList<AbstractNotificationBackend::Notification> _notifications;
 
     static QList<AbstractNotificationBackend *> _notificationBackends;
     static QList<AbstractNotificationBackend::Notification> _notifications;
 

+    std::unique_ptr<MainWin> _mainWin;
+

     QString _systemIconTheme;
 
 #if QT_VERSION >= 0x050000
     QString _systemIconTheme;
 
 #if QT_VERSION >= 0x050000


@@ -144,4 +144,4 @@ private:
 };
 
 QtUiStyle *QtUi::style() { return qobject_cast<QtUiStyle *>(uiStyle()); }
 };
 
 QtUiStyle *QtUi::style() { return qobject_cast<QtUiStyle *>(uiStyle()); }

-MainWin *QtUi::mainWindow() { return _mainWin; }
+MainWin *QtUi::mainWindow() { return instance()->_mainWin.get(); }