X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fcommon%2Fsettings.cpp;h=f832f776a9d26d859b9ebf8ed295c98ffaa1086e;hp=eb4fc72a7241ae3947b540a4d284a690159f0eb2;hb=015de4656bebd990317b82d8cc993fdc63709f01;hpb=a1d785ae12b3ec04b43e243f3397bb6f8ecf60d5

diff --git a/src/common/settings.cpp b/src/common/settings.cpp
index eb4fc72a..f832f776 100644
--- 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,107 +18,125 @@
  *   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.             *
  ***************************************************************************/
 
-#include <QCoreApplication>
-#include <QSettings>
 #include <QStringList>
-#include <QDebug>
-
-#ifdef Q_WS_QWS
-#include <Qtopia>
-#endif
 
 #include "settings.h"
 
-static QHash<QString, QHash<QString, QVariant> > __settingsCache__;
+const int VERSION = 1;
 
-Settings::Settings(QString g, QString applicationName)
+QHash<QString, QHash<QString, QVariant> > Settings::settingsCache;
+QHash<QString, QHash<QString, SettingsChangeNotifier *> > Settings::settingsChangeNotifier;
 
 #ifdef Q_WS_MAC
-  : QSettings(QCoreApplication::organizationDomain(), applicationName),
+#  define create_qsettings QSettings s(QCoreApplication::organizationDomain(), appName)
 #else
-  : QSettings(QCoreApplication::organizationName(), applicationName),
+#  define create_qsettings QSettings s(fileName(), format())
 #endif
-    group(g)
-{
 
-/* we need to call the constructor immediately in order to set the path...
-#ifndef Q_WS_QWS
-  QSettings(QCoreApplication::organizationName(), applicationName);
-#else
-  // FIXME sandboxDir() is not currently working correctly...
-  //if(Qtopia::sandboxDir().isEmpty()) QSettings();
-  //else QSettings(Qtopia::sandboxDir() + "/etc/QuasselIRC.conf", QSettings::NativeFormat);
-  // ...so we have to use a workaround:
-  QString appPath = QCoreApplication::applicationFilePath();
-  if(appPath.startsWith(Qtopia::packagePath())) {
-    QString sandboxPath = appPath.left(Qtopia::packagePath().length() + 32);
-    QSettings(sandboxPath + "/etc/QuasselIRC.conf", QSettings::IniFormat);
-    qDebug() << sandboxPath + "/etc/QuasselIRC.conf";
-  } else {
-    QSettings(QCoreApplication::organizationName(), applicationName);
+// Settings::Settings(QString group_, QString appName_)
+//   : group(group_),
+//     appName(appName_)
+// {
+
+// /* we need to call the constructor immediately in order to set the path...
+// #ifndef Q_WS_QWS
+//   QSettings(QCoreApplication::organizationName(), applicationName);
+// #else
+//   // FIXME sandboxDir() is not currently working correctly...
+//   //if(Qtopia::sandboxDir().isEmpty()) QSettings();
+//   //else QSettings(Qtopia::sandboxDir() + "/etc/QuasselIRC.conf", QSettings::NativeFormat);
+//   // ...so we have to use a workaround:
+//   QString appPath = QCoreApplication::applicationFilePath();
+//   if(appPath.startsWith(Qtopia::packagePath())) {
+//     QString sandboxPath = appPath.left(Qtopia::packagePath().length() + 32);
+//     QSettings(sandboxPath + "/etc/QuasselIRC.conf", QSettings::IniFormat);
+//     qDebug() << sandboxPath + "/etc/QuasselIRC.conf";
+//   } else {
+//     QSettings(QCoreApplication::organizationName(), applicationName);
+//   }
+// #endif
+// */
+// }
+
+void Settings::notify(const QString &key, QObject *receiver, const char *slot) {
+  QObject::connect(notifier(group, key), SIGNAL(valueChanged(const QVariant &)),
+		   receiver, slot);
+}
+
+uint Settings::version() {
+  // we don't cache this value, and we ignore the group
+  create_qsettings;
+  uint ver = s.value("Config/Version", 0).toUInt();
+  if(!ver) {
+    // No version, so create one
+    s.setValue("Config/Version", VERSION);
+    return VERSION;
   }
-#endif
-*/
+  return ver;
 }
 
 QStringList Settings::allLocalKeys() {
-  beginGroup(group);
-  QStringList res = allKeys();
-  endGroup();
+  create_qsettings;
+  s.beginGroup(group);
+  QStringList res = s.allKeys();
+  s.endGroup();
   return res;
 }
 
 QStringList Settings::localChildKeys(const QString &rootkey) {
   QString g;
-  if(rootkey.isEmpty()) g = group;
-  else g = QString("%1/%2").arg(group, rootkey);
-  beginGroup(g);
-  QStringList res = childKeys();
-  endGroup();
+  if(rootkey.isEmpty())
+    g = group;
+  else
+    g = QString("%1/%2").arg(group, rootkey);
+
+  create_qsettings;
+  s.beginGroup(g);
+  QStringList res = s.childKeys();
+  s.endGroup();
   return res;
 }
 
 QStringList Settings::localChildGroups(const QString &rootkey) {
   QString g;
-  if(rootkey.isEmpty()) g = group;
-  else g = QString("%1/%2").arg(group, rootkey);
-  beginGroup(g);
-  QStringList res = childGroups();
-  endGroup();
+  if(rootkey.isEmpty())
+    g = group;
+  else
+    g = QString("%1/%2").arg(group, rootkey);
+
+  create_qsettings;
+  s.beginGroup(g);
+  QStringList res = s.childGroups();
+  s.endGroup();
   return res;
 }
 
 void Settings::setLocalValue(const QString &key, const QVariant &data) {
-  beginGroup(group);
-  setValue(key, data);
+  create_qsettings;
+  s.beginGroup(group);
+  s.setValue(key, data);
+  s.endGroup();
   setCacheValue(group, key, data);
-  endGroup();
+  if(hasNotifier(group, key)) {
+    emit notifier(group, key)->valueChanged(data);
+  }
 }
 
 const QVariant &Settings::localValue(const QString &key, const QVariant &def) {
   if(!isCached(group, key)) {
-    beginGroup(group);
-    setCacheValue(group, key, value(key, def));
-    endGroup();
+    create_qsettings;
+    s.beginGroup(group);
+    setCacheValue(group, key, s.value(key, def));
+    s.endGroup();
   }
   return cacheValue(group, key);
 }
 
 void Settings::removeLocalKey(const QString &key) {
-  beginGroup(group);
-  remove(key);
-  endGroup();
-}
-
-
-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);
+  create_qsettings;
+  s.beginGroup(group);
+  s.remove(key);
+  s.endGroup();
+  if(isCached(group, key))
+    settingsCache[group].remove(key);
 }