Refactor deployment

 * Add a DeployConfiguration class to hold settings related
   to deployment.
 * Add BuildStepsList to hold a list of buildsteps
 * Update BuildConfiguration to use BuildStepLists instead of
   manageing lists of buildsteps itself.
 * Update BuildManager to use BuildStepLists in its interfaces
 * Fix fallout introduced by API changes
 * Update .user file to new way of storing settings

Task-number: QTCREATORBUG-1427
Task-number: QTCREATORBUG-1428
Task-number: QTCREATORBUG-1811
Task-number: QTCREATORBUG-1930

1 files changed, 10 insertions, 17 deletions

diff --git a/src/plugins/genericprojectmanager/genericmakestep.h b/src/plugins/genericprojectmanager/genericmakestep.h
index 28e9e20d15f..1326e530055 100644
--- a/src/plugins/genericprojectmanager/genericmakestep.h
+++ b/src/plugins/genericprojectmanager/genericmakestep.h
@@ -54,7 +54,7 @@ class GenericMakeStep : public ProjectExplorer::AbstractProcessStep
     friend class GenericMakeStepFactory;
 
 public:
-    GenericMakeStep(ProjectExplorer::BuildConfiguration *bc);
+    GenericMakeStep(ProjectExplorer::BuildStepList *parent);
     virtual ~GenericMakeStep();
 
     GenericBuildConfiguration *genericBuildConfiguration() const;
@@ -73,8 +73,8 @@ public:
     QVariantMap toMap() const;
 
 protected:
-    GenericMakeStep(ProjectExplorer::BuildConfiguration *bc, GenericMakeStep *bs);
-    GenericMakeStep(ProjectExplorer::BuildConfiguration *bc, const QString &id);
+    GenericMakeStep(ProjectExplorer::BuildStepList *parent, GenericMakeStep *bs);
+    GenericMakeStep(ProjectExplorer::BuildStepList *parent, const QString &id);
     virtual bool fromMap(const QVariantMap &map);
 
 private:
@@ -113,27 +113,20 @@ public:
     explicit GenericMakeStepFactory(QObject *parent = 0);
     virtual ~GenericMakeStepFactory();
 
-    virtual bool canCreate(ProjectExplorer::BuildConfiguration *parent,
-                           ProjectExplorer::BuildStep::Type type,
+    virtual bool canCreate(ProjectExplorer::BuildStepList *parent,
                            const QString &id) const;
-    virtual ProjectExplorer::BuildStep *create(ProjectExplorer::BuildConfiguration *parent,
-                                               ProjectExplorer::BuildStep::Type type,
+    virtual ProjectExplorer::BuildStep *create(ProjectExplorer::BuildStepList *parent,
                                                const QString &id);
-    virtual bool canClone(ProjectExplorer::BuildConfiguration *parent,
-                          ProjectExplorer::BuildStep::Type type,
+    virtual bool canClone(ProjectExplorer::BuildStepList *parent,
                           ProjectExplorer::BuildStep *source) const;
-    virtual ProjectExplorer::BuildStep *clone(ProjectExplorer::BuildConfiguration *parent,
-                                              ProjectExplorer::BuildStep::Type type,
+    virtual ProjectExplorer::BuildStep *clone(ProjectExplorer::BuildStepList *parent,
                                               ProjectExplorer::BuildStep *source);
-    virtual bool canRestore(ProjectExplorer::BuildConfiguration *parent,
-                            ProjectExplorer::BuildStep::Type type,
+    virtual bool canRestore(ProjectExplorer::BuildStepList *parent,
                             const QVariantMap &map) const;
-    virtual ProjectExplorer::BuildStep *restore(ProjectExplorer::BuildConfiguration *parent,
-                                                ProjectExplorer::BuildStep::Type type,
+    virtual ProjectExplorer::BuildStep *restore(ProjectExplorer::BuildStepList *parent,
                                                 const QVariantMap &map);
 
-    virtual QStringList availableCreationIds(ProjectExplorer::BuildConfiguration *bc,
-                                             ProjectExplorer::BuildStep::Type type) const;
+    virtual QStringList availableCreationIds(ProjectExplorer::BuildStepList *bc) const;
     virtual QString displayNameForId(const QString &id) const;
 };