SSH: Don't expose SshRemoteProcess object from SshRemoteProcessRunner.

It's part of the internal state.

Change-Id: I2670be2d55c791435bd286150f4b4097e8d92f6d
Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>

3 files changed, 10 insertions, 10 deletions

diff --git a/src/plugins/madde/maddedevicetester.cpp b/src/plugins/madde/maddedevicetester.cpp
index 80090f07d6..0968f20695 100644
--- a/src/plugins/madde/maddedevicetester.cpp
+++ b/src/plugins/madde/maddedevicetester.cpp
@@ -89,7 +89,7 @@ void MaddeDeviceTester::stopTest()
     case QtTest:
     case MadDeveloperTest:
     case QmlToolingTest:
-        m_processRunner->process()->close();
+        m_processRunner->cancel();
         break;
     }
 
@@ -177,7 +177,7 @@ void MaddeDeviceTester::handleProcessFinished(int exitStatus)
 void MaddeDeviceTester::handleQtTestFinished(int exitStatus)
 {
     if (exitStatus != SshRemoteProcess::ExitedNormally
-            || m_processRunner->process()->exitCode() != 0) {
+            || m_processRunner->processExitCode() != 0) {
         if (!m_stderr.isEmpty()) {
             emit errorMessage(tr("Error checking for Qt libraries: %1\n")
                 .arg(QString::fromUtf8(m_stderr)));
@@ -209,7 +209,7 @@ void MaddeDeviceTester::handleMadDeveloperTestFinished(int exitStatus)
             emit errorMessage(tr("Error checking for connectivity tool.\n"));
         }
         m_result = TestFailure;
-    } else if (m_processRunner->process()->exitCode() != 0) {
+    } else if (m_processRunner->processExitCode() != 0) {
         QString message = tr("Connectivity tool not installed on device. "
             "Deployment currently not possible.");
         if (m_deviceConfiguration->osType() == QLatin1String(HarmattanOsType)) {
@@ -247,7 +247,7 @@ void MaddeDeviceTester::handleQmlToolingTestFinished(int exitStatus)
             emit errorMessage(tr("Error checking for QML tooling support.\n"));
         }
         m_result = TestFailure;
-    } else if (m_processRunner->process()->exitCode() != 0) {
+    } else if (m_processRunner->processExitCode() != 0) {
         emit errorMessage(tr("Missing directory '%1'. You will not be able to do "
             "QML debugging on this device.\n").arg(QmlToolingDirectory));
         m_result = TestFailure;
diff --git a/src/plugins/madde/maemopublisherfremantlefree.cpp b/src/plugins/madde/maemopublisherfremantlefree.cpp
index e0cf2f7043..70bd593a0e 100644
--- a/src/plugins/madde/maemopublisherfremantlefree.cpp
+++ b/src/plugins/madde/maemopublisherfremantlefree.cpp
@@ -419,11 +419,11 @@ void MaemoPublisherFremantleFree::handleUploadJobFinished(int exitStatus)
         return);
 
     if (m_state != Inactive && (exitStatus != SshRemoteProcess::ExitedNormally
-            || m_uploader->process()->exitCode() != 0)) {
+            || m_uploader->processExitCode() != 0)) {
         QString error;
         if (exitStatus != SshRemoteProcess::ExitedNormally) {
             error = tr("Error uploading file: %1.")
-                .arg(m_uploader->process()->errorString());
+                .arg(m_uploader->processErrorString());
         } else {
             error = tr("Error uploading file.");
         }
@@ -447,7 +447,7 @@ void MaemoPublisherFremantleFree::prepareToSendFile()
     emit progressReport(tr("Uploading file %1 ...")
         .arg(QDir::toNativeSeparators(nextFilePath)));
     QFileInfo info(nextFilePath);
-    m_uploader->process()->write("C0644 " + QByteArray::number(info.size())
+    m_uploader->writeDataToProcess("C0644 " + QByteArray::number(info.size())
         + ' ' + info.fileName().toUtf8() + '\n');
 }
 
@@ -473,13 +473,13 @@ void MaemoPublisherFremantleFree::sendFile()
                 tr("Upload failed."));
             return;
         }
-        m_uploader->process()->write(data);
+        m_uploader->writeDataToProcess(data);
         bytesToSend -= data.size();
         QCoreApplication::processEvents();
         if (m_state == Inactive)
             return;
     }
-    m_uploader->process()->write(QByteArray(1, '\0'));
+    m_uploader->writeDataToProcess(QByteArray(1, '\0'));
 }
 
 void MaemoPublisherFremantleFree::handleScpStdOut(const QByteArray &output)
diff --git a/src/plugins/madde/maemoremotecopyfacility.cpp b/src/plugins/madde/maemoremotecopyfacility.cpp
index 8e50a7e4c3..84780b633f 100644
--- a/src/plugins/madde/maemoremotecopyfacility.cpp
+++ b/src/plugins/madde/maemoremotecopyfacility.cpp
@@ -108,7 +108,7 @@ void MaemoRemoteCopyFacility::handleCopyFinished(int exitStatus)
         return;
 
     if (exitStatus != SshRemoteProcess::ExitedNormally
-            || m_copyRunner->process()->exitCode() != 0) {
+            || m_copyRunner->processExitCode() != 0) {
         setFinished();
         emit finished(tr("Error: Copy command failed."));
     } else {