X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fcommon%2Fsettings.cpp;h=24ddd5fc5915f34de118c4efb90ceb2a38f9504c;hp=722be0e952ae205110c426fae197d97cef829ac1;hb=5e9a649d94d1832e0b4f3f296e8a2df2d8741d9b;hpb=6053070613c26ad5744d2a3e84ac5ee305a5a8d6

diff --git a/src/common/settings.cpp b/src/common/settings.cpp
index 722be0e9..24ddd5fc 100644
--- a/src/common/settings.cpp
+++ b/src/common/settings.cpp
@@ -22,8 +22,10 @@
 
 #include "settings.h"
 
-QHash<QString, QHash<QString, QVariant> > Settings::settingsCache;
-QHash<QString, QHash<QString, SettingsChangeNotifier *> > Settings::settingsChangeNotifier;
+const int VERSION = 1;
+
+QHash<QString, QVariant> Settings::settingsCache;
+QHash<QString, SettingsChangeNotifier *> Settings::settingsChangeNotifier;
 
 #ifdef Q_WS_MAC
 #  define create_qsettings QSettings s(QCoreApplication::organizationDomain(), appName)
@@ -57,8 +59,25 @@ QHash<QString, QHash<QString, SettingsChangeNotifier *> > Settings::settingsChan
 // }
 
 void Settings::notify(const QString &key, QObject *receiver, const char *slot) {
-  QObject::connect(notifier(group, key), SIGNAL(valueChanged(const QVariant &)),
-		   receiver, slot);
+  QObject::connect(notifier(normalizedKey(group, key)), SIGNAL(valueChanged(const QVariant &)),
+                   receiver, slot);
+}
+
+void Settings::initAndNotify(const QString &key, QObject *receiver, const char *slot, const QVariant &defaultValue) {
+  notify(key, receiver, slot);
+  emit notifier(normalizedKey(group, key))->valueChanged(localValue(key, defaultValue));
+}
+
+uint Settings::version() {
+  // we don't cache this value, and we ignore the group
+  create_qsettings;
+  uint ver = s.value("Config/Version", 0).toUInt();
+  if(!ver) {
+    // No version, so create one
+    s.setValue("Config/Version", VERSION);
+    return VERSION;
+  }
+  return ver;
 }
 
 QStringList Settings::allLocalKeys() {
@@ -98,24 +117,22 @@ QStringList Settings::localChildGroups(const QString &rootkey) {
 }
 
 void Settings::setLocalValue(const QString &key, const QVariant &data) {
+  QString normKey = normalizedKey(group, key);
   create_qsettings;
-  s.beginGroup(group);
-  s.setValue(key, data);
-  s.endGroup();
-  setCacheValue(group, key, data);
-  if(hasNotifier(group, key)) {
-    emit notifier(group, key)->valueChanged(data);
+  s.setValue(normKey, data);
+  setCacheValue(normKey, data);
+  if(hasNotifier(normKey)) {
+    emit notifier(normKey)->valueChanged(data);
   }
 }
 
 const QVariant &Settings::localValue(const QString &key, const QVariant &def) {
-  if(!isCached(group, key)) {
+  QString normKey = normalizedKey(group, key);
+  if(!isCached(normKey)) {
     create_qsettings;
-    s.beginGroup(group);
-    setCacheValue(group, key, s.value(key, def));
-    s.endGroup();
+    setCacheValue(normKey, s.value(normKey, def));
   }
-  return cacheValue(group, key);
+  return cacheValue(normKey);
 }
 
 void Settings::removeLocalKey(const QString &key) {
@@ -123,6 +140,7 @@ void Settings::removeLocalKey(const QString &key) {
   s.beginGroup(group);
   s.remove(key);
   s.endGroup();
-  if(isCached(group, key))
-    settingsCache[group].remove(key);
+  QString normKey = normalizedKey(group, key);
+  if(isCached(normKey))
+    settingsCache.remove(normKey);
 }