ProjectExplorer: Use data member for ToolChain::typeDisplayName

Change-Id: Ia78ea3f8628b759706c5b024d687d917b203ec4d
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>

6 files changed, 3 insertions, 18 deletions

diff --git a/src/plugins/baremetal/iarewtoolchain.cpp b/src/plugins/baremetal/iarewtoolchain.cpp
index 253fcc2508..f18bcdaa8b 100644
--- a/src/plugins/baremetal/iarewtoolchain.cpp
+++ b/src/plugins/baremetal/iarewtoolchain.cpp
@@ -224,11 +224,8 @@ static QString buildDisplayName(Abi::Architecture arch, Core::Id language,
 
 IarToolChain::IarToolChain() :
     ToolChain(Constants::IAREW_TOOLCHAIN_TYPEID)
-{ }
-
-QString IarToolChain::typeDisplayName() const
 {
-    return Internal::IarToolChainFactory::tr("IAREW");
+    setTypeDisplayName(Internal::IarToolChainFactory::tr("IAREW"));
 }
 
 void IarToolChain::setTargetAbi(const Abi &abi)
diff --git a/src/plugins/baremetal/iarewtoolchain.h b/src/plugins/baremetal/iarewtoolchain.h
index 019c9e7185..035c4aa70e 100644
--- a/src/plugins/baremetal/iarewtoolchain.h
+++ b/src/plugins/baremetal/iarewtoolchain.h
@@ -52,8 +52,6 @@ class IarToolChain final : public ProjectExplorer::ToolChain
     Q_DECLARE_TR_FUNCTIONS(IarToolChain)
 
 public:
-    QString typeDisplayName() const final;
-
     void setTargetAbi(const ProjectExplorer::Abi &abi);
     ProjectExplorer::Abi targetAbi() const final;
 
diff --git a/src/plugins/baremetal/keiltoolchain.cpp b/src/plugins/baremetal/keiltoolchain.cpp
index 28863e0e66..3c4dea5179 100644
--- a/src/plugins/baremetal/keiltoolchain.cpp
+++ b/src/plugins/baremetal/keiltoolchain.cpp
@@ -238,11 +238,8 @@ static QString buildDisplayName(Abi::Architecture arch, Core::Id language,
 
 KeilToolchain::KeilToolchain() :
     ToolChain(Constants::KEIL_TOOLCHAIN_TYPEID)
-{ }
-
-QString KeilToolchain::typeDisplayName() const
 {
-    return Internal::KeilToolchainFactory::tr("KEIL");
+    setTypeDisplayName(Internal::KeilToolchainFactory::tr("KEIL"));
 }
 
 void KeilToolchain::setTargetAbi(const Abi &abi)
diff --git a/src/plugins/baremetal/keiltoolchain.h b/src/plugins/baremetal/keiltoolchain.h
index 5ccf9e05ff..3ebfa8a5f1 100644
--- a/src/plugins/baremetal/keiltoolchain.h
+++ b/src/plugins/baremetal/keiltoolchain.h
@@ -52,8 +52,6 @@ class KeilToolchain final : public ProjectExplorer::ToolChain
     Q_DECLARE_TR_FUNCTIONS(KeilToolchain)
 
 public:
-    QString typeDisplayName() const final;
-
     void setTargetAbi(const ProjectExplorer::Abi &abi);
     ProjectExplorer::Abi targetAbi() const final;
 
diff --git a/src/plugins/baremetal/sdcctoolchain.cpp b/src/plugins/baremetal/sdcctoolchain.cpp
index 277af6de12..9595bdeede 100644
--- a/src/plugins/baremetal/sdcctoolchain.cpp
+++ b/src/plugins/baremetal/sdcctoolchain.cpp
@@ -212,11 +212,8 @@ static Utils::FilePath compilerPathFromEnvironment(const QString &compilerName)
 
 SdccToolChain::SdccToolChain() :
     ToolChain(Constants::SDCC_TOOLCHAIN_TYPEID)
-{ }
-
-QString SdccToolChain::typeDisplayName() const
 {
-    return Internal::SdccToolChainFactory::tr("SDCC");
+    setTypeDisplayName(Internal::SdccToolChainFactory::tr("SDCC"));
 }
 
 void SdccToolChain::setTargetAbi(const Abi &abi)
diff --git a/src/plugins/baremetal/sdcctoolchain.h b/src/plugins/baremetal/sdcctoolchain.h
index 15ed599524..5bd4d1c428 100644
--- a/src/plugins/baremetal/sdcctoolchain.h
+++ b/src/plugins/baremetal/sdcctoolchain.h
@@ -52,8 +52,6 @@ class SdccToolChain final : public ProjectExplorer::ToolChain
     Q_DECLARE_TR_FUNCTIONS(SdccToolChain)
 
 public:
-    QString typeDisplayName() const final;
-
     void setTargetAbi(const ProjectExplorer::Abi &abi);
     ProjectExplorer::Abi targetAbi() const final;