const int VERSION = 1;
-QHash<QString, QHash<QString, QVariant> > Settings::settingsCache;
-QHash<QString, QHash<QString, SettingsChangeNotifier *> > Settings::settingsChangeNotifier;
+QHash<QString, QVariant> Settings::settingsCache;
+QHash<QString, SettingsChangeNotifier *> Settings::settingsChangeNotifier;
#ifdef Q_WS_MAC
# define create_qsettings QSettings s(QCoreApplication::organizationDomain(), appName)
// }
void Settings::notify(const QString &key, QObject *receiver, const char *slot) {
- QObject::connect(notifier(group, key), SIGNAL(valueChanged(const QVariant &)),
+ QObject::connect(notifier(normalizedKey(group, key)), SIGNAL(valueChanged(const QVariant &)),
receiver, slot);
}
}
void Settings::setLocalValue(const QString &key, const QVariant &data) {
+ QString normKey = normalizedKey(group, key);
create_qsettings;
- s.beginGroup(group);
- s.setValue(key, data);
- s.endGroup();
- setCacheValue(group, key, data);
- if(hasNotifier(group, key)) {
- emit notifier(group, key)->valueChanged(data);
+ 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)) {
+ QString normKey = normalizedKey(group, key);
+ if(!isCached(normKey)) {
create_qsettings;
- s.beginGroup(group);
- setCacheValue(group, key, s.value(key, def));
- s.endGroup();
+ setCacheValue(normKey, s.value(normKey, def));
}
- return cacheValue(group, key);
+ return cacheValue(normKey);
}
void Settings::removeLocalKey(const QString &key) {
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);
}
+ ((format() == QSettings::NativeFormat) ? QLatin1String(".conf") : QLatin1String(".ini"));
}
- static QHash<QString, QHash<QString, QVariant> > settingsCache;
- static QHash<QString, QHash<QString, SettingsChangeNotifier *> > settingsChangeNotifier;
+ static QHash<QString, QVariant> settingsCache;
+ static QHash<QString, SettingsChangeNotifier *> settingsChangeNotifier;
- inline void setCacheValue(const QString &group, const QString &key, const QVariant &data) {
- settingsCache[group][key] = data;
+ inline QString normalizedKey(const QString &group, const QString &key) {
+ if(group.isEmpty())
+ return key;
+ return group + '/' + key;
}
- inline const QVariant &cacheValue(const QString &group, const QString &key) {
- return settingsCache[group][key];
+
+ inline void setCacheValue(const QString &normKey, const QVariant &data) {
+ settingsCache[normKey] = data;
+ }
+ inline const QVariant &cacheValue(const QString &normKey) {
+ return settingsCache[normKey];
}
- inline bool isCached(const QString &group, const QString &key) {
- return settingsCache.contains(group) && settingsCache[group].contains(key);
+ inline bool isCached(const QString &normKey) {
+ return settingsCache.contains(normKey);
}
- inline SettingsChangeNotifier *notifier(const QString &group, const QString &key) {
- if(!hasNotifier(group, key))
- settingsChangeNotifier[group][key] = new SettingsChangeNotifier();
- return settingsChangeNotifier[group][key];
+ inline SettingsChangeNotifier *notifier(const QString &normKey) {
+ if(!hasNotifier(normKey))
+ settingsChangeNotifier[normKey] = new SettingsChangeNotifier();
+ return settingsChangeNotifier[normKey];
}
- inline bool hasNotifier(const QString &group, const QString &key) {
- return settingsChangeNotifier.contains(group) && settingsChangeNotifier[group].contains(key);
+ inline bool hasNotifier(const QString &normKey) {
+ return settingsChangeNotifier.contains(normKey);
}
};