Change Q_WS_* to Q_OS_*

[quassel.git] / src / common / settings.h

diff --git a/src/common/settings.h b/src/common/settings.h
index 26c8ead..4f556d7 100644 (file)
--- a/src/common/settings.h
+++ b/src/common/settings.h
@@ -1,5 +1,5 @@
 /***************************************************************************
- *   Copyright (C) 2005-09 by the Quassel Project                          *
+ *   Copyright (C) 2005-2014 by the Quassel Project                        *
  *   devel@quassel-irc.org                                                 *
  *                                                                         *
  *   This program is free software; you can redistribute it and/or modify  *
@@ -15,7 +15,7 @@
  *   You should have received a copy of the GNU General Public License     *
  *   along with this program; if not, write to the                         *
  *   Free Software Foundation, Inc.,                                       *
- *   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.             *
+ *   51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.         *
  ***************************************************************************/
 
 #ifndef SETTINGS_H
@@ -29,77 +29,110 @@
 
 #include "quassel.h"
 
-class SettingsChangeNotifier : public QObject {
-  Q_OBJECT
+class SettingsChangeNotifier : public QObject
+{
+    Q_OBJECT
 
 signals:
-  void valueChanged(const QVariant &newValue);
+    void valueChanged(const QVariant &newValue);
 
 private:
-  friend class Settings;
+    friend class Settings;
 };
 
-class Settings {
+
+class Settings
+{
 public:
-  enum Mode { Default, Custom };
+    enum Mode { Default, Custom };
 
 public:
-  virtual void notify(const QString &key, QObject *receiver, const char *slot);
-  virtual uint version();
+    //! 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() {}
+    inline Settings(QString group_, QString appName_) : group(group_), appName(appName_) {}
+    inline virtual ~Settings() {}
 
-  inline void setGroup(const QString &group_) { group = group_; }
+    inline void setGroup(const QString &group_) { group = group_; }
 
-  virtual QStringList allLocalKeys();
-  virtual QStringList localChildKeys(const QString &rootkey = QString());
-  virtual QStringList localChildGroups(const QString &rootkey = QString());
+    virtual QStringList allLocalKeys();
+    virtual QStringList localChildKeys(const QString &rootkey = QString());
+    virtual QStringList localChildGroups(const QString &rootkey = QString());
 
-  virtual void setLocalValue(const QString &key, const QVariant &data);
-  virtual const QVariant &localValue(const QString &key, const QVariant &def = QVariant());
+    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);
+    virtual void removeLocalKey(const QString &key);
 
-  QString group;
-  QString appName;
+    QString group;
+    QString appName;
 
 private:
-  inline QSettings::Format format() {
-#ifdef Q_WS_WIN
-    return QSettings::IniFormat;
+    inline QSettings::Format format()
+    {
+#ifdef Q_OS_WIN
+        return QSettings::IniFormat;
 #else
-    return QSettings::NativeFormat;
+        return QSettings::NativeFormat;
 #endif
-  }
-  inline QString fileName() {
-    return Quassel::configDirPath() + appName
-           + ((format() == QSettings::NativeFormat) ? QLatin1String(".conf") : QLatin1String(".ini"));
-  }
-
-  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);
-  }
+    }
+
+
+    inline QString fileName()
+    {
+        return Quassel::configDirPath() + appName
+               + ((format() == QSettings::NativeFormat) ? QLatin1String(".conf") : QLatin1String(".ini"));
+    }
+
+
+    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 &normKey, const QVariant &data)
+    {
+        settingsCache[normKey] = data;
+    }
+
+
+    inline const QVariant &cacheValue(const QString &normKey)
+    {
+        return settingsCache[normKey];
+    }
+
+
+    inline bool isCached(const QString &normKey)
+    {
+        return settingsCache.contains(normKey);
+    }
+
+
+    inline SettingsChangeNotifier *notifier(const QString &normKey)
+    {
+        if (!hasNotifier(normKey))
+            settingsChangeNotifier[normKey] = new SettingsChangeNotifier();
+        return settingsChangeNotifier[normKey];
+    }
+
+
+    inline bool hasNotifier(const QString &normKey)
+    {
+        return settingsChangeNotifier.contains(normKey);
+    }
 };
 
+
 #endif