X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fcommon%2Fsettings.h;h=8ccee16801aee4ba22c0e3d5b4a0d0c64d52e07d;hp=fcf9cd5b74af40e7b9b20d5f558737d600013882;hb=de1619ce11bf386490cdb38bc1be134a391eeaae;hpb=d6b056e936ec441258d291b7a8af7b83f9f53016

diff --git a/src/common/settings.h b/src/common/settings.h
index fcf9cd5b..8ccee168 100644
--- a/src/common/settings.h
+++ b/src/common/settings.h
@@ -1,5 +1,5 @@
 /***************************************************************************
- *   Copyright (C) 2005-07 by the Quassel IRC Team                         *
+ *   Copyright (C) 2005-08 by the Quassel Project                          *
  *   devel@quassel-irc.org                                                 *
  *                                                                         *
  *   This program is free software; you can redistribute it and/or modify  *
@@ -18,43 +18,80 @@
  *   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.             *
  ***************************************************************************/
 
-#ifndef _SETTINGS_H_
-#define _SETTINGS_H_
+#ifndef SETTINGS_H
+#define SETTINGS_H
 
+#include <QCoreApplication>
+#include <QHash>
 #include <QString>
 #include <QVariant>
-#include <QSettings>
 
-class Settings : private QSettings {
+class SettingsChangeNotifier : public QObject {
+  Q_OBJECT
 
-  public:
-    virtual ~Settings();
+signals:
+  void valueChanged(const QVariant &newValue);
 
-    static void setGuiValue(QString, QVariant) {};
-    static QVariant guiValue(QString, QVariant = QVariant()) { return QVariant(); }
-  protected:
-    Settings(QString group = "General");
+private:
+  friend class Settings;
+};
 
-    void setGroup(QString group);
+class Settings {
+public:
+  enum Mode { Default, Custom };
 
-    virtual QStringList allLocalKeys();
-    virtual QStringList localChildKeys();
-    virtual QStringList localChildGroups();
-    //virtual QStringList allSessionKeys() = 0;
-    virtual QStringList sessionKeys() = 0;
+public:
+  virtual void notify(const QString &key, QObject *receiver, const char *slot);
 
-    virtual void setLocalValue(const QString &key, const QVariant &data);
-    virtual QVariant localValue(const QString &key, const QVariant &def = QVariant());
+protected:
+  inline Settings(QString group_, QString appName_) : group(group_), appName(appName_) {}
+  inline virtual ~Settings() {}
 
-    virtual void setSessionValue(const QString &key, const QVariant &data) = 0;
-    virtual QVariant sessionValue(const QString &key, const QVariant &def = QVariant()) = 0;
+  inline void setGroup(const QString &group_) { group = group_; }
 
-    virtual void removeLocalKey(const QString &key);
+  virtual QStringList allLocalKeys();
+  virtual QStringList localChildKeys(const QString &rootkey = QString());
+  virtual QStringList localChildGroups(const QString &rootkey = QString());
 
-    QString group;
+  virtual void setLocalValue(const QString &key, const QVariant &data);
+  virtual const QVariant &localValue(const QString &key, const QVariant &def = QVariant());
 
-};
+  virtual void removeLocalKey(const QString &key);
+
+  QString group;
+  QString appName;
+
+private:
+  inline QString org() {
+#ifdef Q_WS_MAC
+    return QCoreApplication::organizationDomain();
+#else
+    return QCoreApplication::organizationName();
+#endif
+  }
+
+  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;
+  }
+  inline const QVariant &cacheValue(const QString &group, const QString &key) {
+    return settingsCache[group][key];
+  }
+  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