From 234d66c8e47bc9864038c98cd33f14fd72db8619 Mon Sep 17 00:00:00 2001 From: Tobias Hunger Date: Tue, 4 Mar 2014 12:13:50 +0100 Subject: [PATCH] SettingsAccessor: Simplify code Change-Id: I9391ad1c6f71a795dbea73b1412bf29d3b038c2e Reviewed-by: Daniel Teske --- .../projectexplorer/settingsaccessor.cpp | 20 ++++++------------- 1 file changed, 6 insertions(+), 14 deletions(-) diff --git a/src/plugins/projectexplorer/settingsaccessor.cpp b/src/plugins/projectexplorer/settingsaccessor.cpp index 87d0114715e..e2ca53210f2 100644 --- a/src/plugins/projectexplorer/settingsaccessor.cpp +++ b/src/plugins/projectexplorer/settingsaccessor.cpp @@ -832,24 +832,16 @@ bool SettingsAccessor::saveSettings(const QVariantMap &map, QWidget *parent) con backupUserFile(); - SettingsAccessorPrivate::Settings settings; - settings.map = map; - settings.path = FileName::fromString(defaultFileName(m_userSuffix)); + QVariantMap data = map; + + Utils::FileName path = FileName::fromString(defaultFileName(m_userSuffix)); const QVariant &shared = m_project->property(SHARED_SETTINGS); if (shared.isValid()) - trackUserStickySettings(settings.map, shared.toMap()); + trackUserStickySettings(data, shared.toMap()); - if (!d->m_writer || d->m_writer->fileName() != settings.path) { + if (!d->m_writer || d->m_writer->fileName() != path) { delete d->m_writer; - d->m_writer = new PersistentSettingsWriter(settings.path, QLatin1String("QtCreatorProject")); - } - - QVariantMap data; - - for (QVariantMap::const_iterator i = settings.map.constBegin(); - i != settings.map.constEnd(); - ++i) { - data.insert(i.key(), i.value()); + d->m_writer = new PersistentSettingsWriter(path, QLatin1String("QtCreatorProject")); } data.insert(QLatin1String(VERSION_KEY), d->currentVersion());