X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fcommon%2Fsettings.h;h=9ad960dd8b206d43b251bfecc7eca92b50625be3;hp=efa03d7a2ab7d68850f0dd18c311bea713b2bb0f;hb=0c9cd0eef379e1d3e10a75cc8506a7e65f95fd67;hpb=44b22c4419f478a20f6324f9f3a700a2dec56302

diff --git a/src/common/settings.h b/src/common/settings.h
index efa03d7a..9ad960dd 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        *
@@ -23,35 +23,34 @@
 
 #include <QString>
 #include <QVariant>
+#include <QSettings>
 
-class Settings : public QObject {
-  Q_OBJECT
+class Settings : private QSettings {
 
   public:
     virtual ~Settings();
 
-    static void setGuiValue(QString, QVariant) {};
-    static QVariant guiValue(QString, QVariant = QVariant()) { return QVariant(); }
+    //static void setGuiValue(QString, QVariant) {};
+    //static QVariant guiValue(QString, QVariant = QVariant()) { return QVariant(); }
+
+    enum Mode { Default, Custom };
+
   protected:
-    Settings(QString group = "General");
+    Settings(QString group, QString applicationName);
 
     void setGroup(QString group);
 
     virtual QStringList allLocalKeys();
-    virtual QStringList localChildKeys();
-    virtual QStringList localChildGroups();
-    //virtual QStringList allSessionKeys() = 0;
-    virtual QStringList sessionKeys() = 0;
+    virtual QStringList localChildKeys(const QString &rootkey = QString());
+    virtual QStringList localChildGroups(const QString &rootkey = QString());
 
     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;
+
 };