SSH: Improve SshRemoteProcessRunner API.

It's silly that we fix the connection parameters in the constructor. A
given object of the class, once created, should be able to repeatedly
run any command with any connection.

Change-Id: Ia45b9d5b6f25c25fb46751cdb47cf81877d8f9a9
Reviewed-by: Christian Kandeler <christian.kandeler@nokia.com>

1 files changed, 5 insertions, 5 deletions

diff --git a/src/plugins/remotelinux/remotelinuxcustomcommanddeployservice.cpp b/src/plugins/remotelinux/remotelinuxcustomcommanddeployservice.cpp
index a197e380ac..c32ae14e0d 100644
--- a/src/plugins/remotelinux/remotelinuxcustomcommanddeployservice.cpp
+++ b/src/plugins/remotelinux/remotelinuxcustomcommanddeployservice.cpp
@@ -31,6 +31,8 @@
 **************************************************************************/
 #include "remotelinuxcustomcommanddeployservice.h"
 
+#include "linuxdeviceconfiguration.h"
+
 #include <utils/qtcassert.h>
 #include <utils/ssh/sshremoteprocessrunner.h>
 
@@ -95,8 +97,8 @@ void RemoteLinuxCustomCommandDeployService::doDeploy()
 {
     QTC_ASSERT(d->state == Inactive, handleDeploymentDone());
 
-    delete d->runner;
-    d->runner = new SshRemoteProcessRunner(connection(), this);
+    if (!d->runner)
+        d->runner = new SshRemoteProcessRunner(this);
     connect(d->runner, SIGNAL(processOutputAvailable(QByteArray)),
         SLOT(handleStdout(QByteArray)));
     connect(d->runner, SIGNAL(processErrorOutputAvailable(QByteArray)),
@@ -105,7 +107,7 @@ void RemoteLinuxCustomCommandDeployService::doDeploy()
 
     emit progressMessage(tr("Starting remote command '%1'...").arg(d->commandLine));
     d->state = Running;
-    d->runner->run(d->commandLine.toUtf8());
+    d->runner->run(d->commandLine.toUtf8(), deviceConfiguration()->sshParameters());
 }
 
 void RemoteLinuxCustomCommandDeployService::stopDeployment()
@@ -114,8 +116,6 @@ void RemoteLinuxCustomCommandDeployService::stopDeployment()
 
     disconnect(d->runner, 0, this, 0);
     d->runner->process()->closeChannel();
-    delete d->runner;
-    d->runner = 0;
     d->state = Inactive;
     handleDeploymentDone();
 }