Core/Utils: Migrate further to Utils::Id

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

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

5 files changed, 9 insertions, 9 deletions

diff --git a/src/plugins/autotoolsprojectmanager/autogenstep.cpp b/src/plugins/autotoolsprojectmanager/autogenstep.cpp
index 89d828d60a..3b093dc36a 100644
--- a/src/plugins/autotoolsprojectmanager/autogenstep.cpp
+++ b/src/plugins/autotoolsprojectmanager/autogenstep.cpp
@@ -60,7 +60,7 @@ class AutogenStep : public AbstractProcessStep
     Q_DECLARE_TR_FUNCTIONS(AutotoolsProjectManager::Internal::AutogenStep)
 
 public:
-    AutogenStep(BuildStepList *bsl, Core::Id id);
+    AutogenStep(BuildStepList *bsl, Utils::Id id);
 
 private:
     bool init() override;
@@ -70,7 +70,7 @@ private:
     bool m_runAutogen = false;
 };
 
-AutogenStep::AutogenStep(BuildStepList *bsl, Core::Id id) : AbstractProcessStep(bsl, id)
+AutogenStep::AutogenStep(BuildStepList *bsl, Utils::Id id) : AbstractProcessStep(bsl, id)
 {
     setDefaultDisplayName(tr("Autogen"));
 
diff --git a/src/plugins/autotoolsprojectmanager/autoreconfstep.cpp b/src/plugins/autotoolsprojectmanager/autoreconfstep.cpp
index 3be62f4e71..78b93fb107 100644
--- a/src/plugins/autotoolsprojectmanager/autoreconfstep.cpp
+++ b/src/plugins/autotoolsprojectmanager/autoreconfstep.cpp
@@ -57,7 +57,7 @@ class AutoreconfStep : public AbstractProcessStep
     Q_DECLARE_TR_FUNCTIONS(AutotoolsProjectManager::Internal::AutoreconfStep)
 
 public:
-    AutoreconfStep(BuildStepList *bsl, Core::Id id);
+    AutoreconfStep(BuildStepList *bsl, Utils::Id id);
 
     bool init() override;
     void doRun() override;
@@ -67,7 +67,7 @@ private:
     bool m_runAutoreconf = false;
 };
 
-AutoreconfStep::AutoreconfStep(BuildStepList *bsl, Core::Id id)
+AutoreconfStep::AutoreconfStep(BuildStepList *bsl, Utils::Id id)
     : AbstractProcessStep(bsl, id)
 {
     setDefaultDisplayName(tr("Autoreconf"));
diff --git a/src/plugins/autotoolsprojectmanager/autotoolsbuildconfiguration.cpp b/src/plugins/autotoolsprojectmanager/autotoolsbuildconfiguration.cpp
index 56d22a52ed..346e19ff72 100644
--- a/src/plugins/autotoolsprojectmanager/autotoolsbuildconfiguration.cpp
+++ b/src/plugins/autotoolsprojectmanager/autotoolsbuildconfiguration.cpp
@@ -48,7 +48,7 @@ class AutotoolsBuildConfiguration : public BuildConfiguration
     Q_DECLARE_TR_FUNCTIONS(AutotoolsProjectManager::Internal::AutotoolsBuildConfiguration)
 
 public:
-    AutotoolsBuildConfiguration(Target *target, Core::Id id)
+    AutotoolsBuildConfiguration(Target *target, Utils::Id id)
         : BuildConfiguration(target, id)
     {
         // /<foobar> is used so the un-changed check in setBuildDirectory() works correctly.
diff --git a/src/plugins/autotoolsprojectmanager/configurestep.cpp b/src/plugins/autotoolsprojectmanager/configurestep.cpp
index 737840ef19..d418c9c42b 100644
--- a/src/plugins/autotoolsprojectmanager/configurestep.cpp
+++ b/src/plugins/autotoolsprojectmanager/configurestep.cpp
@@ -77,7 +77,7 @@ class ConfigureStep : public ProjectExplorer::AbstractProcessStep
     Q_DECLARE_TR_FUNCTIONS(AutotoolsProjectManager::Internal::ConfigureStep)
 
 public:
-    ConfigureStep(BuildStepList *bsl, Core::Id id);
+    ConfigureStep(BuildStepList *bsl, Utils::Id id);
 
     void setAdditionalArguments(const QString &list);
 
@@ -89,7 +89,7 @@ private:
     bool m_runConfigure = false;
 };
 
-ConfigureStep::ConfigureStep(BuildStepList *bsl, Core::Id id)
+ConfigureStep::ConfigureStep(BuildStepList *bsl, Utils::Id id)
     : AbstractProcessStep(bsl, id)
 {
     setDefaultDisplayName(tr("Configure"));
diff --git a/src/plugins/autotoolsprojectmanager/makestep.cpp b/src/plugins/autotoolsprojectmanager/makestep.cpp
index 2ab3d684b4..7775ebdbc9 100644
--- a/src/plugins/autotoolsprojectmanager/makestep.cpp
+++ b/src/plugins/autotoolsprojectmanager/makestep.cpp
@@ -41,10 +41,10 @@ namespace Internal {
 class MakeStep : public ProjectExplorer::MakeStep
 {
 public:
-    MakeStep(ProjectExplorer::BuildStepList *bsl, Core::Id id);
+    MakeStep(ProjectExplorer::BuildStepList *bsl, Utils::Id id);
 };
 
-MakeStep::MakeStep(ProjectExplorer::BuildStepList *bsl, Core::Id id)
+MakeStep::MakeStep(ProjectExplorer::BuildStepList *bsl, Utils::Id id)
     : ProjectExplorer::MakeStep(bsl, id)
 {
     setAvailableBuildTargets({"all", "clean"});