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

SettingsAccessor: More const, more warnings on misuse

Browse Source 
Change-Id: I667944f041792c72b0cecbd6b2ec252db9a2701d
Reviewed-by: Marco Bubke <marco.bubke@qt.io>
This commit is contained in:
Tobias Hunger
2017-11-20 15:21:14 +01:00
parent 2e62690dcd
commit 9a56ac25cb
1 changed files with 3 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/libs/utils/settingsaccessor.cpp
View File

@@ -551,11 +551,10 @@ QByteArray SettingsAccessor::settingsIdFromMap(const QVariantMap &data)
QVariantMap SettingsAccessor::restoreSettings(QWidget *parent) const QVariantMap SettingsAccessor::restoreSettings(QWidget *parent) const
{ {
if (d->lastVersion() < 0) QTC_ASSERT(d->lastVersion() >= 0, return QVariantMap());
return QVariantMap();
QVariantMap userSettings = readUserSettings(parent); const QVariantMap userSettings = readUserSettings(parent);
QVariantMap sharedSettings = readSharedSettings(parent); const QVariantMap sharedSettings = readSharedSettings(parent);
return mergeSettings(userSettings, sharedSettings); return mergeSettings(userSettings, sharedSettings);
} }