X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fcommon%2Fsettings.cpp;h=8756ca6a96df88e298dd707bf71341071fb79486;hp=eb4fc72a7241ae3947b540a4d284a690159f0eb2;hb=0a43227b8cd44625f4881cc1545d42c8c8a4876c;hpb=a1d785ae12b3ec04b43e243f3397bb6f8ecf60d5 diff --git a/src/common/settings.cpp b/src/common/settings.cpp index eb4fc72a..8756ca6a 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-2016 by the Quassel Project * * devel@quassel-irc.org * * * * This program is free software; you can redistribute it and/or modify * @@ -15,110 +15,149 @@ * You should have received a copy of the GNU General Public License * * along with this program; if not, write to the * * Free Software Foundation, Inc., * - * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * ***************************************************************************/ -#include -#include #include -#include - -#ifdef Q_WS_QWS -#include -#endif #include "settings.h" -static QHash > __settingsCache__; +const int VERSION = 1; -Settings::Settings(QString g, QString applicationName) +QHash Settings::settingsCache; +QHash Settings::settingsChangeNotifier; -#ifdef Q_WS_MAC - : QSettings(QCoreApplication::organizationDomain(), applicationName), +#ifdef Q_OS_MAC +# 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); - } -#endif -*/ +// 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(normalizedKey(group, key)), SIGNAL(valueChanged(const QVariant &)), + receiver, slot); } -QStringList Settings::allLocalKeys() { - beginGroup(group); - QStringList res = allKeys(); - 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(); - return res; +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::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(); - 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; } -void Settings::setLocalValue(const QString &key, const QVariant &data) { - beginGroup(group); - setValue(key, data); - setCacheValue(group, key, data); - endGroup(); + +QStringList Settings::allLocalKeys() +{ + create_qsettings; + s.beginGroup(group); + QStringList res = s.allKeys(); + s.endGroup(); + return res; } -const QVariant &Settings::localValue(const QString &key, const QVariant &def) { - if(!isCached(group, key)) { - beginGroup(group); - setCacheValue(group, key, value(key, def)); - endGroup(); - } - return cacheValue(group, key); + +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::removeLocalKey(const QString &key) { - beginGroup(group); - remove(key); - endGroup(); + +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; } -void Settings::setCacheValue(const QString &group, const QString &key, const QVariant &data) { - ::__settingsCache__[group][key] = data; +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); + } } -const QVariant &Settings::cacheValue(const QString &group, const QString &key) { - return ::__settingsCache__[group][key]; + +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); } -bool Settings::isCached(const QString &group, const QString &key) { - return ::__settingsCache__.contains(group) && ::__settingsCache__[group].contains(key); + +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); }