X-Git-Url: https://git.quassel-irc.org/?a=blobdiff_plain;ds=sidebyside;f=src%2Fqtui%2Fqtuiapplication.h;h=a5e68e1bc01d7ad1255fd20a563c6c6f82b75085;hb=d438145b28f34b7fdbc7e290aa001e5f3f922207;hp=0bcb3e3c409ace433f8bf5dc06b83011237f524d;hpb=b5dfd31e3d1ad7ca4bfe8262b62be259f6dc786a;p=quassel.git

diff --git a/src/qtui/qtuiapplication.h b/src/qtui/qtuiapplication.h
index 0bcb3e3c..a5e68e1b 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,6 +20,8 @@
 
 #pragma once
 
+#include <memory>
+
 #ifdef HAVE_KDE4
 #  include <KApplication>
 #else
@@ -28,6 +30,7 @@
 
 #include <QSessionManager>
 
+#include "client.h"
 #include "quassel.h"
 #include "uisettings.h"
 #include "qtuisettings.h"
@@ -46,8 +49,8 @@ class QtUiApplication : public QApplication
 
 public:
     QtUiApplication(int &, char **);
-    ~QtUiApplication();
-    virtual bool init();
+
+    virtual void init();
 
     void resumeSessionIfPossible();
     inline bool isAboutToQuit() const { return _aboutToQuit; }
@@ -60,6 +63,9 @@ public:
     void saveState(QSessionManager &manager);
 #endif
 
+protected:
+    virtual Quassel::QuitHandler quitHandler();
+
 private:
     /**
      * Migrate settings if neccessary and possible
@@ -86,8 +92,9 @@ private:
 private slots:
     void initUi();
 
+protected:
+    std::unique_ptr<Client> _client;
+
 private:
     bool _aboutToQuit{false};
-
-    Quassel _quasselInstance;
 };