X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fcommon%2Fsettings.cpp;h=10447eaed78de7470aeca5e6fcb92453b98ac519;hp=24ddd5fc5915f34de118c4efb90ceb2a38f9504c;hb=694f9bfbf7f1af19108461c7e00d133e55082bce;hpb=61c8d84d1c849373e0f115dc748ed45cff95287d

diff --git a/src/common/settings.cpp b/src/common/settings.cpp
index 24ddd5fc..10447eae 100644
--- a/src/common/settings.cpp
+++ b/src/common/settings.cpp
@@ -58,89 +58,106 @@ QHash<QString, SettingsChangeNotifier *> Settings::settingsChangeNotifier;
 // */
 // }
 
-void Settings::notify(const QString &key, QObject *receiver, const char *slot) {
-  QObject::connect(notifier(normalizedKey(group, key)), SIGNAL(valueChanged(const QVariant &)),
-                   receiver, slot);
+void Settings::notify(const QString &key, QObject *receiver, const char *slot)
+{
+    QObject::connect(notifier(normalizedKey(group, key)), SIGNAL(valueChanged(const QVariant &)),
+        receiver, slot);
 }
 
-void Settings::initAndNotify(const QString &key, QObject *receiver, const char *slot, const QVariant &defaultValue) {
-  notify(key, receiver, slot);
-  emit notifier(normalizedKey(group, key))->valueChanged(localValue(key, defaultValue));
-}
 
-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;
+void Settings::initAndNotify(const QString &key, QObject *receiver, const char *slot, const QVariant &defaultValue)
+{
+    notify(key, receiver, slot);
+    emit notifier(normalizedKey(group, key))->valueChanged(localValue(key, defaultValue));
 }
 
-QStringList Settings::allLocalKeys() {
-  create_qsettings;
-  s.beginGroup(group);
-  QStringList res = s.allKeys();
-  s.endGroup();
-  return res;
+
+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::localChildKeys(const QString &rootkey) {
-  QString g;
-  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::allLocalKeys()
+{
+    create_qsettings;
+    s.beginGroup(group);
+    QStringList res = s.allKeys();
+    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);
-
-  create_qsettings;
-  s.beginGroup(g);
-  QStringList res = s.childGroups();
-  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);
+
+    create_qsettings;
+    s.beginGroup(g);
+    QStringList res = s.childKeys();
+    s.endGroup();
+    return res;
 }
 
-void Settings::setLocalValue(const QString &key, const QVariant &data) {
-  QString normKey = normalizedKey(group, key);
-  create_qsettings;
-  s.setValue(normKey, data);
-  setCacheValue(normKey, data);
-  if(hasNotifier(normKey)) {
-    emit notifier(normKey)->valueChanged(data);
-  }
+
+QStringList Settings::localChildGroups(const QString &rootkey)
+{
+    QString g;
+    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;
 }
 
-const QVariant &Settings::localValue(const QString &key, const QVariant &def) {
-  QString normKey = normalizedKey(group, key);
-  if(!isCached(normKey)) {
+
+void Settings::setLocalValue(const QString &key, const QVariant &data)
+{
+    QString normKey = normalizedKey(group, key);
     create_qsettings;
-    setCacheValue(normKey, s.value(normKey, def));
-  }
-  return cacheValue(normKey);
+    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)
+{
+    QString normKey = normalizedKey(group, key);
+    if (!isCached(normKey)) {
+        create_qsettings;
+        setCacheValue(normKey, s.value(normKey, def));
+    }
+    return cacheValue(normKey);
 }
 
-void Settings::removeLocalKey(const QString &key) {
-  create_qsettings;
-  s.beginGroup(group);
-  s.remove(key);
-  s.endGroup();
-  QString normKey = normalizedKey(group, key);
-  if(isCached(normKey))
-    settingsCache.remove(normKey);
+
+void Settings::removeLocalKey(const QString &key)
+{
+    create_qsettings;
+    s.beginGroup(group);
+    s.remove(key);
+    s.endGroup();
+    QString normKey = normalizedKey(group, key);
+    if (isCached(normKey))
+        settingsCache.remove(normKey);
 }