Adapt to rename of ProjectExplorer constants

QtC change: https://codereview.qt-project.org/#/c/120930/

Change-Id: I5af573d58f13dfc50e9dd003cb652d785e8c8347
Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>

3 files changed, 9 insertions, 9 deletions

diff --git a/plugins/clangstaticanalyzer/clangstaticanalyzerruncontrol.cpp b/plugins/clangstaticanalyzer/clangstaticanalyzerruncontrol.cpp
index 6403e5f1c8..20ac43d393 100644
--- a/plugins/clangstaticanalyzer/clangstaticanalyzerruncontrol.cpp
+++ b/plugins/clangstaticanalyzer/clangstaticanalyzerruncontrol.cpp
@@ -144,14 +144,14 @@ public:
         // will break if code actually requires stuff from there, but that should be the less common
         // case.
         const Core::Id type = projectPart->toolchainType;
-        if (type == ProjectExplorer::Constants::MINGW_TOOLCHAIN_ID
-                || type == ProjectExplorer::Constants::GCC_TOOLCHAIN_ID)
+        if (type == ProjectExplorer::Constants::MINGW_TOOLCHAIN_TYPEID
+                || type == ProjectExplorer::Constants::GCC_TOOLCHAIN_TYPEID)
             optionsBuilder.addDefine("#define _X86INTRIN_H_INCLUDED\n");
 
         optionsBuilder.addToolchainAndProjectDefines();
         optionsBuilder.addHeaderPathOptions();
 
-        if (type == ProjectExplorer::Constants::MSVC_TOOLCHAIN_ID)
+        if (type == ProjectExplorer::Constants::MSVC_TOOLCHAIN_TYPEID)
             optionsBuilder.add(QLatin1String("/EHsc")); // clang-cl does not understand exceptions
         else
             optionsBuilder.add(QLatin1String("-fPIC")); // TODO: Remove?
@@ -164,7 +164,7 @@ public:
 private:
     ClangStaticAnalyzerOptionsBuilder(const CppTools::ProjectPart::Ptr &projectPart)
         : CompilerOptionsBuilder(projectPart)
-        , m_isMsvcToolchain(m_projectPart->toolchainType == ProjectExplorer::Constants::MSVC_TOOLCHAIN_ID)
+        , m_isMsvcToolchain(m_projectPart->toolchainType == ProjectExplorer::Constants::MSVC_TOOLCHAIN_TYPEID)
     {
     }
 
diff --git a/plugins/clangstaticanalyzer/clangstaticanalyzerruncontrolfactory.cpp b/plugins/clangstaticanalyzer/clangstaticanalyzerruncontrolfactory.cpp
index ef628959a9..7c2c61b8e8 100644
--- a/plugins/clangstaticanalyzer/clangstaticanalyzerruncontrolfactory.cpp
+++ b/plugins/clangstaticanalyzer/clangstaticanalyzerruncontrolfactory.cpp
@@ -63,10 +63,10 @@ bool ClangStaticAnalyzerRunControlFactory::canRun(RunConfiguration *runConfigura
     Kit *kit = target->kit();
     QTC_ASSERT(kit, return false);
     ToolChain *toolChain = ToolChainKitInformation::toolChain(kit);
-    return toolChain && (toolChain->typeId() == ProjectExplorer::Constants::CLANG_TOOLCHAIN_ID
-            || toolChain->typeId() == ProjectExplorer::Constants::GCC_TOOLCHAIN_ID
-            || toolChain->typeId() == ProjectExplorer::Constants::MINGW_TOOLCHAIN_ID
-            || toolChain->typeId() == ProjectExplorer::Constants::MSVC_TOOLCHAIN_ID);
+    return toolChain && (toolChain->typeId() == ProjectExplorer::Constants::CLANG_TOOLCHAIN_TYPEID
+            || toolChain->typeId() == ProjectExplorer::Constants::GCC_TOOLCHAIN_TYPEID
+            || toolChain->typeId() == ProjectExplorer::Constants::MINGW_TOOLCHAIN_TYPEID
+            || toolChain->typeId() == ProjectExplorer::Constants::MSVC_TOOLCHAIN_TYPEID);
 }
 
 RunControl *ClangStaticAnalyzerRunControlFactory::create(RunConfiguration *runConfiguration,
diff --git a/plugins/clangstaticanalyzer/clangstaticanalyzerutils.cpp b/plugins/clangstaticanalyzer/clangstaticanalyzerutils.cpp
index c3c68fa538..b3ba34da69 100644
--- a/plugins/clangstaticanalyzer/clangstaticanalyzerutils.cpp
+++ b/plugins/clangstaticanalyzer/clangstaticanalyzerutils.cpp
@@ -43,7 +43,7 @@ namespace Internal {
 QString clangExecutableFromSettings(Core::Id toolchainType, bool *isValid)
 {
     QString exeFromSettings = ClangStaticAnalyzerSettings::instance()->clangExecutable();
-    if (toolchainType == ProjectExplorer::Constants::MSVC_TOOLCHAIN_ID)
+    if (toolchainType == ProjectExplorer::Constants::MSVC_TOOLCHAIN_TYPEID)
         exeFromSettings.replace(QLatin1String("clang.exe"), QLatin1String("clang-cl.exe"));
     return clangExecutable(exeFromSettings, isValid);
 }