X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fcommon%2Fsettings.cpp;h=2731da26a7f5087e9ac6143f0967ffea6b4a5367;hp=e8ad9d0bf81ead6cf784c03db0d69b9a3505ea08;hb=328b48e6fbd78d6158eb55296c0843fc5a41bcfa;hpb=8cd290a5423e4fbe026b3a4cbfb2b9db03d5c47b

diff --git a/src/common/settings.cpp b/src/common/settings.cpp
index e8ad9d0b..2731da26 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,17 +18,20 @@
  *   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;
+const int VERSION = 1;
+
+QHash<QString, QVariant> Settings::settingsCache;
+QHash<QString, SettingsChangeNotifier *> Settings::settingsChangeNotifier;
+
+#ifdef Q_WS_MAC
+#  define create_qsettings QSettings s(QCoreApplication::organizationDomain(), appName)
+#else
+#  define create_qsettings QSettings s(fileName(), format())
+#endif
 
 // Settings::Settings(QString group_, QString appName_)
 //   : group(group_),
@@ -55,8 +58,25 @@ QHash<QString, QHash<QString, QVariant> > Settings::settingsCache;
 // */
 // }
 
+void Settings::notify(const QString &key, QObject *receiver, const char *slot) {
+  QObject::connect(notifier(normalizedKey(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;
+  }
+  return ver;
+}
+
 QStringList Settings::allLocalKeys() {
-  QSettings s(org(), appName);
+  create_qsettings;
   s.beginGroup(group);
   QStringList res = s.allKeys();
   s.endGroup();
@@ -70,7 +90,7 @@ QStringList Settings::localChildKeys(const QString &rootkey) {
   else
     g = QString("%1/%2").arg(group, rootkey);
 
-  QSettings s(org(), appName);
+  create_qsettings;
   s.beginGroup(g);
   QStringList res = s.childKeys();
   s.endGroup();
@@ -84,7 +104,7 @@ QStringList Settings::localChildGroups(const QString &rootkey) {
   else
     g = QString("%1/%2").arg(group, rootkey);
 
-  QSettings s(org(), appName);
+  create_qsettings;
   s.beginGroup(g);
   QStringList res = s.childGroups();
   s.endGroup();
@@ -92,41 +112,30 @@ QStringList Settings::localChildGroups(const QString &rootkey) {
 }
 
 void Settings::setLocalValue(const QString &key, const QVariant &data) {
-  QSettings s(org(), appName);
-  s.beginGroup(group);
-  s.setValue(key, data);
-  s.endGroup();
-  setCacheValue(group, key, data);
+  QString normKey = normalizedKey(group, key);
+  create_qsettings;
+  s.setValue(normKey, data);
+  setCacheValue(normKey, data);
+  if(hasNotifier(normKey)) {
+    emit notifier(normKey)->valueChanged(data);
+  }
 }
 
 const QVariant &Settings::localValue(const QString &key, const QVariant &def) {
-  if(!isCached(group, key)) {
-    QSettings s(org(), appName);
-    s.beginGroup(group);
-    setCacheValue(group, key, s.value(key, def));
-    s.endGroup();
+  QString normKey = normalizedKey(group, key);
+  if(!isCached(normKey)) {
+    create_qsettings;
+    setCacheValue(normKey, s.value(normKey, def));
   }
-  return cacheValue(group, key);
+  return cacheValue(normKey);
 }
 
 void Settings::removeLocalKey(const QString &key) {
-  QSettings s(org(), appName);
+  create_qsettings;
   s.beginGroup(group);
   s.remove(key);
   s.endGroup();
-  if(isCached(group, key))
-    settingsCache[group].remove(key);
+  QString normKey = normalizedKey(group, key);
+  if(isCached(normKey))
+    settingsCache.remove(normKey);
 }
-
-
-// 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);
-// }