X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fqtui%2Fqtuiapplication.h;h=e5e5d0787a58f21768d39ac01628343ed78ac8c2;hp=6f4a7e26353dfc5d3e9a679b9430902a714c70aa;hb=a113f73e5f8ce89c3df5c42d55528404fc7a2294;hpb=04315f46a16fc3627218377071e008b6b9744992

diff --git a/src/qtui/qtuiapplication.h b/src/qtui/qtuiapplication.h
index 6f4a7e26..e5e5d078 100644
--- a/src/qtui/qtuiapplication.h
+++ b/src/qtui/qtuiapplication.h
@@ -1,5 +1,5 @@
 /***************************************************************************
- *   Copyright (C) 2005-2013 by the Quassel Project                        *
+ *   Copyright (C) 2005-2016 by the Quassel Project                        *
  *   devel@quassel-irc.org                                                 *
  *                                                                         *
  *   This program is free software; you can redistribute it and/or modify  *
@@ -21,7 +21,7 @@
 #ifndef QTUIAPPLICATION_H_
 #define QTUIAPPLICATION_H_
 
-#ifdef HAVE_KDE
+#ifdef HAVE_KDE4
 #  include <KApplication>
 #else
 #  include <QApplication>
@@ -31,10 +31,11 @@
 
 #include "quassel.h"
 #include "uisettings.h"
+#include "qtuisettings.h"
 
 class QtUi;
 
-#ifdef HAVE_KDE
+#ifdef HAVE_KDE4
 class QtUiApplication : public KApplication, public Quassel
 {
 #else
@@ -50,15 +51,42 @@ public:
     virtual bool init();
 
     void resumeSessionIfPossible();
-    virtual void commitData(QSessionManager &manager);
-    virtual void saveState(QSessionManager &manager);
-
     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
+
 protected:
     virtual void quit();
 
 private:
+    /**
+     * 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);
+
     bool _aboutToQuit;
 };