X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fqtui%2Fqtuiapplication.h;h=473fb5e77537e891d65d2e22b57cc27b86c53344;hp=0bcb3e3c409ace433f8bf5dc06b83011237f524d;hb=9188f1a4880dc7f4c26612a265c1d874f6df5a8c;hpb=b5dfd31e3d1ad7ca4bfe8262b62be259f6dc786a

diff --git a/src/qtui/qtuiapplication.h b/src/qtui/qtuiapplication.h
index 0bcb3e3c..473fb5e7 100644
--- a/src/qtui/qtuiapplication.h
+++ b/src/qtui/qtuiapplication.h
@@ -1,5 +1,5 @@
 /***************************************************************************
- *   Copyright (C) 2005-2016 by the Quassel Project                        *
+ *   Copyright (C) 2005-2018 by the Quassel Project                        *
  *   devel@quassel-irc.org                                                 *
  *                                                                         *
  *   This program is free software; you can redistribute it and/or modify  *
@@ -20,45 +20,37 @@
 
 #pragma once
 
-#ifdef HAVE_KDE4
-#  include <KApplication>
-#else
-#  include <QApplication>
-#endif
+#include "qtui-export.h"
 
+#include <memory>
+
+#include <QApplication>
 #include <QSessionManager>
 
+#include "client.h"
+#include "qtuisettings.h"
 #include "quassel.h"
 #include "uisettings.h"
-#include "qtuisettings.h"
 
 class QtUi;
 
-#ifdef HAVE_KDE4
-class QtUiApplication : public KApplication
-{
-#else
-class QtUiApplication : public QApplication
+class QTUI_EXPORT QtUiApplication : public QApplication
 {
-#endif
-
     Q_OBJECT
 
 public:
-    QtUiApplication(int &, char **);
-    ~QtUiApplication();
-    virtual bool init();
+    QtUiApplication(int&, char**);
+
+    virtual void init();
 
     void resumeSessionIfPossible();
     inline bool isAboutToQuit() const { return _aboutToQuit; }
 
-#if (QT_VERSION < QT_VERSION_CHECK(5, 0, 0))
-    void commitData(QSessionManager &manager) override;
-    void saveState(QSessionManager &manager) override;
-#else
-    void commitData(QSessionManager &manager);
-    void saveState(QSessionManager &manager);
-#endif
+    void commitData(QSessionManager& manager);
+    void saveState(QSessionManager& manager);
+
+protected:
+    virtual Quassel::QuitHandler quitHandler();
 
 private:
     /**
@@ -83,11 +75,9 @@ private:
      */
     bool applySettingsMigration(QtUiSettings settings, const uint newVersion);
 
-private slots:
-    void initUi();
+protected:
+    std::unique_ptr<Client> _client;
 
 private:
     bool _aboutToQuit{false};
-
-    Quassel _quasselInstance;
 };