Make Settings use --configdir (or the default location)

[quassel.git] / src / common / settings.cpp

diff --git a/src/common/settings.cpp b/src/common/settings.cpp
index e8ad9d0..6b0ce03 100644 (file)
--- a/src/common/settings.cpp
+++ b/src/common/settings.cpp
@@ -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  *
@@ -18,17 +18,12 @@
  *   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.             *
  ***************************************************************************/
 
-#include <QSettings>
 #include <QStringList>
-#include <QDebug>
-
-#ifdef Q_WS_QWS
-#include <Qtopia>
-#endif
 
 #include "settings.h"
 
 QHash<QString, QHash<QString, QVariant> > Settings::settingsCache;
+QHash<QString, QHash<QString, SettingsChangeNotifier *> > Settings::settingsChangeNotifier;
 
 // Settings::Settings(QString group_, QString appName_)
 //   : group(group_),
@@ -55,8 +50,13 @@ QHash<QString, QHash<QString, QVariant> > Settings::settingsCache;
 // */
 // }
 
+void Settings::notify(const QString &key, QObject *receiver, const char *slot) {
+  QObject::connect(notifier(group, key), SIGNAL(valueChanged(const QVariant &)),
+                  receiver, slot);
+}
+
 QStringList Settings::allLocalKeys() {
-  QSettings s(org(), appName);
+  QSettings s(fileName(), format());
   s.beginGroup(group);
   QStringList res = s.allKeys();
   s.endGroup();
@@ -70,7 +70,7 @@ QStringList Settings::localChildKeys(const QString &rootkey) {
   else
     g = QString("%1/%2").arg(group, rootkey);
 
-  QSettings s(org(), appName);
+  QSettings s(fileName(), format());
   s.beginGroup(g);
   QStringList res = s.childKeys();
   s.endGroup();
@@ -84,7 +84,7 @@ QStringList Settings::localChildGroups(const QString &rootkey) {
   else
     g = QString("%1/%2").arg(group, rootkey);
 
-  QSettings s(org(), appName);
+  QSettings s(fileName(), format());
   s.beginGroup(g);
   QStringList res = s.childGroups();
   s.endGroup();
@@ -92,16 +92,19 @@ QStringList Settings::localChildGroups(const QString &rootkey) {
 }
 
 void Settings::setLocalValue(const QString &key, const QVariant &data) {
-  QSettings s(org(), appName);
+  QSettings s(fileName(), format());
   s.beginGroup(group);
   s.setValue(key, data);
   s.endGroup();
   setCacheValue(group, key, data);
+  if(hasNotifier(group, key)) {
+    emit notifier(group, key)->valueChanged(data);
+  }
 }
 
 const QVariant &Settings::localValue(const QString &key, const QVariant &def) {
   if(!isCached(group, key)) {
-    QSettings s(org(), appName);
+    QSettings s(fileName(), format());
     s.beginGroup(group);
     setCacheValue(group, key, s.value(key, def));
     s.endGroup();
@@ -110,23 +113,10 @@ const QVariant &Settings::localValue(const QString &key, const QVariant &def) {
 }
 
 void Settings::removeLocalKey(const QString &key) {
-  QSettings s(org(), appName);
+  QSettings s(fileName(), format());
   s.beginGroup(group);
   s.remove(key);
   s.endGroup();
   if(isCached(group, key))
     settingsCache[group].remove(key);
 }
-
-
-// void Settings::setCacheValue(const QString &group, const QString &key, const QVariant &data) {
-//   settingsCache[group][key] = data;
-// }
-
-// const QVariant &Settings::cacheValue(const QString &group, const QString &key) {
-//   return settingsCache[group][key];
-// }
-
-// bool Settings::isCached(const QString &group, const QString &key) {
-//   return settingsCache.contains(group) && settingsCache[group].contains(key);
-// }