RemoteLinux: Make disk space check step extensible.

Also fix cloning.

Change-Id: I32db1fd2a98486e2871c01d4c0f9aebd2f262924
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@nokia.com>

2 files changed, 10 insertions, 6 deletions

diff --git a/src/plugins/remotelinux/remotelinuxcheckforfreediskspacestep.cpp b/src/plugins/remotelinux/remotelinuxcheckforfreediskspacestep.cpp
index 81afdbedd4..738d8aaf34 100644
--- a/src/plugins/remotelinux/remotelinuxcheckforfreediskspacestep.cpp
+++ b/src/plugins/remotelinux/remotelinuxcheckforfreediskspacestep.cpp
@@ -95,16 +95,20 @@ public:
 } // namespace Internal
 
 
-RemoteLinuxCheckForFreeDiskSpaceStep::RemoteLinuxCheckForFreeDiskSpaceStep(BuildStepList *bsl)
-        : AbstractRemoteLinuxDeployStep(bsl, stepId())
+RemoteLinuxCheckForFreeDiskSpaceStep::RemoteLinuxCheckForFreeDiskSpaceStep(BuildStepList *bsl, Core::Id id)
+        : AbstractRemoteLinuxDeployStep(bsl, id)
 {
     ctor();
+    setPathToCheck(QLatin1String("/"));
+    setRequiredSpaceInBytes(5*1024*1024);
 }
 
 RemoteLinuxCheckForFreeDiskSpaceStep::RemoteLinuxCheckForFreeDiskSpaceStep(BuildStepList *bsl,
         RemoteLinuxCheckForFreeDiskSpaceStep *other) : AbstractRemoteLinuxDeployStep(bsl, other)
 {
     ctor();
+    setPathToCheck(other->pathToCheck());
+    setRequiredSpaceInBytes(other->requiredSpaceInBytes());
 }
 
 RemoteLinuxCheckForFreeDiskSpaceStep::~RemoteLinuxCheckForFreeDiskSpaceStep()
@@ -116,8 +120,6 @@ void RemoteLinuxCheckForFreeDiskSpaceStep::ctor()
 {
     d = new Internal::RemoteLinuxCheckForFreeDiskSpaceStepPrivate;
     setDefaultDisplayName(stepDisplayName());
-    d->pathToCheck = QLatin1String("/");
-    d->requiredSpaceInBytes = 5*1024*1024;
 }
 
 void RemoteLinuxCheckForFreeDiskSpaceStep::setPathToCheck(const QString &path)
diff --git a/src/plugins/remotelinux/remotelinuxcheckforfreediskspacestep.h b/src/plugins/remotelinux/remotelinuxcheckforfreediskspacestep.h
index 561a95704a..26c342c070 100644
--- a/src/plugins/remotelinux/remotelinuxcheckforfreediskspacestep.h
+++ b/src/plugins/remotelinux/remotelinuxcheckforfreediskspacestep.h
@@ -41,7 +41,8 @@ class REMOTELINUX_EXPORT RemoteLinuxCheckForFreeDiskSpaceStep : public AbstractR
 {
     Q_OBJECT
 public:
-    explicit RemoteLinuxCheckForFreeDiskSpaceStep(ProjectExplorer::BuildStepList *bsl);
+    explicit RemoteLinuxCheckForFreeDiskSpaceStep(ProjectExplorer::BuildStepList *bsl,
+            Core::Id id = stepId());
     RemoteLinuxCheckForFreeDiskSpaceStep(ProjectExplorer::BuildStepList *bsl,
             RemoteLinuxCheckForFreeDiskSpaceStep *other);
     ~RemoteLinuxCheckForFreeDiskSpaceStep();
@@ -55,7 +56,7 @@ public:
     static Core::Id stepId();
     static QString stepDisplayName();
 
-private:
+protected:
     bool fromMap(const QVariantMap &map);
     QVariantMap toMap() const;
     ProjectExplorer::BuildStepConfigWidget *createConfigWidget();
@@ -63,6 +64,7 @@ private:
     bool initInternal(QString *error);
     AbstractRemoteLinuxDeployService *deployService() const;
 
+private:
     void ctor();
 
     Internal::RemoteLinuxCheckForFreeDiskSpaceStepPrivate *d;