From a38c3ac08e9db050aeafd3c2e283cc7e7adfebcd Mon Sep 17 00:00:00 2001 From: Alessandro Portale Date: Tue, 11 Jun 2019 19:06:27 +0200 Subject: [PATCH] Remove ToolChain::suggestedDebugger() And inline it in AndroidConfigurations, which is the only place that made use of suggestedDebugger() Change-Id: I87f135b5d115adb7e46b0f009c5853221e9a3daa Reviewed-by: hjk --- src/plugins/android/androidconfigurations.cpp | 4 ++-- src/plugins/android/androidtoolchain.cpp | 6 ------ src/plugins/android/androidtoolchain.h | 1 - src/plugins/debugger/debuggeritemmanager.cpp | 2 +- src/plugins/projectexplorer/toolchain.cpp | 5 ----- src/plugins/projectexplorer/toolchain.h | 1 - src/plugins/projectexplorer/toolchainmanager.cpp | 6 ------ src/plugins/projectexplorer/toolchainmanager.h | 2 -- 8 files changed, 3 insertions(+), 24 deletions(-) diff --git a/src/plugins/android/androidconfigurations.cpp b/src/plugins/android/androidconfigurations.cpp index c3e2512ea99..9597051c2f4 100644 --- a/src/plugins/android/androidconfigurations.cpp +++ b/src/plugins/android/androidconfigurations.cpp @@ -948,7 +948,7 @@ void AndroidConfigurations::removeOldToolChains() static QVariant findOrRegisterDebugger(ToolChain *tc) { - const FilePath command = tc->suggestedDebugger(); + const FilePath command = AndroidConfigurations::currentConfig().gdbPath(tc->targetAbi()); // check if the debugger is already registered, but ignoring the display name const Debugger::DebuggerItem *existing = Debugger::DebuggerItemManager::findByCommand(command); if (existing && existing->engineType() == Debugger::GdbEngineType && existing->isAutoDetected() @@ -956,7 +956,7 @@ static QVariant findOrRegisterDebugger(ToolChain *tc) return existing->id(); // debugger not found, register a new one Debugger::DebuggerItem debugger; - debugger.setCommand(tc->suggestedDebugger()); + debugger.setCommand(command); debugger.setEngineType(Debugger::GdbEngineType); debugger.setUnexpandedDisplayName( AndroidConfigurations::tr("Android Debugger for %1").arg(tc->displayName())); diff --git a/src/plugins/android/androidtoolchain.cpp b/src/plugins/android/androidtoolchain.cpp index 3c458854718..47986fca3aa 100644 --- a/src/plugins/android/androidtoolchain.cpp +++ b/src/plugins/android/androidtoolchain.cpp @@ -105,12 +105,6 @@ void AndroidToolChain::addToEnvironment(Environment &env) const AndroidConfigurations::currentConfig().sdkLocation().toString()); } -FilePath AndroidToolChain::suggestedDebugger() const -{ - // TODO: Make use of LLDB if available. - return AndroidConfigurations::currentConfig().gdbPath(targetAbi()); -} - FilePath AndroidToolChain::suggestedGdbServer() const { return AndroidConfigurations::currentConfig().gdbServer(targetAbi()); diff --git a/src/plugins/android/androidtoolchain.h b/src/plugins/android/androidtoolchain.h index 1665f49b6ae..433101a5139 100644 --- a/src/plugins/android/androidtoolchain.h +++ b/src/plugins/android/androidtoolchain.h @@ -42,7 +42,6 @@ public: bool isValid() const override; void addToEnvironment(Utils::Environment &env) const override; - Utils::FilePath suggestedDebugger() const override; Utils::FilePath suggestedGdbServer() const; QStringList suggestedMkspecList() const override; Utils::FilePath makeCommand(const Utils::Environment &environment) const override; diff --git a/src/plugins/debugger/debuggeritemmanager.cpp b/src/plugins/debugger/debuggeritemmanager.cpp index 4020995ce2b..639c3b268ce 100644 --- a/src/plugins/debugger/debuggeritemmanager.cpp +++ b/src/plugins/debugger/debuggeritemmanager.cpp @@ -709,7 +709,7 @@ void DebuggerItemManagerPrivate::autoDetectGdbOrLldbDebuggers() Environment env = Environment::systemEnvironment(); if (tc) { tc->addToEnvironment(env); // Find MinGW gdb in toolchain environment. - QString path = tc->suggestedDebugger().toString(); + QString path = tc->suggestedDebugger().toString(); // Won't compile if (!path.isEmpty()) { const QFileInfo fi(path); if (!fi.isAbsolute()) diff --git a/src/plugins/projectexplorer/toolchain.cpp b/src/plugins/projectexplorer/toolchain.cpp index 66c5ac83db9..ccc47381d84 100644 --- a/src/plugins/projectexplorer/toolchain.cpp +++ b/src/plugins/projectexplorer/toolchain.cpp @@ -169,11 +169,6 @@ QStringList ToolChain::suggestedMkspecList() const return {}; } -Utils::FilePath ToolChain::suggestedDebugger() const -{ - return ToolChainManager::defaultDebugger(targetAbi()); -} - Core::Id ToolChain::typeId() const { return d->m_typeId; diff --git a/src/plugins/projectexplorer/toolchain.h b/src/plugins/projectexplorer/toolchain.h index 1cbe478691f..a6399a310e0 100644 --- a/src/plugins/projectexplorer/toolchain.h +++ b/src/plugins/projectexplorer/toolchain.h @@ -99,7 +99,6 @@ public: QByteArray id() const; virtual QStringList suggestedMkspecList() const; - virtual Utils::FilePath suggestedDebugger() const; Core::Id typeId() const; virtual QString typeDisplayName() const = 0; diff --git a/src/plugins/projectexplorer/toolchainmanager.cpp b/src/plugins/projectexplorer/toolchainmanager.cpp index ffea568dbee..b3ac697bb2d 100644 --- a/src/plugins/projectexplorer/toolchainmanager.cpp +++ b/src/plugins/projectexplorer/toolchainmanager.cpp @@ -63,7 +63,6 @@ class ToolChainManagerPrivate public: ~ToolChainManagerPrivate(); - QMap m_abiToDebugger; std::unique_ptr m_accessor; QList m_toolChains; // prioritized List @@ -186,11 +185,6 @@ ToolChain *ToolChainManager::findToolChain(const QByteArray &id) return tc; } -FilePath ToolChainManager::defaultDebugger(const Abi &abi) -{ - return d->m_abiToDebugger.value(abi.toString()); -} - bool ToolChainManager::isLoaded() { return bool(d->m_accessor); diff --git a/src/plugins/projectexplorer/toolchainmanager.h b/src/plugins/projectexplorer/toolchainmanager.h index 4de51c2b2a6..894ec71da29 100644 --- a/src/plugins/projectexplorer/toolchainmanager.h +++ b/src/plugins/projectexplorer/toolchainmanager.h @@ -68,8 +68,6 @@ public: static QList findToolChains(const Abi &abi); static ToolChain *findToolChain(const QByteArray &id); - static Utils::FilePath defaultDebugger(const Abi &abi); - static bool isLoaded(); static bool registerToolChain(ToolChain *tc);