SSH: Streamline SshRemoteProcessRunner's output handling.

Make it just like SshRemoteProcess (and QProcess). The current
implementation annoyingly forces client code to establish additional
signal/slot connections, even if they only want to evaluate the output
at the end.

Change-Id: Id8c30dd156574d7d26d848d8e0705856a16d3747
Reviewed-by: hjk <qthjk@ovi.com>

1 files changed, 6 insertions, 8 deletions

diff --git a/src/plugins/remotelinux/remotelinuxcustomcommanddeployservice.cpp b/src/plugins/remotelinux/remotelinuxcustomcommanddeployservice.cpp
index 021755c6eb..e5595db2e3 100644
--- a/src/plugins/remotelinux/remotelinuxcustomcommanddeployservice.cpp
+++ b/src/plugins/remotelinux/remotelinuxcustomcommanddeployservice.cpp
@@ -99,10 +99,8 @@ void RemoteLinuxCustomCommandDeployService::doDeploy()
 
     if (!d->runner)
         d->runner = new SshRemoteProcessRunner(this);
-    connect(d->runner, SIGNAL(processOutputAvailable(QByteArray)),
-        SLOT(handleStdout(QByteArray)));
-    connect(d->runner, SIGNAL(processErrorOutputAvailable(QByteArray)),
-        SLOT(handleStderr(QByteArray)));
+    connect(d->runner, SIGNAL(readyReadStandardOutput()), SLOT(handleStdout()));
+    connect(d->runner, SIGNAL(readyReadStandardError()), SLOT(handleStderr()));
     connect(d->runner, SIGNAL(processClosed(int)), SLOT(handleProcessClosed(int)));
 
     emit progressMessage(tr("Starting remote command '%1'...").arg(d->commandLine));
@@ -120,14 +118,14 @@ void RemoteLinuxCustomCommandDeployService::stopDeployment()
     handleDeploymentDone();
 }
 
-void RemoteLinuxCustomCommandDeployService::handleStdout(const QByteArray &output)
+void RemoteLinuxCustomCommandDeployService::handleStdout()
 {
-    emit stdOutData(QString::fromUtf8(output));
+    emit stdOutData(QString::fromUtf8(d->runner->readAllStandardOutput()));
 }
 
-void RemoteLinuxCustomCommandDeployService::handleStderr(const QByteArray &output)
+void RemoteLinuxCustomCommandDeployService::handleStderr()
 {
-    emit stdErrData(QString::fromUtf8(output));
+    emit stdErrData(QString::fromUtf8(d->runner->readAllStandardError()));
 }
 
 void RemoteLinuxCustomCommandDeployService::handleProcessClosed(int exitStatus)