X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fcommon%2Fsettings.h;h=1a515914d951bb682e3107a2a68b2ced56cce14f;hp=1816a61bb67e4b76c6d15f6e53283c4b7e9f31f1;hb=8cd290a5423e4fbe026b3a4cbfb2b9db03d5c47b;hpb=a1d785ae12b3ec04b43e243f3397bb6f8ecf60d5

diff --git a/src/common/settings.h b/src/common/settings.h
index 1816a61b..1a515914 100644
--- a/src/common/settings.h
+++ b/src/common/settings.h
@@ -18,19 +18,21 @@
  *   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 Settings {
 public:
   enum Mode { Default, Custom };
   
 protected:
-  Settings(QString group, QString applicationName);
+  inline Settings(QString group_, QString appName_) : group(group_), appName(appName_) {}
+  inline virtual ~Settings() {}
   
   inline void setGroup(const QString &group_) { group = group_; }
   
@@ -44,11 +46,27 @@ protected:
   virtual void removeLocalKey(const QString &key);
   
   QString group;
+  QString appName;
 
 private:
-  void setCacheValue(const QString &group, const QString &key, const QVariant &data);
-  const QVariant &cacheValue(const QString &group, const QString &key);
-  bool isCached(const QString &group, const QString &key);
+  inline QString org() {
+#ifdef Q_WS_MAC
+    return QCoreApplication::organizationDomain();
+#else
+    return QCoreApplication::organizationName();
+#endif
+  }
+
+  static QHash<QString, QHash<QString, QVariant> > settingsCache;
+  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);
+  }
 };