Internal stuff only.

You can now register a slot for settings changes using:
  Settings::notify(const QString &key, QObject *receiver, const char *slot)

diff --git a/src/common/CMakeLists.txt b/src/common/CMakeLists.txt
index 1c890fc..7807157 100644 (file)
--- a/src/common/CMakeLists.txt
+++ b/src/common/CMakeLists.txt
@@ -36,6 +36,7 @@ set(MOC_HDRS
     irclisthelper.h
     ircuser.h
     network.h
+    settings.h
     signalproxy.h
     syncableobject.h)
 
@@ -44,7 +45,6 @@ set(HEADERS ${MOC_HDRS}
     global.h
     logger.h
     message.h
-    settings.h
     types.h
     util.h
     cliparser.h)

diff --git a/src/common/settings.cpp b/src/common/settings.cpp
index e8ad9d0..83fb8fb 100644 (file)
--- a/src/common/settings.cpp
+++ b/src/common/settings.cpp
@@ -29,6 +29,7 @@
 #include "settings.h"
 
 QHash<QString, QHash<QString, QVariant> > Settings::settingsCache;
+QHash<QString, QHash<QString, SettingsChangeNotifier *> > Settings::settingsChangeNotifier;
 
 // Settings::Settings(QString group_, QString appName_)
 //   : group(group_),
@@ -55,6 +56,11 @@ QHash<QString, QHash<QString, QVariant> > Settings::settingsCache;
 // */
 // }
 
+void Settings::notify(const QString &key, QObject *receiver, const char *slot) {
+  QObject::connect(notifier(group, key), SIGNAL(valueChanged(const QVariant &)),
+                  receiver, slot);
+}
+
 QStringList Settings::allLocalKeys() {
   QSettings s(org(), appName);
   s.beginGroup(group);
@@ -97,6 +103,9 @@ void Settings::setLocalValue(const QString &key, const QVariant &data) {
   s.setValue(key, data);
   s.endGroup();
   setCacheValue(group, key, data);
+  if(hasNotifier(group, key)) {
+    emit notifier(group, key)->valueChanged(data);
+  }
 }
 
 const QVariant &Settings::localValue(const QString &key, const QVariant &def) {
@@ -117,16 +126,3 @@ void Settings::removeLocalKey(const QString &key) {
   if(isCached(group, key))
     settingsCache[group].remove(key);
 }
-
-
-// void Settings::setCacheValue(const QString &group, const QString &key, const QVariant &data) {
-//   settingsCache[group][key] = data;
-// }
-
-// const QVariant &Settings::cacheValue(const QString &group, const QString &key) {
-//   return settingsCache[group][key];
-// }
-
-// bool Settings::isCached(const QString &group, const QString &key) {
-//   return settingsCache.contains(group) && settingsCache[group].contains(key);
-// }

diff --git a/src/common/settings.h b/src/common/settings.h
index 1a51591..02cb4ca 100644 (file)
--- a/src/common/settings.h
+++ b/src/common/settings.h
@@ -26,10 +26,25 @@
 #include <QString>
 #include <QVariant>
 
+class SettingsChangeNotifier : public QObject {
+  Q_OBJECT
+
+signals:
+  void valueChanged(const QVariant &newValue);
+
+private:
+  friend class Settings;
+};
+
+
+
 class Settings {
 public:
   enum Mode { Default, Custom };
-  
+
+public:
+  void notify(const QString &key, QObject *receiver, const char *slot);
+
 protected:
   inline Settings(QString group_, QString appName_) : group(group_), appName(appName_) {}
   inline virtual ~Settings() {}
@@ -44,7 +59,7 @@ protected:
   virtual const QVariant &localValue(const QString &key, const QVariant &def = QVariant());
   
   virtual void removeLocalKey(const QString &key);
-  
+
   QString group;
   QString appName;
 
@@ -58,6 +73,8 @@ private:
   }
 
   static QHash<QString, QHash<QString, QVariant> > settingsCache;
+  static QHash<QString, QHash<QString, SettingsChangeNotifier *> > settingsChangeNotifier;
+
   inline void setCacheValue(const QString &group, const QString &key, const QVariant &data) {
     settingsCache[group][key] = data;
   }
@@ -67,8 +84,16 @@ private:
   inline bool isCached(const QString &group, const QString &key) {
     return settingsCache.contains(group) && settingsCache[group].contains(key);
   }
-};
 
+  inline SettingsChangeNotifier *notifier(const QString &group, const QString &key) {
+    if(!hasNotifier(group, key))
+      settingsChangeNotifier[group][key] = new SettingsChangeNotifier();
+    return settingsChangeNotifier[group][key];
+  }
 
+  inline bool hasNotifier(const QString &group, const QString &key) {
+    return settingsChangeNotifier.contains(group) && settingsChangeNotifier[group].contains(key);
+  }
+};
 
 #endif