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

diff --git a/src/qtui/qtui.h b/src/qtui/qtui.h
index 907fb31b..843da074 100644
--- a/src/qtui/qtui.h
+++ b/src/qtui/qtui.h
@@ -1,5 +1,5 @@
 /***************************************************************************
- *   Copyright (C) 2005-2018 by the Quassel Project                        *
+ *   Copyright (C) 2005-2019 by the Quassel Project                        *
  *   devel@quassel-irc.org                                                 *
  *                                                                         *
  *   This program is free software; you can redistribute it and/or modify  *
@@ -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,14 +47,14 @@ class QtUi : public GraphicalUi
 
 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;
 
-    inline static QtUi *instance();
-    inline static QtUiStyle *style();
-    inline static MainWin *mainWindow();
+    static QtUi* instance();
+    inline static QtUiStyle* style();
+    inline static MainWin* mainWindow();
 
     QString debugLog() const;
 
@@ -65,11 +62,11 @@ public:
 
     /* Notifications */
 
-    static void registerNotificationBackend(AbstractNotificationBackend *);
-    static void unregisterNotificationBackend(AbstractNotificationBackend *);
+    static void registerNotificationBackend(AbstractNotificationBackend*);
+    static void unregisterNotificationBackend(AbstractNotificationBackend*);
     static void unregisterAllNotificationBackends();
-    static const QList<AbstractNotificationBackend *> &notificationBackends();
-    static const QList<AbstractNotificationBackend::Notification> &activeNotifications();
+    static const QList<AbstractNotificationBackend*>& notificationBackends();
+    static const QList<AbstractNotificationBackend::Notification>& activeNotifications();
 
     /**
      * Determine available fallback icon themes.
@@ -94,7 +91,7 @@ public:
 public slots:
     void init() override;
 
-    uint invokeNotification(BufferId bufId, AbstractNotificationBackend::NotificationType type, const QString &sender, const QString &text);
+    uint invokeNotification(BufferId bufId, AbstractNotificationBackend::NotificationType type, const QString& sender, const QString& text);
     void closeNotification(uint notificationId);
     void closeNotifications(BufferId bufferId = BufferId());
 
@@ -120,7 +117,7 @@ protected:
     bool isHidingMainWidgetAllowed() const override;
 
 private slots:
-    void useSystemTrayChanged(const QVariant &);
+    void useSystemTrayChanged(const QVariant&);
 
 private:
     /**
@@ -129,21 +126,24 @@ private:
     void setupIconTheme();
 
 private:
-    static QtUi *_instance;
-    static MainWin *_mainWin;
-    static QList<AbstractNotificationBackend *> _notificationBackends;
+    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());
+}
 
-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();
+}