ProjectExplorer: Pass Id to BuildStep constructor

Allows to use constants in fewer places, similar to what e.g.
RunConfiguration does.

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

6 files changed, 9 insertions, 9 deletions

diff --git a/src/plugins/ios/iosbuildstep.cpp b/src/plugins/ios/iosbuildstep.cpp
index bbcc3937f6..c881e62267 100644
--- a/src/plugins/ios/iosbuildstep.cpp
+++ b/src/plugins/ios/iosbuildstep.cpp
@@ -163,8 +163,8 @@ private:
     QLineEdit *m_extraArgumentsLineEdit;
 };
 
-IosBuildStep::IosBuildStep(BuildStepList *parent) :
-    AbstractProcessStep(parent, IOS_BUILD_STEP_ID)
+IosBuildStep::IosBuildStep(BuildStepList *parent, Id id)
+    : AbstractProcessStep(parent, id)
 {
     setDefaultDisplayName(QCoreApplication::translate("GenericProjectManager::Internal::IosBuildStep",
                                                       IOS_BUILD_STEP_DISPLAY_NAME));
diff --git a/src/plugins/ios/iosbuildstep.h b/src/plugins/ios/iosbuildstep.h
index 22953d82f9..3f6145202c 100644
--- a/src/plugins/ios/iosbuildstep.h
+++ b/src/plugins/ios/iosbuildstep.h
@@ -45,7 +45,7 @@ class IosBuildStep : public ProjectExplorer::AbstractProcessStep
     friend class IosBuildStepFactory;
 
 public:
-    explicit IosBuildStep(ProjectExplorer::BuildStepList *parent);
+    IosBuildStep(ProjectExplorer::BuildStepList *parent, Core::Id id);
 
     ProjectExplorer::BuildStepConfigWidget *createConfigWidget() override;
     void setBaseArguments(const QStringList &args);
diff --git a/src/plugins/ios/iosdeploystep.cpp b/src/plugins/ios/iosdeploystep.cpp
index 0ef6dd8593..4e35c0a837 100644
--- a/src/plugins/ios/iosdeploystep.cpp
+++ b/src/plugins/ios/iosdeploystep.cpp
@@ -55,8 +55,8 @@ using namespace Utils;
 namespace Ios {
 namespace Internal {
 
-IosDeployStep::IosDeployStep(BuildStepList *parent)
-    : BuildStep(parent, stepId())
+IosDeployStep::IosDeployStep(BuildStepList *parent, Core::Id id)
+    : BuildStep(parent, id)
 {
     setImmutable(true);
     updateDisplayNames();
diff --git a/src/plugins/ios/iosdeploystep.h b/src/plugins/ios/iosdeploystep.h
index cff9eaab72..1be492b954 100644
--- a/src/plugins/ios/iosdeploystep.h
+++ b/src/plugins/ios/iosdeploystep.h
@@ -50,7 +50,7 @@ public:
     };
 
     friend class IosDeployStepFactory;
-    explicit IosDeployStep(ProjectExplorer::BuildStepList *bc);
+    IosDeployStep(ProjectExplorer::BuildStepList *bc, Core::Id id);
     static Core::Id stepId();
 
     void cleanup();
diff --git a/src/plugins/ios/iosdsymbuildstep.cpp b/src/plugins/ios/iosdsymbuildstep.cpp
index cf4e258693..a597f9b0d6 100644
--- a/src/plugins/ios/iosdsymbuildstep.cpp
+++ b/src/plugins/ios/iosdsymbuildstep.cpp
@@ -59,8 +59,8 @@ static const char COMMAND_PARTIAL_KEY[] = ".Command";
 static const char ARGUMENTS_PARTIAL_KEY[] = ".Arguments";
 static const char CLEAN_PARTIAL_KEY[] = ".Clean";
 
-IosDsymBuildStep::IosDsymBuildStep(BuildStepList *parent) :
-    AbstractProcessStep(parent, Constants::IOS_DSYM_BUILD_STEP_ID),
+IosDsymBuildStep::IosDsymBuildStep(BuildStepList *parent, Id id) :
+    AbstractProcessStep(parent, id),
     m_clean(parent->id() == ProjectExplorer::Constants::BUILDSTEPS_CLEAN)
 {
 }
diff --git a/src/plugins/ios/iosdsymbuildstep.h b/src/plugins/ios/iosdsymbuildstep.h
index 1d03205e34..effc6e5f91 100644
--- a/src/plugins/ios/iosdsymbuildstep.h
+++ b/src/plugins/ios/iosdsymbuildstep.h
@@ -42,7 +42,7 @@ class IosDsymBuildStep : public ProjectExplorer::AbstractProcessStep
     friend class IosDsymBuildStepConfigWidget;
 
 public:
-    IosDsymBuildStep(ProjectExplorer::BuildStepList *parent);
+    IosDsymBuildStep(ProjectExplorer::BuildStepList *parent, Core::Id id);
 
     ProjectExplorer::BuildStepConfigWidget *createConfigWidget() override;
     void setArguments(const QStringList &args);