X-Git-Url: https://git.quassel-irc.org/?a=blobdiff_plain;f=src%2Fcommon%2Fsettings.h;h=1a515914d951bb682e3107a2a68b2ced56cce14f;hb=7a1eca89ead6eb300c593ace9f14c0eb2f9836b8;hp=4ef26640207fa7a5dc6a3dd825d35607bc342355;hpb=0ac9ce4d7cf768d13993d6aa1d6b791c4149a843;p=quassel.git

diff --git a/src/common/settings.h b/src/common/settings.h
index 4ef26640..1a515914 100644
--- a/src/common/settings.h
+++ b/src/common/settings.h
@@ -1,11 +1,11 @@
 /***************************************************************************
- *   Copyright (C) 2005-07 by The Quassel 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  *
  *   it under the terms of the GNU General Public License as published by  *
  *   the Free Software Foundation; either version 2 of the License, or     *
- *   (at your option) any later version.                                   *
+ *   (at your option) version 3.                                           *
  *                                                                         *
  *   This program is distributed in the hope that it will be useful,       *
  *   but WITHOUT ANY WARRANTY; without even the implied warranty of        *
@@ -18,31 +18,57 @@
  *   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>
 
 class Settings {
+public:
+  enum Mode { Default, Custom };
+  
+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;
 
-  public:
-    //Settings();
-    //~Settings();
-    static void init();
-    static void setProfile(const QString &string);
-    static QString profile();
-
-    static void setGuiValue(const QString &key, const QVariant &value);
-    static QVariant guiValue (const QString &key, const QVariant &defaultValue = QVariant());
-    static void setCoreValue(const QString &user, const QString &key, const QVariant &value);
-    static QVariant coreValue (const QString &user, const QString& key, const QVariant &defaultValue = QVariant());
-
-  private:
-    static QString curProfile;
+private:
+  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);
+  }
 };
 
-//extern Settings *settings;
+
 
 #endif