X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fqtui%2Fqtuiapplication.h;h=7819b35b5f718039e09f724cad9bbf48ee80acd1;hp=e5e5d0787a58f21768d39ac01628343ed78ac8c2;hb=HEAD;hpb=d2ac8f78a0e050d2efa397c434b249d6b3391576

diff --git a/src/qtui/qtuiapplication.h b/src/qtui/qtuiapplication.h
index e5e5d078..75f10e3f 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-2022 by the Quassel Project                        *
  *   devel@quassel-irc.org                                                 *
  *                                                                         *
  *   This program is free software; you can redistribute it and/or modify  *
@@ -18,55 +18,43 @@
  *   51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.         *
  ***************************************************************************/
 
-#ifndef QTUIAPPLICATION_H_
-#define QTUIAPPLICATION_H_
+#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, public Quassel
+class QTUI_EXPORT QtUiApplication : public QApplication
 {
-#else
-class QtUiApplication : public QApplication, public Quassel
-{
-#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 void quit();
+    virtual Quassel::QuitHandler quitHandler();
 
 private:
     /**
-     * Migrate settings if neccessary and possible
+     * Migrate settings if necessary and possible
      *
      * If unsuccessful (major version changed, minor version upgrade failed), returning false, the
      * settings are in an unknown state and the client should quit.
@@ -87,8 +75,9 @@ private:
      */
     bool applySettingsMigration(QtUiSettings settings, const uint newVersion);
 
-    bool _aboutToQuit;
-};
-
+protected:
+    std::unique_ptr<Client> _client;
 
-#endif
+private:
+    bool _aboutToQuit{false};
+};