X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fqtui%2Fqtuiapplication.h;h=8c6320d8c4088ac8d568d2c30a28901991f1da82;hp=557379f1390dec58be2195639dcbf0a158e5a64b;hb=3cc8b9030841cc3084ec6707a01f3b44ee58b8b9;hpb=5b686746c880e5cda6d5de3e08180ea4332ff222

diff --git a/src/qtui/qtuiapplication.h b/src/qtui/qtuiapplication.h
index 557379f1..8c6320d8 100644
--- a/src/qtui/qtuiapplication.h
+++ b/src/qtui/qtuiapplication.h
@@ -1,5 +1,5 @@
 /***************************************************************************
- *   Copyright (C) 2005-2012 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  *
@@ -18,10 +18,9 @@
  *   51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.         *
  ***************************************************************************/
 
-#ifndef QTUIAPPLICATION_H_
-#define QTUIAPPLICATION_H_
+#pragma once
 
-#ifdef HAVE_KDE
+#ifdef HAVE_KDE4
 #  include <KApplication>
 #else
 #  include <QApplication>
@@ -31,14 +30,15 @@
 
 #include "quassel.h"
 #include "uisettings.h"
+#include "qtuisettings.h"
 
 class QtUi;
 
-#ifdef HAVE_KDE
-class QtUiApplication : public KApplication, public Quassel
+#ifdef HAVE_KDE4
+class QtUiApplication : public KApplication
 {
 #else
-class QtUiApplication : public QApplication, public Quassel
+class QtUiApplication : public QApplication
 {
 #endif
 
@@ -50,17 +50,44 @@ public:
     virtual bool init();
 
     void resumeSessionIfPossible();
-    virtual void commitData(QSessionManager &manager);
-    virtual void saveState(QSessionManager &manager);
-
     inline bool isAboutToQuit() const { return _aboutToQuit; }
 
-protected:
-    virtual void quit();
+#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
 
 private:
-    bool _aboutToQuit;
-};
+    /**
+     * Migrate settings if neccessary 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.
+     *
+     * @return True if settings successfully migrated, otherwise false
+     */
+    bool migrateSettings();
 
+    /**
+     * Migrate from one minor settings version to the next
+     *
+     * Settings can only be migrated one version at a time.  Start from the current version, calling
+     * this function for each intermediate version up until the latest version.
+     *
+     * @param[in] settings    Current settings instance
+     * @param[in] newVersion  Next target version for migration, at most 1 from the current version
+     * @return True if minor revision of settings successfully migrated, otherwise false
+     */
+    bool applySettingsMigration(QtUiSettings settings, const uint newVersion);
 
-#endif
+private slots:
+    void initUi();
+
+private:
+    bool _aboutToQuit{false};
+
+    Quassel _quasselInstance;
+};