/***************************************************************************
- * Copyright (C) 2005-07 by The Quassel Team *
+ * Copyright (C) 2005-08 by the Quassel Project *
* devel@quassel-irc.org *
* *
* This program is free software; you can redistribute it and/or modify *
* it under the terms of the GNU General Public License as published by *
* the Free Software Foundation; either version 2 of the License, or *
- * (at your option) any later version. *
+ * (at your option) version 3. *
* *
* This program is distributed in the hope that it will be useful, *
* but WITHOUT ANY WARRANTY; without even the implied warranty of *
#ifdef Q_WS_QWS
#include <Qtopia>
-#include <QCoreApplication>
#endif
#include "settings.h"
-Settings::Settings(QString g) : group(g) {
-
-#ifndef Q_WS_QWS
- QSettings();
-#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();
- }
-#endif
-}
-
-Settings::~Settings() {
+QHash<QString, QHash<QString, QVariant> > Settings::settingsCache;
-}
-
-void Settings::setGroup(QString g) {
- group = g;
+// 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
+// */
+// }
QStringList Settings::allLocalKeys() {
- beginGroup(group);
- QStringList res = allKeys();
- endGroup();
+ QSettings s(org(), appName);
+ s.beginGroup(group);
+ QStringList res = s.allKeys();
+ s.endGroup();
return res;
}
-QStringList Settings::localChildKeys() {
- beginGroup(group);
- QStringList res = childKeys();
- endGroup();
+QStringList Settings::localChildKeys(const QString &rootkey) {
+ QString g;
+ if(rootkey.isEmpty())
+ g = group;
+ else
+ g = QString("%1/%2").arg(group, rootkey);
+
+ QSettings s(org(), appName);
+ s.beginGroup(g);
+ QStringList res = s.childKeys();
+ s.endGroup();
return res;
}
-QStringList Settings::localChildGroups() {
- beginGroup(group);
- QStringList res = childGroups();
- endGroup();
+QStringList Settings::localChildGroups(const QString &rootkey) {
+ QString g;
+ if(rootkey.isEmpty())
+ g = group;
+ else
+ g = QString("%1/%2").arg(group, rootkey);
+
+ QSettings s(org(), appName);
+ 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);
- endGroup();
+ QSettings s(org(), appName);
+ s.beginGroup(group);
+ s.setValue(key, data);
+ s.endGroup();
+ setCacheValue(group, key, data);
}
-QVariant Settings::localValue(const QString &key, const QVariant &def) {
- beginGroup(group);
- QVariant res = value(key, def);
- endGroup();
- return res;
+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();
+ }
+ return cacheValue(group, key);
}
void Settings::removeLocalKey(const QString &key) {
- beginGroup(group);
- remove(key);
- endGroup();
+ QSettings s(org(), appName);
+ 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);
+// }