/***************************************************************************
- * Copyright (C) 2005-2015 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 *
#ifndef QTUIAPPLICATION_H_
#define QTUIAPPLICATION_H_
-#ifdef HAVE_KDE
+#ifdef HAVE_KDE4
# include <KApplication>
#else
# include <QApplication>
#include "quassel.h"
#include "uisettings.h"
+#include "qtuisettings.h"
class QtUi;
-#ifdef HAVE_KDE
+#ifdef HAVE_KDE4
class QtUiApplication : public KApplication, public Quassel
{
#else
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;
};