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

diff --git a/src/common/settings.h b/src/common/settings.h
index 627cb8ab..e2920c24 100644
--- a/src/common/settings.h
+++ b/src/common/settings.h
@@ -44,8 +44,14 @@ public:
   enum Mode { Default, Custom };
 
 public:
+  //! Call the given slot on change of the given key
   virtual void notify(const QString &key, QObject *receiver, const char *slot);
 
+  //! Sets up notification and calls the given slot to set the initial value
+  void initAndNotify(const QString &key, QObject *receiver, const char *slot, const QVariant &defaultValue = QVariant());
+
+  virtual uint version();
+
 protected:
   inline Settings(QString group_, QString appName_) : group(group_), appName(appName_) {}
   inline virtual ~Settings() {}
@@ -77,27 +83,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 QString normalizedKey(const QString &group, const QString &key) {
+    if(group.isEmpty())
+      return key;
+    return group + '/' + key;
+  }
 
-  inline void setCacheValue(const QString &group, const QString &key, const QVariant &data) {
-    settingsCache[group][key] = data;
+  inline void setCacheValue(const QString &normKey, const QVariant &data) {
+    settingsCache[normKey] = data;
   }
-  inline const QVariant &cacheValue(const QString &group, const QString &key) {
-    return settingsCache[group][key];
+  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);
   }
 };