X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fqtui%2Fqtuiapplication.h;h=508bea5213d9011eca71d75b050ffcf05bd97df1;hp=8fd50d6dcfcbbf9491bfeccaf29a9bb600512f5f;hb=f88bfa81380ceb2c4afce5b15f753570a1ef063d;hpb=965183188ee726036685fcba379c2559bd183247

diff --git a/src/qtui/qtuiapplication.h b/src/qtui/qtuiapplication.h
index 8fd50d6d..508bea52 100644
--- a/src/qtui/qtuiapplication.h
+++ b/src/qtui/qtuiapplication.h
@@ -1,5 +1,5 @@
 /***************************************************************************
- *   Copyright (C) 2005-08 by the Quassel IRC Team                         *
+ *   Copyright (C) 2005-2018 by the Quassel Project                        *
  *   devel@quassel-irc.org                                                 *
  *                                                                         *
  *   This program is free software; you can redistribute it and/or modify  *
@@ -15,13 +15,12 @@
  *   You should have received a copy of the GNU General Public License     *
  *   along with this program; if not, write to the                         *
  *   Free Software Foundation, Inc.,                                       *
- *   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.             *
+ *   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>
@@ -30,31 +29,63 @@
 #include <QSessionManager>
 
 #include "quassel.h"
-#include "sessionsettings.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
 
-  Q_OBJECT
+    Q_OBJECT
 
- public:
-  QtUiApplication(int &, char **);
-  ~QtUiApplication();
-  virtual bool init();
+public:
+    QtUiApplication(int &, char **);
+    ~QtUiApplication();
+    virtual void init();
 
-  void resumeSessionIfPossible();
-  virtual void saveState(QSessionManager & manager);
-
-signals:
-  void saveStateToSession(const QString &sessionId);
-  void saveStateToSessionSettings(SessionSettings &s); // FIXME refs in signals won't probably work
-  void resumeFromSession(const QString sessionId);
-  void resumeFromSessionSettings(SessionSettings &s);
-};
+    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
+
+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);
+
+private slots:
+    void initUi();
+
+private:
+    bool _aboutToQuit{false};
+};