From fee7e9fbdab8a2a4233997f0edbe500a59a587da Mon Sep 17 00:00:00 2001
From: hjk <hjk@qt.io>
Date: Tue, 11 Jun 2019 10:27:16 +0200
Subject: [PATCH] Debugger: Abandon special DebuggerKitChooser

The regular one with icon display is good enough nowadays.

Change-Id: I9a511c9975ceaeae0bb8005ac647fa710bf9d900
Reviewed-by: David Schulz <david.schulz@qt.io>
---
 src/plugins/debugger/debuggerdialogs.cpp      | 33 ++-----------------
 src/plugins/debugger/debuggerdialogs.h        | 17 ----------
 src/plugins/debugger/debuggerplugin.cpp       |  3 +-
 src/plugins/debugger/loadcoredialog.cpp       |  3 +-
 .../debugger/unstartedappwatcherdialog.cpp    |  6 +++-
 5 files changed, 11 insertions(+), 51 deletions(-)

diff --git a/src/plugins/debugger/debuggerdialogs.cpp b/src/plugins/debugger/debuggerdialogs.cpp
index 450cb575f7e..4a1261793f1 100644
--- a/src/plugins/debugger/debuggerdialogs.cpp
+++ b/src/plugins/debugger/debuggerdialogs.cpp
@@ -97,36 +97,6 @@ Q_DECLARE_METATYPE(Debugger::Internal::StartApplicationParameters)
 namespace Debugger {
 namespace Internal {
 
-///////////////////////////////////////////////////////////////////////
-//
-// DebuggerKitChooser
-//
-///////////////////////////////////////////////////////////////////////
-
-DebuggerKitChooser::DebuggerKitChooser(Mode mode, QWidget *parent)
-    : KitChooser(parent)
-    , m_hostAbi(Abi::hostAbi())
-    , m_mode(mode)
-{
-    setKitPredicate([this](const Kit *k) {
-        // Match valid debuggers and restrict local debugging to compatible toolchains.
-        auto errors = DebuggerKitAspect::configurationErrors(k);
-        // we do not care for mismatched ABI if we want *any* debugging
-        if (m_mode == AnyDebugging && errors == DebuggerKitAspect::DebuggerDoesNotMatch)
-            errors = DebuggerKitAspect::NoConfigurationError;
-        if (errors)
-            return false;
-        if (m_mode == LocalDebugging)
-            return ToolChainKitAspect::targetAbi(k).os() == m_hostAbi.os();
-        return true;
-    });
-}
-
-QString DebuggerKitChooser::kitToolTip(Kit *k) const
-{
-    return DebuggerKitAspect::displayString(k);
-}
-
 ///////////////////////////////////////////////////////////////////////
 //
 // StartApplicationParameters
@@ -520,7 +490,8 @@ AttachToQmlPortDialog::AttachToQmlPortDialog(QWidget *parent)
     setWindowFlags(windowFlags() & ~Qt::WindowContextHelpButtonHint);
     setWindowTitle(tr("Start Debugger"));
 
-    d->kitChooser = new DebuggerKitChooser(DebuggerKitChooser::AnyDebugging, this);
+    d->kitChooser = new KitChooser(this);
+    d->kitChooser->setShowIcons(true);
     d->kitChooser->populate();
 
     d->portSpinBox = new QSpinBox(this);
diff --git a/src/plugins/debugger/debuggerdialogs.h b/src/plugins/debugger/debuggerdialogs.h
index 4cec4143a6c..20d38307e79 100644
--- a/src/plugins/debugger/debuggerdialogs.h
+++ b/src/plugins/debugger/debuggerdialogs.h
@@ -47,23 +47,6 @@ class StartApplicationParameters;
 class StartApplicationDialogPrivate;
 class StartRemoteEngineDialogPrivate;
 
-class DebuggerKitChooser : public ProjectExplorer::KitChooser
-{
-    Q_OBJECT
-
-public:
-    enum Mode { AnyDebugging, LocalDebugging };
-
-    explicit DebuggerKitChooser(Mode mode = AnyDebugging, QWidget *parent = nullptr);
-
-protected:
-    QString kitToolTip(ProjectExplorer::Kit *k) const final;
-
-private:
-    const ProjectExplorer::Abi m_hostAbi;
-    const Mode m_mode;
-};
-
 class StartApplicationDialog : public QDialog
 {
     Q_OBJECT
diff --git a/src/plugins/debugger/debuggerplugin.cpp b/src/plugins/debugger/debuggerplugin.cpp
index 8c882ab99f8..e08e26e0e14 100644
--- a/src/plugins/debugger/debuggerplugin.cpp
+++ b/src/plugins/debugger/debuggerplugin.cpp
@@ -1660,7 +1660,8 @@ public:
 
 void DebuggerPluginPrivate::attachToRunningApplication()
 {
-    auto kitChooser = new DebuggerKitChooser(DebuggerKitChooser::AnyDebugging);
+    auto kitChooser = new KitChooser;
+    kitChooser->setShowIcons(true);
 
     auto dlg = new DeviceProcessesDialog(kitChooser, ICore::dialogParent());
     dlg->addAcceptButton(DeviceProcessesDialog::tr("&Attach to Process"));
diff --git a/src/plugins/debugger/loadcoredialog.cpp b/src/plugins/debugger/loadcoredialog.cpp
index 075cefd595b..33d9b87fc08 100644
--- a/src/plugins/debugger/loadcoredialog.cpp
+++ b/src/plugins/debugger/loadcoredialog.cpp
@@ -258,7 +258,8 @@ AttachCoreDialog::AttachCoreDialog(QWidget *parent)
     d->buttonBox->button(QDialogButtonBox::Ok)->setDefault(true);
     d->buttonBox->button(QDialogButtonBox::Ok)->setEnabled(false);
 
-    d->kitChooser = new DebuggerKitChooser(DebuggerKitChooser::AnyDebugging, this);
+    d->kitChooser = new KitChooser(this);
+    d->kitChooser->setShowIcons(true);
     d->kitChooser->populate();
 
     d->forceLocalCheckBox = new QCheckBox(this);
diff --git a/src/plugins/debugger/unstartedappwatcherdialog.cpp b/src/plugins/debugger/unstartedappwatcherdialog.cpp
index 25cfe10d7b8..8f403bb525c 100644
--- a/src/plugins/debugger/unstartedappwatcherdialog.cpp
+++ b/src/plugins/debugger/unstartedappwatcherdialog.cpp
@@ -89,7 +89,11 @@ UnstartedAppWatcherDialog::UnstartedAppWatcherDialog(QWidget *parent)
     setWindowTitle(tr("Attach to Process Not Yet Started"));
     setWindowFlags(windowFlags() & ~Qt::WindowContextHelpButtonHint);
 
-    m_kitChooser = new DebuggerKitChooser(DebuggerKitChooser::LocalDebugging, this);
+    m_kitChooser = new KitChooser(this);
+    m_kitChooser->setKitPredicate([](const Kit *k) {
+        return ToolChainKitAspect::targetAbi(k).os() == Utils::HostOsInfo::hostOs();
+    });
+    m_kitChooser->setShowIcons(true);
     m_kitChooser->populate();
     m_kitChooser->setVisible(true);