From a421ff226538e1d978c86bb13d39ddd138e29d21 Mon Sep 17 00:00:00 2001 From: hjk Date: Wed, 8 May 2019 17:55:10 +0200 Subject: [PATCH] ProjectExplorer: Remove ToolChain::canClone() Was returning true in all cases. Change-Id: Iafbafbf44a0b631b83e768c75f963e1bb7821a25 Reviewed-by: Oliver Wolff --- src/plugins/projectexplorer/msvctoolchain.cpp | 5 ----- src/plugins/projectexplorer/msvctoolchain.h | 1 - src/plugins/projectexplorer/toolchain.cpp | 5 ----- src/plugins/projectexplorer/toolchain.h | 1 - src/plugins/projectexplorer/toolchainoptionspage.cpp | 2 +- 5 files changed, 1 insertion(+), 13 deletions(-) diff --git a/src/plugins/projectexplorer/msvctoolchain.cpp b/src/plugins/projectexplorer/msvctoolchain.cpp index 4d40a47d5e9..643fc6f7d13 100644 --- a/src/plugins/projectexplorer/msvctoolchain.cpp +++ b/src/plugins/projectexplorer/msvctoolchain.cpp @@ -1000,11 +1000,6 @@ std::unique_ptr MsvcToolChain::createConfigurationWidget( return std::make_unique(this); } -bool MsvcToolChain::canClone() const -{ - return true; -} - ToolChain *MsvcToolChain::clone() const { return new MsvcToolChain(*this); diff --git a/src/plugins/projectexplorer/msvctoolchain.h b/src/plugins/projectexplorer/msvctoolchain.h index 3dee7ac7e76..608a1743c8b 100644 --- a/src/plugins/projectexplorer/msvctoolchain.h +++ b/src/plugins/projectexplorer/msvctoolchain.h @@ -79,7 +79,6 @@ public: std::unique_ptr createConfigurationWidget() override; - bool canClone() const override; ToolChain *clone() const override; MacroInspectionRunner createMacroInspectionRunner() const override; diff --git a/src/plugins/projectexplorer/toolchain.cpp b/src/plugins/projectexplorer/toolchain.cpp index 841d62c37ce..3cbb4c3e8d6 100644 --- a/src/plugins/projectexplorer/toolchain.cpp +++ b/src/plugins/projectexplorer/toolchain.cpp @@ -197,11 +197,6 @@ Core::Id ToolChain::language() const return d->m_language; } -bool ToolChain::canClone() const -{ - return true; -} - bool ToolChain::operator == (const ToolChain &tc) const { if (this == &tc) diff --git a/src/plugins/projectexplorer/toolchain.h b/src/plugins/projectexplorer/toolchain.h index c1d9fbde40b..37e903a2279 100644 --- a/src/plugins/projectexplorer/toolchain.h +++ b/src/plugins/projectexplorer/toolchain.h @@ -146,7 +146,6 @@ public: virtual bool operator ==(const ToolChain &) const; virtual std::unique_ptr createConfigurationWidget() = 0; - virtual bool canClone() const; virtual ToolChain *clone() const = 0; // Used by the toolchainmanager to save user-generated tool chains. diff --git a/src/plugins/projectexplorer/toolchainoptionspage.cpp b/src/plugins/projectexplorer/toolchainoptionspage.cpp index a7b763d888e..a92ebe1e0fb 100644 --- a/src/plugins/projectexplorer/toolchainoptionspage.cpp +++ b/src/plugins/projectexplorer/toolchainoptionspage.cpp @@ -543,7 +543,7 @@ void ToolChainOptionsWidget::updateState() bool canDelete = false; if (ToolChainTreeItem *item = currentTreeItem()) { ToolChain *tc = item->toolChain; - canCopy = tc->isValid() && tc->canClone(); + canCopy = tc->isValid(); canDelete = tc->detection() != ToolChain::AutoDetection; }