projects
/
quassel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
modernize: Use raw string literals instead of escaped strings
[quassel.git]
/
src
/
common
/
settings.cpp
diff --git
a/src/common/settings.cpp
b/src/common/settings.cpp
index
cdb152c
..
2330f45
100644
(file)
--- a/
src/common/settings.cpp
+++ b/
src/common/settings.cpp
@@
-1,5
+1,5
@@
/***************************************************************************
/***************************************************************************
- * Copyright (C) 2005-201
6
by the Quassel Project *
+ * Copyright (C) 2005-201
8
by the Quassel Project *
* devel@quassel-irc.org *
* *
* This program is free software; you can redistribute it and/or modify *
* devel@quassel-irc.org *
* *
* This program is free software; you can redistribute it and/or modify *
@@
-30,6
+30,7
@@
const int VERSION = 1; /// Settings version for backwords/forwards
const int VERSION_MINOR_INITIAL = 1; /// Initial settings version for compatible changes
QHash<QString, QVariant> Settings::settingsCache;
const int VERSION_MINOR_INITIAL = 1; /// Initial settings version for compatible changes
QHash<QString, QVariant> Settings::settingsCache;
+QHash<QString, bool> Settings::settingsKeyPersistedCache;
QHash<QString, SettingsChangeNotifier *> Settings::settingsChangeNotifier;
#ifdef Q_OS_MAC
QHash<QString, SettingsChangeNotifier *> Settings::settingsChangeNotifier;
#ifdef Q_OS_MAC
@@
-120,6
+121,7
@@
void Settings::setVersionMinor(const uint versionMinor)
s.setValue("Config/VersionMinor", versionMinor);
}
s.setValue("Config/VersionMinor", versionMinor);
}
+
bool Settings::sync() {
create_qsettings;
s.sync();
bool Settings::sync() {
create_qsettings;
s.sync();
@@
-131,11
+133,13
@@
bool Settings::sync() {
}
}
}
}
+
bool Settings::isWritable() {
create_qsettings;
return s.isWritable();
}
bool Settings::isWritable() {
create_qsettings;
return s.isWritable();
}
+
QStringList Settings::allLocalKeys()
{
create_qsettings;
QStringList Settings::allLocalKeys()
{
create_qsettings;
@@
-183,6
+187,7
@@
void Settings::setLocalValue(const QString &key, const QVariant &data)
QString normKey = normalizedKey(group, key);
create_qsettings;
s.setValue(normKey, data);
QString normKey = normalizedKey(group, key);
create_qsettings;
s.setValue(normKey, data);
+ setCacheKeyPersisted(normKey, true);
setCacheValue(normKey, data);
if (hasNotifier(normKey)) {
emit notifier(normKey)->valueChanged(data);
setCacheValue(normKey, data);
if (hasNotifier(normKey)) {
emit notifier(normKey)->valueChanged(data);
@@
-190,24
+195,37
@@
void Settings::setLocalValue(const QString &key, const QVariant &data)
}
}
-
const QVariant &
Settings::localValue(const QString &key, const QVariant &def)
+
QVariant
Settings::localValue(const QString &key, const QVariant &def)
{
QString normKey = normalizedKey(group, key);
if (!isCached(normKey)) {
create_qsettings;
{
QString normKey = normalizedKey(group, key);
if (!isCached(normKey)) {
create_qsettings;
+ // Since we're loading from settings anyways, cache whether or not the key exists on disk
+ setCacheKeyPersisted(normKey, s.contains(normKey));
+ // Cache key value
setCacheValue(normKey, s.value(normKey, def));
}
setCacheValue(normKey, s.value(normKey, def));
}
- return cacheValue(normKey);
+ if (cacheKeyPersisted(normKey)) {
+ return cacheValue(normKey);
+ } else {
+ // Don't return possibly wrong cached values
+ // A key gets cached with the first default value requested and never changes afterwards
+ return def;
+ }
}
}
+
bool Settings::localKeyExists(const QString &key)
{
QString normKey = normalizedKey(group, key);
bool Settings::localKeyExists(const QString &key)
{
QString normKey = normalizedKey(group, key);
- if (isCached(normKey))
- return true;
+ if (!isKeyPersistedCached(normKey)) {
+ create_qsettings;
+ // Cache whether or not key exists on disk
+ // We can't cache key value as we don't know the default
+ setCacheKeyPersisted(normKey, s.contains(normKey));
+ }
- create_qsettings;
- return s.contains(normKey);
+ return cacheKeyPersisted(normKey);
}
}
@@
-218,6
+236,13
@@
void Settings::removeLocalKey(const QString &key)
s.remove(key);
s.endGroup();
QString normKey = normalizedKey(group, key);
s.remove(key);
s.endGroup();
QString normKey = normalizedKey(group, key);
- if (isCached(normKey))
+ if (isCached(normKey))
{
settingsCache.remove(normKey);
settingsCache.remove(normKey);
+ }
+ if (isKeyPersistedCached(normKey)) {
+ settingsKeyPersistedCache.remove(normKey);
+ }
+ if (hasNotifier(normKey)) {
+ emit notifier(normKey)->valueChanged({});
+ }
}
}