ProjectExplorer: Move setDisplayName code out of *ToolChain::create()

This sets the display name in the constructor now. In quite a few
places this will be directly overridden afterwards (either in
derived c'tor or in detectToolChains(), but this will help with
further changes:

The idea is to only leave  { return new ... } in the create()
implementation such the method can be de-virtualized as the base
ToolChainFactory::create is enough.

Change-Id: I1b15c015b6f3e2bbff682bee3fac626ed1bde312
Reviewed-by: David Schulz <david.schulz@qt.io>

1 files changed, 6 insertions, 5 deletions

diff --git a/src/plugins/projectexplorer/msvctoolchain.cpp b/src/plugins/projectexplorer/msvctoolchain.cpp
index 8e3a58b7fd..c2efe7dac6 100644
--- a/src/plugins/projectexplorer/msvctoolchain.cpp
+++ b/src/plugins/projectexplorer/msvctoolchain.cpp
@@ -845,7 +845,9 @@ static void addToAvailableMsvcToolchains(const MsvcToolChain *toolchain)
 
 MsvcToolChain::MsvcToolChain(Core::Id typeId)
     : ToolChain(typeId)
-{}
+{
+    setDisplayName("Microsoft Visual C++ Compiler");
+}
 
 void MsvcToolChain::inferWarningsForLevel(int warningLevel, WarningFlags &flags)
 {
@@ -1639,7 +1641,9 @@ void ClangClToolChainConfigWidget::makeReadOnlyImpl()
 
 ClangClToolChain::ClangClToolChain()
     : MsvcToolChain(Constants::CLANG_CL_TOOLCHAIN_TYPEID)
-{}
+{
+    setDisplayName("clang-cl");
+}
 
 bool ClangClToolChain::isValid() const
 {
@@ -2004,10 +2008,8 @@ QList<ToolChain *> ClangClToolChainFactory::autoDetect(const QList<ToolChain *>
 
 ToolChain *ClangClToolChainFactory::create()
 {
-    // FIXME: Looks odd. Shouldn't clang-cl be the path?
     auto tc = new ClangClToolChain;
     tc->setupVarsBat(Abi(), "", "");
-    tc->setDisplayName("clang-cl");
     return tc;
 }
 
@@ -2130,7 +2132,6 @@ ToolChain *MsvcToolChainFactory::create()
 {
     auto tc = new MsvcToolChain(Constants::MSVC_TOOLCHAIN_TYPEID);
     tc->setupVarsBat(Abi::hostAbi(), g_availableMsvcToolchains.first()->varsBat(), "");
-    tc->setDisplayName("Microsoft Visual C++ Compiler");
     return tc;
 }