X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fqtui%2Fqtui.h;fp=src%2Fqtui%2Fqtui.h;h=af9ddff3c89fda8c863c9f24c6ef7e30faa25ed4;hp=f85d225249173c2fc9d736326461e40c6c4efc28;hb=72473527f99cbe68dcfcb4ca17f828bd3775bba7;hpb=ee3e3d298a1208d06e3a35a8aea6bcc42ce3aa5c diff --git a/src/qtui/qtui.h b/src/qtui/qtui.h index f85d2252..af9ddff3 100644 --- a/src/qtui/qtui.h +++ b/src/qtui/qtui.h @@ -49,7 +49,8 @@ class QtUi : public GraphicalUi Q_OBJECT public: - ~QtUi(); + QtUi(); + ~QtUi() override; MessageModel *createMessageModel(QObject *parent) override; AbstractMessageProcessor *createMessageProcessor(QObject *parent) override; @@ -122,18 +123,17 @@ private slots: void useSystemTrayChanged(const QVariant &); private: - QtUi(); - /** * Sets up icon theme handling. */ void setupIconTheme(); private: - static MainWin *_mainWin; static QList _notificationBackends; static QList _notifications; + std::unique_ptr _mainWin; + QString _systemIconTheme; #if QT_VERSION >= 0x050000 @@ -144,4 +144,4 @@ private: }; QtUiStyle *QtUi::style() { return qobject_cast(uiStyle()); } -MainWin *QtUi::mainWindow() { return _mainWin; } +MainWin *QtUi::mainWindow() { return instance()->_mainWin.get(); }