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

KitManager: Cleanup

Browse Source 
* Deduplicate call to setDefaultKit.
* Replace 2 calls to Utils::findOrDefault with list concatenation.

Change-Id: I9822d34f1eb25447b35f33aad0497756ef46d101
Reviewed-by: Daniel Teske <daniel.teske@theqtcompany.com>
Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
This commit is contained in:
Orgad Shaneh
2015-09-16 15:50:48 +03:00
committed by Tobias Hunger
parent 57765ceb80
commit 41feefd670
1 changed files with 3 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/plugins/projectexplorer/kitmanager.cpp
View File

@@ -220,18 +220,10 @@ void KitManager::restoreKits()
} }
Kit *k = find(userKits.defaultKit); Kit *k = find(userKits.defaultKit);
if (k) { if (!k && !defaultKit())
k = Utils::findOrDefault(kitsToRegister + sdkKits, &Kit::isValid);
if (k)
setDefaultKit(k); setDefaultKit(k);
} else if (!defaultKit()) {
k = Utils::findOrDefault(kitsToRegister, &Kit::isValid);
if (k) {
setDefaultKit(k);
} else {
k = Utils::findOrDefault(sdkKits, &Kit::isValid);
if (k)
setDefaultKit(k);
}
}
d->m_writer = new PersistentSettingsWriter(settingsFileName(), QLatin1String("QtCreatorProfiles")); d->m_writer = new PersistentSettingsWriter(settingsFileName(), QLatin1String("QtCreatorProfiles"));
d->m_initialized = true; d->m_initialized = true;