modernize: Pass arguments by value and move in constructors

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

diff --git a/src/qtui/qtui.h b/src/qtui/qtui.h
index f85d225..a6551a8 100644 (file)
--- 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"
@@ -49,7 +46,8 @@ class QtUi : public GraphicalUi
     Q_OBJECT
 
 public:
-    ~QtUi();
+    QtUi();
+    ~QtUi() override;
 
     MessageModel *createMessageModel(QObject *parent) override;
     AbstractMessageProcessor *createMessageProcessor(QObject *parent) override;
@@ -122,26 +120,23 @@ private slots:
     void useSystemTrayChanged(const QVariant &);
 
 private:
-    QtUi();
-
     /**
      * Sets up icon theme handling.
      */
     void setupIconTheme();
 
 private:
-    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;
 };
 
 QtUiStyle *QtUi::style() { return qobject_cast<QtUiStyle *>(uiStyle()); }
-MainWin *QtUi::mainWindow() { return _mainWin; }
+MainWin *QtUi::mainWindow() { return instance()->_mainWin.get(); }