From c95bde6f6a638ddf4197c1fb56968de8794c9b35 Mon Sep 17 00:00:00 2001
From: hjk <hjk@qt.io>
Date: Fri, 20 Dec 2019 17:05:30 +0100
Subject: 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>
---
 src/plugins/autotoolsprojectmanager/autogenstep.cpp    | 2 +-
 src/plugins/autotoolsprojectmanager/autogenstep.h      | 2 +-
 src/plugins/autotoolsprojectmanager/autoreconfstep.cpp | 4 ++--
 src/plugins/autotoolsprojectmanager/autoreconfstep.h   | 2 +-
 src/plugins/autotoolsprojectmanager/configurestep.cpp  | 4 ++--
 src/plugins/autotoolsprojectmanager/configurestep.h    | 2 +-
 src/plugins/autotoolsprojectmanager/makestep.cpp       | 4 ++--
 src/plugins/autotoolsprojectmanager/makestep.h         | 2 +-
 8 files changed, 11 insertions(+), 11 deletions(-)

(limited to 'src/plugins/autotoolsprojectmanager')

diff --git a/src/plugins/autotoolsprojectmanager/autogenstep.cpp b/src/plugins/autotoolsprojectmanager/autogenstep.cpp
index 2541c1169c0..0d3ef11ff70 100644
--- a/src/plugins/autotoolsprojectmanager/autogenstep.cpp
+++ b/src/plugins/autotoolsprojectmanager/autogenstep.cpp
@@ -54,7 +54,7 @@ AutogenStepFactory::AutogenStepFactory()
 
 // AutogenStep
 
-AutogenStep::AutogenStep(BuildStepList *bsl) : AbstractProcessStep(bsl, Constants::AUTOGEN_STEP_ID)
+AutogenStep::AutogenStep(BuildStepList *bsl, Core::Id id) : AbstractProcessStep(bsl, id)
 {
     setDefaultDisplayName(tr("Autogen"));
 
diff --git a/src/plugins/autotoolsprojectmanager/autogenstep.h b/src/plugins/autotoolsprojectmanager/autogenstep.h
index e11f01f39ba..b0e2c6c553a 100644
--- a/src/plugins/autotoolsprojectmanager/autogenstep.h
+++ b/src/plugins/autotoolsprojectmanager/autogenstep.h
@@ -64,7 +64,7 @@ class AutogenStep : public ProjectExplorer::AbstractProcessStep
     Q_OBJECT
 
 public:
-    explicit AutogenStep(ProjectExplorer::BuildStepList *bsl);
+    AutogenStep(ProjectExplorer::BuildStepList *bsl, Core::Id id);
 
 private:
     bool init() override;
diff --git a/src/plugins/autotoolsprojectmanager/autoreconfstep.cpp b/src/plugins/autotoolsprojectmanager/autoreconfstep.cpp
index eeb3da11187..40f43f2596d 100644
--- a/src/plugins/autotoolsprojectmanager/autoreconfstep.cpp
+++ b/src/plugins/autotoolsprojectmanager/autoreconfstep.cpp
@@ -51,8 +51,8 @@ AutoreconfStepFactory::AutoreconfStepFactory()
 
 // AutoreconfStep class
 
-AutoreconfStep::AutoreconfStep(BuildStepList *bsl)
-    : AbstractProcessStep(bsl, Constants::AUTORECONF_STEP_ID)
+AutoreconfStep::AutoreconfStep(BuildStepList *bsl, Core::Id id)
+    : AbstractProcessStep(bsl, id)
 {
     setDefaultDisplayName(tr("Autoreconf"));
 
diff --git a/src/plugins/autotoolsprojectmanager/autoreconfstep.h b/src/plugins/autotoolsprojectmanager/autoreconfstep.h
index 48348bb14ad..35ff0e6859d 100644
--- a/src/plugins/autotoolsprojectmanager/autoreconfstep.h
+++ b/src/plugins/autotoolsprojectmanager/autoreconfstep.h
@@ -64,7 +64,7 @@ class AutoreconfStep : public ProjectExplorer::AbstractProcessStep
     Q_OBJECT
 
 public:
-    explicit AutoreconfStep(ProjectExplorer::BuildStepList *bsl);
+    AutoreconfStep(ProjectExplorer::BuildStepList *bsl, Core::Id id);
 
     bool init() override;
     void doRun() override;
diff --git a/src/plugins/autotoolsprojectmanager/configurestep.cpp b/src/plugins/autotoolsprojectmanager/configurestep.cpp
index c722aa3a9fa..35d00a17cc2 100644
--- a/src/plugins/autotoolsprojectmanager/configurestep.cpp
+++ b/src/plugins/autotoolsprojectmanager/configurestep.cpp
@@ -70,8 +70,8 @@ ConfigureStepFactory::ConfigureStepFactory()
 
 // ConfigureStep
 
-ConfigureStep::ConfigureStep(BuildStepList *bsl)
-    : AbstractProcessStep(bsl, Constants::CONFIGURE_STEP_ID)
+ConfigureStep::ConfigureStep(BuildStepList *bsl, Core::Id id)
+    : AbstractProcessStep(bsl, id)
 {
     setDefaultDisplayName(tr("Configure"));
 
diff --git a/src/plugins/autotoolsprojectmanager/configurestep.h b/src/plugins/autotoolsprojectmanager/configurestep.h
index 380eb413c05..b2e15de1d6f 100644
--- a/src/plugins/autotoolsprojectmanager/configurestep.h
+++ b/src/plugins/autotoolsprojectmanager/configurestep.h
@@ -65,7 +65,7 @@ class ConfigureStep : public ProjectExplorer::AbstractProcessStep
     Q_OBJECT
 
 public:
-    explicit ConfigureStep(ProjectExplorer::BuildStepList *bsl);
+    ConfigureStep(ProjectExplorer::BuildStepList *bsl, Core::Id id);
 
     void setAdditionalArguments(const QString &list);
 
diff --git a/src/plugins/autotoolsprojectmanager/makestep.cpp b/src/plugins/autotoolsprojectmanager/makestep.cpp
index 7a7fbbddb3f..2905ca9597b 100644
--- a/src/plugins/autotoolsprojectmanager/makestep.cpp
+++ b/src/plugins/autotoolsprojectmanager/makestep.cpp
@@ -46,8 +46,8 @@ MakeStepFactory::MakeStepFactory()
 
 // MakeStep
 
-MakeStep::MakeStep(ProjectExplorer::BuildStepList *bsl)
-    : ProjectExplorer::MakeStep(bsl, MAKE_STEP_ID)
+MakeStep::MakeStep(ProjectExplorer::BuildStepList *bsl, Core::Id id)
+    : ProjectExplorer::MakeStep(bsl, id)
 {
     setAvailableBuildTargets({"all", "clean"});
     if (bsl->id() == ProjectExplorer::Constants::BUILDSTEPS_CLEAN) {
diff --git a/src/plugins/autotoolsprojectmanager/makestep.h b/src/plugins/autotoolsprojectmanager/makestep.h
index 77bc2c0be23..211913bb3f6 100644
--- a/src/plugins/autotoolsprojectmanager/makestep.h
+++ b/src/plugins/autotoolsprojectmanager/makestep.h
@@ -49,7 +49,7 @@ class MakeStep : public ProjectExplorer::MakeStep
     Q_OBJECT
 
 public:
-    explicit MakeStep(ProjectExplorer::BuildStepList *bsl);
+    MakeStep(ProjectExplorer::BuildStepList *bsl, Core::Id id);
 };
 
 } // namespace Internal
-- 
cgit v1.2.3