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

SettingsAccessor: Simplify code

Browse Source 
Change-Id: I9391ad1c6f71a795dbea73b1412bf29d3b038c2e
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
This commit is contained in:
Tobias Hunger
2014-03-04 12:13:50 +01:00
parent c3906f5365
commit 234d66c8e4
1 changed files with 6 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/plugins/projectexplorer/settingsaccessor.cpp
View File

@@ -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());