forked from qt-creator/qt-creator
Valgrind: Fix valgrind settings persistence
Change-Id: Idcd551e10d36cbadb8785bd7922777a45a871518 Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>
This commit is contained in:
@@ -416,6 +416,7 @@ ValgrindGlobalSettings::ValgrindGlobalSettings()
|
||||
|
||||
setConfigWidgetCreator([this] { return createSettingsWidget(this); });
|
||||
|
||||
setSettingsGroup("Analyzer");
|
||||
readSettings();
|
||||
setAutoApply(false);
|
||||
}
|
||||
@@ -424,44 +425,6 @@ ValgrindGlobalSettings::ValgrindGlobalSettings()
|
||||
// Memcheck
|
||||
//
|
||||
|
||||
QVariantMap ValgrindBaseSettings::defaultSettings() const
|
||||
{
|
||||
QVariantMap defaults;
|
||||
forEachAspect([&defaults](BaseAspect *aspect) {
|
||||
defaults.insert(aspect->settingsKey(), aspect->defaultVariantValue());
|
||||
});
|
||||
return defaults;
|
||||
}
|
||||
|
||||
static const char groupC[] = "Analyzer";
|
||||
|
||||
void ValgrindGlobalSettings::readSettings()
|
||||
{
|
||||
// Read stored values
|
||||
QSettings *settings = Core::ICore::settings();
|
||||
settings->beginGroup(groupC);
|
||||
QVariantMap map;
|
||||
const QStringList childKey = settings->childKeys();
|
||||
for (const QString &key : childKey)
|
||||
map.insert(key, settings->value(key));
|
||||
settings->endGroup();
|
||||
|
||||
fromMap(map);
|
||||
}
|
||||
|
||||
void ValgrindGlobalSettings::writeSettings() const
|
||||
{
|
||||
const QVariantMap defaults = defaultSettings();
|
||||
|
||||
Utils::QtcSettings *settings = Core::ICore::settings();
|
||||
settings->beginGroup(groupC);
|
||||
QVariantMap map;
|
||||
toMap(map);
|
||||
for (QVariantMap::ConstIterator it = map.constBegin(); it != map.constEnd(); ++it)
|
||||
settings->setValueWithDefault(it.key(), it.value(), defaults.value(it.key()));
|
||||
settings->endGroup();
|
||||
}
|
||||
|
||||
//////////////////////////////////////////////////////////////////
|
||||
//
|
||||
// ValgrindProjectSettings
|
||||
|
||||
Reference in New Issue
Block a user