X-Git-Url: https://git.quassel-irc.org/?a=blobdiff_plain;f=src%2Fcommon%2Fsettings.h;h=647435389879a13c7bedc3a86ec8dd807faa06a4;hb=cb7da7f32d352d7fc7b680be442a9dc7451b4ffa;hp=627cb8ab137aa28fdaaa3ccb6a6b3dace4c15830;hpb=17a2e7912f49f70273f90ea3f744960a7d08a6b4;p=quassel.git

diff --git a/src/common/settings.h b/src/common/settings.h
index 627cb8ab..64743538 100644
--- a/src/common/settings.h
+++ b/src/common/settings.h
@@ -45,6 +45,7 @@ public:
 
 public:
   virtual void notify(const QString &key, QObject *receiver, const char *slot);
+  virtual uint version();
 
 protected:
   inline Settings(QString group_, QString appName_) : group(group_), appName(appName_) {}
@@ -77,27 +78,33 @@ private:
            + ((format() == QSettings::NativeFormat) ? QLatin1String(".conf") : QLatin1String(".ini"));
   }
 
-  static QHash<QString, QHash<QString, QVariant> > settingsCache;
-  static QHash<QString, QHash<QString, SettingsChangeNotifier *> > settingsChangeNotifier;
+  static QHash<QString, QVariant> settingsCache;
+  static QHash<QString, SettingsChangeNotifier *> settingsChangeNotifier;
 
-  inline void setCacheValue(const QString &group, const QString &key, const QVariant &data) {
-    settingsCache[group][key] = data;
+  inline QString normalizedKey(const QString &group, const QString &key) {
+    if(group.isEmpty())
+      return key;
+    return group + '/' + key;
   }
-  inline const QVariant &cacheValue(const QString &group, const QString &key) {
-    return settingsCache[group][key];
+
+  inline void setCacheValue(const QString &normKey, const QVariant &data) {
+    settingsCache[normKey] = data;
+  }
+  inline const QVariant &cacheValue(const QString &normKey) {
+    return settingsCache[normKey];
   }
-  inline bool isCached(const QString &group, const QString &key) {
-    return settingsCache.contains(group) && settingsCache[group].contains(key);
+  inline bool isCached(const QString &normKey) {
+    return settingsCache.contains(normKey);
   }
 
-  inline SettingsChangeNotifier *notifier(const QString &group, const QString &key) {
-    if(!hasNotifier(group, key))
-      settingsChangeNotifier[group][key] = new SettingsChangeNotifier();
-    return settingsChangeNotifier[group][key];
+  inline SettingsChangeNotifier *notifier(const QString &normKey) {
+    if(!hasNotifier(normKey))
+      settingsChangeNotifier[normKey] = new SettingsChangeNotifier();
+    return settingsChangeNotifier[normKey];
   }
 
-  inline bool hasNotifier(const QString &group, const QString &key) {
-    return settingsChangeNotifier.contains(group) && settingsChangeNotifier[group].contains(key);
+  inline bool hasNotifier(const QString &normKey) {
+    return settingsChangeNotifier.contains(normKey);
   }
 };