/***************************************************************************
- * Copyright (C) 2005-09 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 *
* 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. *
***************************************************************************/
#include <QStringList>
#include "settings.h"
-const int VERSION = 1;
+const int VERSION = 1; /// Settings version for backwords/forwards incompatible changes
+
+// This is used if no VersionMinor key exists, e.g. upgrading from a Quassel version before this
+// change. This shouldn't be increased from 1; instead, change the logic in Core::Core() and
+// QtUiApplication::init() to handle upgrading and downgrading.
+const int VERSION_MINOR_INITIAL = 1; /// Initial settings version for compatible changes
QHash<QString, QVariant> Settings::settingsCache;
QHash<QString, SettingsChangeNotifier *> Settings::settingsChangeNotifier;
-#ifdef Q_WS_MAC
+#ifdef Q_OS_MAC
# define create_qsettings QSettings s(QCoreApplication::organizationDomain(), appName)
#else
# define create_qsettings QSettings s(fileName(), format())
}
+uint Settings::versionMinor()
+{
+ // Don't cache this value; ignore the group
+ create_qsettings;
+ // '0' means new configuration, anything else indicates an existing configuration. Application
+ // initialization should check this value and manage upgrades/downgrades, e.g. in Core::Core()
+ // and QtUiApplication::init().
+ uint verMinor = s.value("Config/VersionMinor", 0).toUInt();
+
+ // As previous Quassel versions didn't implement this, we need to check if any settings other
+ // than Config/Version exist. If so, assume it's version 1.
+ if (verMinor == 0 && s.allKeys().count() > 1) {
+ // More than 1 key exists, but version's never been set. Assume and set version 1.
+ setVersionMinor(VERSION_MINOR_INITIAL);
+ return VERSION_MINOR_INITIAL;
+ } else {
+ return verMinor;
+ }
+}
+
+
+void Settings::setVersionMinor(const uint versionMinor)
+{
+ // Don't cache this value; ignore the group
+ create_qsettings;
+ // Set the value directly.
+ s.setValue("Config/VersionMinor", versionMinor);
+}
+
+
QStringList Settings::allLocalKeys()
{
create_qsettings;
return cacheValue(normKey);
}
+bool Settings::localKeyExists(const QString &key)
+{
+ QString normKey = normalizedKey(group, key);
+ if (isCached(normKey))
+ return true;
+
+ create_qsettings;
+ return s.contains(normKey);
+}
+
void Settings::removeLocalKey(const QString &key)
{