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

diff --git a/src/common/settings.h b/src/common/settings.h
index 9fe6e64b..1816a61b 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        *
@@ -26,33 +26,29 @@
 #include <QSettings>
 
 class Settings : private QSettings {
-
-  public:
-    virtual ~Settings();
-
-    static void setGuiValue(QString, QVariant) {};
-    static QVariant guiValue(QString, QVariant = QVariant()) { return QVariant(); }
-  protected:
-    Settings(QString group = "General");
-
-    void setGroup(QString group);
-
-    virtual QStringList allLocalKeys();
-    virtual QStringList localChildKeys();
-    virtual QStringList localChildGroups();
-    //virtual QStringList allSessionKeys() = 0;
-    virtual QStringList sessionKeys() = 0;
-
-    virtual void setLocalValue(const QString &key, const QVariant &data);
-    virtual QVariant localValue(const QString &key, const QVariant &def = QVariant());
-
-    virtual void setSessionValue(const QString &key, const QVariant &data) = 0;
-    virtual QVariant sessionValue(const QString &key, const QVariant &def = QVariant()) = 0;
-
-    virtual void removeLocalKey(const QString &key);
-
-    QString group;
-
+public:
+  enum Mode { Default, Custom };
+  
+protected:
+  Settings(QString group, QString applicationName);
+  
+  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;
+
+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);
 };