Core/Utils: Migrate further to Utils::Id

The coreplugin/id.h header is kept for downstream for now.

Change-Id: I8c44590f7b988b3770ecdc177c40783e12353e66
(cherry picked from commit 430a33dcd9ac80ddb848e41f8f059102857c88aa)
Reviewed-by: Eike Ziller <[email protected]>

15 files changed, 24 insertions, 25 deletions

diff --git a/src/plugins/baremetal/baremetaldeviceconfigurationwizard.cpp b/src/plugins/baremetal/baremetaldeviceconfigurationwizard.cpp
index 1912a3e059d..2555b9f5914 100644
--- a/src/plugins/baremetal/baremetaldeviceconfigurationwizard.cpp
+++ b/src/plugins/baremetal/baremetaldeviceconfigurationwizard.cpp
@@ -48,7 +48,7 @@ BareMetalDeviceConfigurationWizard::BareMetalDeviceConfigurationWizard(QWidget *
 ProjectExplorer::IDevice::Ptr BareMetalDeviceConfigurationWizard::device() const
 {
     const auto dev = BareMetalDevice::create();
-    dev->setupId(ProjectExplorer::IDevice::ManuallyAdded, Core::Id());
+    dev->setupId(ProjectExplorer::IDevice::ManuallyAdded, Utils::Id());
     dev->setDisplayName(m_setupPage->configurationName());
     dev->setType(Constants::BareMetalOsType);
     dev->setMachineType(ProjectExplorer::IDevice::Hardware);
diff --git a/src/plugins/baremetal/baremetalrunconfiguration.cpp b/src/plugins/baremetal/baremetalrunconfiguration.cpp
index 646691ff2c3..6a38e5d96e4 100644
--- a/src/plugins/baremetal/baremetalrunconfiguration.cpp
+++ b/src/plugins/baremetal/baremetalrunconfiguration.cpp
@@ -45,7 +45,7 @@ class BareMetalRunConfiguration final : public RunConfiguration
     Q_DECLARE_TR_FUNCTIONS(BareMetal::Internal::BareMetalRunConfiguration)
 
 public:
-    explicit BareMetalRunConfiguration(Target *target, Core::Id id)
+    explicit BareMetalRunConfiguration(Target *target, Utils::Id id)
         : RunConfiguration(target, id)
     {
         const auto exeAspect = addAspect<ExecutableAspect>();
@@ -69,7 +69,7 @@ class BareMetalCustomRunConfiguration final : public RunConfiguration
     Q_DECLARE_TR_FUNCTIONS(BareMetal::Internal::BareMetalCustomRunConfiguration)
 
 public:
-    explicit BareMetalCustomRunConfiguration(Target *target, Core::Id id)
+    explicit BareMetalCustomRunConfiguration(Target *target, Utils::Id id)
         : RunConfiguration(target, id)
     {
         const auto exeAspect = addAspect<ExecutableAspect>();
diff --git a/src/plugins/baremetal/iarewparser.cpp b/src/plugins/baremetal/iarewparser.cpp
index 01ce9de32ed..314c4714004 100644
--- a/src/plugins/baremetal/iarewparser.cpp
+++ b/src/plugins/baremetal/iarewparser.cpp
@@ -54,7 +54,7 @@ IarParser::IarParser()
     setObjectName("IarParser");
 }
 
-Core::Id IarParser::id()
+Utils::Id IarParser::id()
 {
     return "BareMetal.OutputParser.Iar";
 }
diff --git a/src/plugins/baremetal/iarewparser.h b/src/plugins/baremetal/iarewparser.h
index 92b38bd26fa..d611c2ecd33 100644
--- a/src/plugins/baremetal/iarewparser.h
+++ b/src/plugins/baremetal/iarewparser.h
@@ -39,7 +39,7 @@ class IarParser final : public ProjectExplorer::OutputTaskParser
 
 public:
     explicit IarParser();
-    static Core::Id id();
+    static Utils::Id id();
 
 private:
     void newTask(const ProjectExplorer::Task &task);
diff --git a/src/plugins/baremetal/iarewtoolchain.cpp b/src/plugins/baremetal/iarewtoolchain.cpp
index 7c6f81fa845..84b57d4db69 100644
--- a/src/plugins/baremetal/iarewtoolchain.cpp
+++ b/src/plugins/baremetal/iarewtoolchain.cpp
@@ -89,7 +89,7 @@ static QString cppLanguageOption(const FilePath &compiler)
 }
 
 static Macros dumpPredefinedMacros(const FilePath &compiler, const QStringList &extraArgs,
-                                   const Core::Id languageId, const QStringList &env)
+                                   const Utils::Id languageId, const QStringList &env)
 {
     if (compiler.isEmpty() || !compiler.toFileInfo().isExecutable())
         return {};
@@ -130,7 +130,7 @@ static Macros dumpPredefinedMacros(const FilePath &compiler, const QStringList &
     return Macro::toMacros(output);
 }
 
-static HeaderPaths dumpHeaderPaths(const FilePath &compiler, const Core::Id languageId,
+static HeaderPaths dumpHeaderPaths(const FilePath &compiler, const Utils::Id languageId,
                                    const QStringList &env)
 {
     if (!compiler.exists())
@@ -280,7 +280,7 @@ static Abi guessAbi(const Macros &macros)
             guessFormat(arch), guessWordWidth(macros)};
 }
 
-static QString buildDisplayName(Abi::Architecture arch, Core::Id language,
+static QString buildDisplayName(Abi::Architecture arch, Utils::Id language,
                                 const QString &version)
 {
     const auto archName = Abi::toString(arch);
@@ -320,7 +320,7 @@ ToolChain::MacroInspectionRunner IarToolChain::createMacroInspectionRunner() con
     addToEnvironment(env);
 
     const Utils::FilePath compilerCommand = m_compilerCommand;
-    const Core::Id languageId = language();
+    const Utils::Id languageId = language();
     const QStringList extraArgs = m_extraCodeModelFlags;
     MacrosCache macrosCache = predefinedMacrosCache();
 
@@ -367,7 +367,7 @@ ToolChain::BuiltInHeaderPathsRunner IarToolChain::createBuiltInHeaderPathsRunner
     addToEnvironment(env);
 
     const Utils::FilePath compilerCommand = m_compilerCommand;
-    const Core::Id languageId = language();
+    const Utils::Id languageId = language();
 
     HeaderPathsCache headerPaths = headerPathsCache();
 
@@ -583,7 +583,7 @@ QList<ToolChain *> IarToolChainFactory::autoDetectToolchains(
 }
 
 QList<ToolChain *> IarToolChainFactory::autoDetectToolchain(
-        const Candidate &candidate, Core::Id languageId) const
+        const Candidate &candidate, Utils::Id languageId) const
 {
     const auto env = Environment::systemEnvironment();
     const Macros macros = dumpPredefinedMacros(candidate.compilerPath, {}, languageId,
diff --git a/src/plugins/baremetal/iarewtoolchain.h b/src/plugins/baremetal/iarewtoolchain.h
index 0486629539b..ffe3384908d 100644
--- a/src/plugins/baremetal/iarewtoolchain.h
+++ b/src/plugins/baremetal/iarewtoolchain.h
@@ -111,7 +111,7 @@ private:
     QList<ProjectExplorer::ToolChain *> autoDetectToolchains(const Candidates &candidates,
             const QList<ProjectExplorer::ToolChain *> &alreadyKnown) const;
     QList<ProjectExplorer::ToolChain *> autoDetectToolchain(
-            const Candidate &candidate, Core::Id languageId) const;
+            const Candidate &candidate, Utils::Id languageId) const;
 };
 
 // IarToolChainConfigWidget
diff --git a/src/plugins/baremetal/idebugserverprovider.h b/src/plugins/baremetal/idebugserverprovider.h
index 2045e054ed9..cf82d8c7b9b 100644
--- a/src/plugins/baremetal/idebugserverprovider.h
+++ b/src/plugins/baremetal/idebugserverprovider.h
@@ -25,7 +25,6 @@
 
 #pragma once
 
-#include <coreplugin/id.h>
 #include <debugger/debuggerconstants.h>
 #include <projectexplorer/abi.h>
 #include <utils/fileutils.h>
diff --git a/src/plugins/baremetal/keilparser.cpp b/src/plugins/baremetal/keilparser.cpp
index 5ee130073eb..d1589e87e95 100644
--- a/src/plugins/baremetal/keilparser.cpp
+++ b/src/plugins/baremetal/keilparser.cpp
@@ -56,7 +56,7 @@ KeilParser::KeilParser()
     setObjectName("KeilParser");
 }
 
-Core::Id KeilParser::id()
+Utils::Id KeilParser::id()
 {
     return "BareMetal.OutputParser.Keil";
 }
diff --git a/src/plugins/baremetal/keilparser.h b/src/plugins/baremetal/keilparser.h
index 26fa00fdea9..f12bbee720d 100644
--- a/src/plugins/baremetal/keilparser.h
+++ b/src/plugins/baremetal/keilparser.h
@@ -39,7 +39,7 @@ class KeilParser final : public ProjectExplorer::OutputTaskParser
 
 public:
     explicit KeilParser();
-    static Core::Id id();
+    static Utils::Id id();
 
 private:
     void newTask(const ProjectExplorer::Task &task);
diff --git a/src/plugins/baremetal/keiltoolchain.cpp b/src/plugins/baremetal/keiltoolchain.cpp
index 208752f3468..96cef9a5830 100644
--- a/src/plugins/baremetal/keiltoolchain.cpp
+++ b/src/plugins/baremetal/keiltoolchain.cpp
@@ -404,7 +404,7 @@ static Abi guessAbi(const Macros &macros)
                 guessFormat(arch), guessWordWidth(macros, arch)};
 }
 
-static QString buildDisplayName(Abi::Architecture arch, Core::Id language,
+static QString buildDisplayName(Abi::Architecture arch, Utils::Id language,
                                 const QString &version)
 {
     const auto archName = Abi::toString(arch);
@@ -459,7 +459,7 @@ ToolChain::MacroInspectionRunner KeilToolChain::createMacroInspectionRunner() co
     addToEnvironment(env);
 
     const Utils::FilePath compilerCommand = m_compilerCommand;
-    const Core::Id lang = language();
+    const Utils::Id lang = language();
 
     MacrosCache macroCache = predefinedMacrosCache();
     const QStringList extraArgs = m_extraCodeModelFlags;
@@ -734,7 +734,7 @@ QList<ToolChain *> KeilToolChainFactory::autoDetectToolchains(
 }
 
 QList<ToolChain *> KeilToolChainFactory::autoDetectToolchain(
-        const Candidate &candidate, Core::Id language) const
+        const Candidate &candidate, Utils::Id language) const
 {
     const auto env = Environment::systemEnvironment();
 
diff --git a/src/plugins/baremetal/keiltoolchain.h b/src/plugins/baremetal/keiltoolchain.h
index d9f85d33f60..63e527d937e 100644
--- a/src/plugins/baremetal/keiltoolchain.h
+++ b/src/plugins/baremetal/keiltoolchain.h
@@ -112,7 +112,7 @@ private:
     QList<ProjectExplorer::ToolChain *> autoDetectToolchains(const Candidates &candidates,
                                                              const QList<ProjectExplorer::ToolChain *> &alreadyKnown) const;
     QList<ProjectExplorer::ToolChain *> autoDetectToolchain(
-            const Candidate &candidate, Core::Id language) const;
+            const Candidate &candidate, Utils::Id language) const;
 };
 
 // KeilToolchainConfigWidget
diff --git a/src/plugins/baremetal/sdccparser.cpp b/src/plugins/baremetal/sdccparser.cpp
index 5a6b23c0d0c..4c2409b2140 100644
--- a/src/plugins/baremetal/sdccparser.cpp
+++ b/src/plugins/baremetal/sdccparser.cpp
@@ -56,7 +56,7 @@ SdccParser::SdccParser()
     setObjectName("SdccParser");
 }
 
-Core::Id SdccParser::id()
+Utils::Id SdccParser::id()
 {
     return "BareMetal.OutputParser.Sdcc";
 }
diff --git a/src/plugins/baremetal/sdccparser.h b/src/plugins/baremetal/sdccparser.h
index 0b92b702258..9ca009a196c 100644
--- a/src/plugins/baremetal/sdccparser.h
+++ b/src/plugins/baremetal/sdccparser.h
@@ -39,7 +39,7 @@ class SdccParser final : public ProjectExplorer::OutputTaskParser
 
 public:
     explicit SdccParser();
-    static Core::Id id();
+    static Utils::Id id();
 
 private:
     void newTask(const ProjectExplorer::Task &task);
diff --git a/src/plugins/baremetal/sdcctoolchain.cpp b/src/plugins/baremetal/sdcctoolchain.cpp
index 97db9a59103..aa701d08f09 100644
--- a/src/plugins/baremetal/sdcctoolchain.cpp
+++ b/src/plugins/baremetal/sdcctoolchain.cpp
@@ -197,7 +197,7 @@ static Abi guessAbi(const Macros &macros)
             guessFormat(arch), guessWordWidth(macros)};
 }
 
-static QString buildDisplayName(Abi::Architecture arch, Core::Id language,
+static QString buildDisplayName(Abi::Architecture arch, Utils::Id language,
                                 const QString &version)
 {
     const auto archName = Abi::toString(arch);
@@ -244,7 +244,7 @@ ToolChain::MacroInspectionRunner SdccToolChain::createMacroInspectionRunner() co
     addToEnvironment(env);
 
     const Utils::FilePath compilerCommand = m_compilerCommand;
-    const Core::Id lang = language();
+    const Utils::Id lang = language();
     const Abi abi = m_targetAbi;
 
     MacrosCache macrosCache = predefinedMacrosCache();
@@ -458,7 +458,7 @@ QList<ToolChain *> SdccToolChainFactory::autoDetectToolchains(
 }
 
 QList<ToolChain *> SdccToolChainFactory::autoDetectToolchain(
-        const Candidate &candidate, Core::Id language) const
+        const Candidate &candidate, Utils::Id language) const
 {
     const auto env = Environment::systemEnvironment();
 
diff --git a/src/plugins/baremetal/sdcctoolchain.h b/src/plugins/baremetal/sdcctoolchain.h
index 09aff331afb..c888b15bd26 100644
--- a/src/plugins/baremetal/sdcctoolchain.h
+++ b/src/plugins/baremetal/sdcctoolchain.h
@@ -107,7 +107,7 @@ private:
     QList<ProjectExplorer::ToolChain *> autoDetectToolchains(const Candidates &candidates,
             const QList<ProjectExplorer::ToolChain *> &alreadyKnown) const;
     QList<ProjectExplorer::ToolChain *> autoDetectToolchain(
-            const Candidate &candidate, Core::Id language) const;
+            const Candidate &candidate, Utils::Id language) const;
 };
 
 // SdccToolChainConfigWidget