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

KitManager: Get rid of KitMatcher class

Browse Source 
Use std::function instead. Clean up API while at it.

Change-Id: I6e401ab57f5375e36710c30508c596af3f4b3385
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
This commit is contained in:
Tobias Hunger
2017-01-11 17:25:58 +01:00
parent 1d4bf8c157
commit 25fbcca96b
28 changed files with 126 additions and 157 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/plugins/debugger/debuggerdialogs.cpp
View File

@@ -105,7 +105,7 @@ DebuggerKitChooser::DebuggerKitChooser(Mode mode, QWidget *parent)
, m_hostAbi(Abi::hostAbi())
, m_mode(mode)
{
setKitMatcher([this](const Kit *k) {
setKitPredicate([this](const Kit *k) {
// Match valid debuggers and restrict local debugging to compatible toolchains.
auto errors = DebuggerKitInformation::configurationErrors(k);
// we do not care for mismatched ABI if we want *any* debugging
@@ -178,7 +178,7 @@ QString StartApplicationParameters::displayName() const
name += QLatin1String("...");
}
if (Kit *kit = KitManager::find(kitId))
if (Kit *kit = KitManager::kit(kitId))
name += QString::fromLatin1(" (%1)").arg(kit->displayName());
return name;
@@ -226,7 +226,7 @@ StartApplicationDialog::StartApplicationDialog(QWidget *parent)
setWindowTitle(tr("Start Debugger"));
d->kitChooser = new KitChooser(this);
d->kitChooser->setKitMatcher([this](const Kit *k) {
d->kitChooser->setKitPredicate([this](const Kit *k) {
return !DebuggerKitInformation::configurationErrors(k);
});
d->kitChooser->populate();