common: Make the Quassel class a proper singleton, clean up

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

diff --git a/src/qtui/qtuiapplication.h b/src/qtui/qtuiapplication.h
index e5e5d07..0bcb3e3 100644 (file)
--- a/src/qtui/qtuiapplication.h
+++ b/src/qtui/qtuiapplication.h
@@ -18,8 +18,7 @@
  *   51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.         *
  ***************************************************************************/
 
-#ifndef QTUIAPPLICATION_H_
-#define QTUIAPPLICATION_H_
+#pragma once
 
 #ifdef HAVE_KDE4
 #  include <KApplication>
@@ -36,10 +35,10 @@
 class QtUi;
 
 #ifdef HAVE_KDE4
-class QtUiApplication : public KApplication, public Quassel
+class QtUiApplication : public KApplication
 {
 #else
-class QtUiApplication : public QApplication, public Quassel
+class QtUiApplication : public QApplication
 {
 #endif
 
@@ -61,9 +60,6 @@ public:
     void saveState(QSessionManager &manager);
 #endif
 
-protected:
-    virtual void quit();
-
 private:
     /**
      * Migrate settings if neccessary and possible
@@ -87,8 +83,11 @@ private:
      */
     bool applySettingsMigration(QtUiSettings settings, const uint newVersion);
 
-    bool _aboutToQuit;
-};
+private slots:
+    void initUi();
 
+private:
+    bool _aboutToQuit{false};
 
-#endif
+    Quassel _quasselInstance;
+};