feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Utils/VcsBase: Move ability to specify group settings keys to base

Browse Source 
Merge it with the read/writeSettings implementation that was already
there.

Change-Id: I25dfbdf6fd1cf122b17f89eae82cb2598d8470c8
Reviewed-by: David Schulz <david.schulz@qt.io>
This commit is contained in:
hjk
2021-03-22 15:11:30 +01:00
parent aa98c02443
commit a694487711
4 changed files with 31 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
src/libs/utils/aspects.cpp
View File

@@ -2019,6 +2019,7 @@ class AspectContainerPrivate
public:
QList<BaseAspect *> m_items; // Not owned
bool m_autoApply = true;
QString m_settingsGroup;
};
} // Internal
@@ -2061,14 +2062,38 @@ void AspectContainer::toMap(QVariantMap &map) const
void AspectContainer::readSettings(const QSettings *settings)
{
for (BaseAspect *aspect : qAsConst(d->m_items))
aspect->readSettings(settings);
if (d->m_settingsGroup.isEmpty()) {
for (BaseAspect *aspect : qAsConst(d->m_items))
aspect->readSettings(settings);
} else {
const QString keyRoot = d->m_settingsGroup + '/';
forEachAspect([settings, keyRoot](BaseAspect *aspect) {
QString key = aspect->settingsKey();
const QVariant value = settings->value(keyRoot + key, aspect->defaultValue());
aspect->setValue(value);
});
}
}
void AspectContainer::writeSettings(QSettings *settings) const
{
for (BaseAspect *aspect : qAsConst(d->m_items))
aspect->writeSettings(settings);
if (d->m_settingsGroup.isEmpty()) {
for (BaseAspect *aspect : qAsConst(d->m_items))
aspect->writeSettings(settings);
} else {
settings->remove(d->m_settingsGroup);
settings->beginGroup(d->m_settingsGroup);
forEachAspect([settings](BaseAspect *aspect) {
QtcSettings::setValueWithDefault(settings, aspect->settingsKey(),
aspect->value(), aspect->defaultValue());
});
settings->endGroup();
}
}
void AspectContainer::setSettingsGroup(const QString &key)
{
d->m_settingsGroup = key;
}
void AspectContainer::apply()