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

SettingsAccessor: Backup old settings again.

Browse Source 
Back up when saving. That is more robust when several instances
work with the same project at the same time.

Change-Id: Id4bfd5eab4184934f66909dcf7a580fef1e104ae
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
This commit is contained in:
Tobias Hunger
2013-04-04 16:21:04 +02:00
parent 0addee8bac
commit acda3403a5
2 changed files with 25 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -611,6 +611,8 @@ bool SettingsAccessor::saveSettings(const QVariantMap &map) const
if (map.isEmpty()) if (map.isEmpty())
return false; return false;
backupUserFile();
SettingsData settings(map); SettingsData settings(map);
settings.m_fileName = Utils::FileName::fromString(defaultFileName(m_userFileAcessor.suffix())); settings.m_fileName = Utils::FileName::fromString(defaultFileName(m_userFileAcessor.suffix()));
const QVariant &shared = m_project->property(SHARED_SETTINGS); const QVariant &shared = m_project->property(SHARED_SETTINGS);
@@ -686,6 +688,28 @@ int SettingsAccessor::currentVersion() const
return m_lastVersion + 1; return m_lastVersion + 1;
} }
void SettingsAccessor::backupUserFile() const
{
SettingsData oldSettings;
oldSettings.m_fileName = Utils::FileName::fromString(defaultFileName(m_userFileAcessor.suffix()));
if (!m_userFileAcessor.readFile(&oldSettings))
return;
// Do we need to do a backup?
const QString origName = oldSettings.fileName().toString();
QString backupName = origName;
if (oldSettings.environmentId() != creatorId())
backupName += QLatin1String(".") + QString::fromLatin1(oldSettings.environmentId()).mid(1, 7);
if (oldSettings.version() != currentVersion()) {
if (m_handlers.contains(oldSettings.version()))
backupName += QLatin1String(".") + m_handlers.value(oldSettings.version())->displayUserFileVersion();
else
backupName += QLatin1String(".") + QString::number(oldSettings.version());
}
if (backupName != origName)
QFile::copy(origName, backupName);
}
void SettingsAccessor::incrementVersion(SettingsAccessor::SettingsData &data) const void SettingsAccessor::incrementVersion(SettingsAccessor::SettingsData &data) const
{ {
data.m_map = m_handlers.value(data.version())->update(m_project, data.m_map); data.m_map = m_handlers.value(data.version())->update(m_project, data.m_map);

1
src/plugins/projectexplorer/settingsaccessor.h
View File

@@ -63,6 +63,7 @@ private:
QByteArray creatorId() const; QByteArray creatorId() const;
QString defaultFileName(const QString &suffix) const; QString defaultFileName(const QString &suffix) const;
int currentVersion() const; int currentVersion() const;
void backupUserFile() const;
// The relevant data from the settings currently in use. // The relevant data from the settings currently in use.
class SettingsData class SettingsData