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

ProjectExplorer: Refactor KitManager::registerKit()

Browse Source 
The interface of this function was rather unfortunate. In particluar,
the fact that it took ownership of the std::unique_ptr that was passed
in required some weird boiler plate code at all the calling sites.
Instead, it now becomes a proper factory function.

Change-Id: Iecdc6f6345232fc0f0a08bffaf8f1780edb57201
Reviewed-by: hjk <hjk@qt.io>
This commit is contained in:
Christian Kandeler
2019-03-11 16:59:16 +01:00
parent 03d776a873
commit 3aea3a13cb
9 changed files with 89 additions and 101 deletions
Download Patch File Download Diff File Expand all files Collapse all files

43
src/plugins/android/androidconfigurations.cpp
View File

@@ -1082,32 +1082,35 @@ void AndroidConfigurations::updateAutomaticKitList()
QtSupport::QtKitAspect::setQtVersion(k, qt);
DeviceKitAspect::setDevice(k, device);
};
const auto initStage2 = [tc](Kit *k, const QtSupport::BaseQtVersion *qt) {
Debugger::DebuggerKitAspect::setDebugger(k, findOrRegisterDebugger(tc));
AndroidGdbServerKitAspect::setGdbSever(k, currentConfig().gdbServer(tc->targetAbi()));
k->makeSticky();
k->setUnexpandedDisplayName(tr("Android for %1 (Clang %2)")
.arg(static_cast<const AndroidQtVersion *>(qt)->targetArch())
.arg(qt->displayName()));
};
for (const QtSupport::BaseQtVersion *qt : qtVersionsForArch.value(tc->targetAbi())) {
auto newKit = std::make_unique<Kit>();
Kit *toSetup = newKit.get();
initBasicKitData(toSetup, qt);
Kit *existingKit = Utils::findOrDefault(existingKits, [toSetup](const Kit *k) {
return matchKits(toSetup, k);
});
if (existingKit) {
Kit *existingKit = nullptr;
const auto initializeKit = [&](Kit *k) {
initBasicKitData(k, qt);
existingKit = Utils::findOrDefault(existingKits, [k](const Kit *existing) {
return matchKits(k, existing);
});
if (existingKit)
return false;
initStage2(k, qt);
return true;
};
Kit * const newKit = KitManager::registerKit(initializeKit);
QTC_ASSERT(!newKit != !existingKit, continue);
if (!newKit) {
// Existing kit found.
// Update the existing kit with new data.
initBasicKitData(existingKit, qt);
newKit.reset();
toSetup = existingKit;
initStage2(existingKit, qt);
}
Debugger::DebuggerKitAspect::setDebugger(toSetup, findOrRegisterDebugger(tc));
AndroidGdbServerKitAspect::setGdbSever(toSetup, currentConfig().gdbServer(tc->targetAbi()));
toSetup->makeSticky();
toSetup->setUnexpandedDisplayName(tr("Android for %1 (Clang %2)")
.arg(static_cast<const AndroidQtVersion *>(qt)->targetArch())
.arg(qt->displayName()));
if (!existingKit)
KitManager::registerKit(std::move(newKit));
}
}
}