X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fcommon%2Fsettings.h;h=647435389879a13c7bedc3a86ec8dd807faa06a4;hp=02cb4ca4409d5debbc2c5c5332a4b8b07129e179;hb=66c5feaf7c9f480f06dfb45df2cf54e44c8b487b;hpb=eaba93b703ba5bca4edf09f4c076a00b529115cd

diff --git a/src/common/settings.h b/src/common/settings.h
index 02cb4ca4..64743538 100644
--- a/src/common/settings.h
+++ b/src/common/settings.h
@@ -1,5 +1,5 @@
 /***************************************************************************
- *   Copyright (C) 2005-08 by the Quassel Project                          *
+ *   Copyright (C) 2005-09 by the Quassel Project                          *
  *   devel@quassel-irc.org                                                 *
  *                                                                         *
  *   This program is free software; you can redistribute it and/or modify  *
@@ -23,9 +23,12 @@
 
 #include <QCoreApplication>
 #include <QHash>
+#include <QSettings>
 #include <QString>
 #include <QVariant>
 
+#include "quassel.h"
+
 class SettingsChangeNotifier : public QObject {
   Q_OBJECT
 
@@ -36,63 +39,72 @@ private:
   friend class Settings;
 };
 
-
-
 class Settings {
 public:
   enum Mode { Default, Custom };
 
 public:
-  void notify(const QString &key, QObject *receiver, const char *slot);
+  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_) {}
   inline virtual ~Settings() {}
-  
+
   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 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();
+  inline QSettings::Format format() {
+#ifdef Q_WS_WIN
+    return QSettings::IniFormat;
 #else
-    return QCoreApplication::organizationName();
+    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;
+  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);
   }
 };