summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorhjk <hjk121@nokiamail.com>2013-09-09 17:32:21 +0200
committerhjk <hjk121@nokiamail.com>2013-09-10 16:36:49 +0200
commitd46cecebdc852f24b0f74a688d5d7f24118ec71c (patch)
treec1f37309e6c30b6906d557b495ef64f6196d5afc
parent8bffed4d104e0fe8d3aaf00f33bd74a39d4db9b2 (diff)
downloadqt-creator-d46cecebdc852f24b0f74a688d5d7f24118ec71c.tar.gz
DeviceProcess: Add write(const QByteArray &) function
Change-Id: Ia8e00c354056b96b966e7cdb86e51f838e70e738 Reviewed-by: Christian Kandeler <christian.kandeler@digia.com>
-rw-r--r--src/plugins/projectexplorer/devicesupport/desktopdeviceprocess.cpp5
-rw-r--r--src/plugins/projectexplorer/devicesupport/desktopdeviceprocess.h2
-rw-r--r--src/plugins/projectexplorer/devicesupport/deviceprocess.h2
-rw-r--r--src/plugins/projectexplorer/devicesupport/sshdeviceprocess.cpp5
-rw-r--r--src/plugins/projectexplorer/devicesupport/sshdeviceprocess.h2
5 files changed, 16 insertions, 0 deletions
diff --git a/src/plugins/projectexplorer/devicesupport/desktopdeviceprocess.cpp b/src/plugins/projectexplorer/devicesupport/desktopdeviceprocess.cpp
index 2929939e8d..b3cc471f50 100644
--- a/src/plugins/projectexplorer/devicesupport/desktopdeviceprocess.cpp
+++ b/src/plugins/projectexplorer/devicesupport/desktopdeviceprocess.cpp
@@ -121,5 +121,10 @@ QByteArray DesktopDeviceProcess::readAllStandardError()
return m_process->readAllStandardError();
}
+qint64 DesktopDeviceProcess::write(const QByteArray &data)
+{
+ return m_process->write(data);
+}
+
} // namespace Internal
} // namespace ProjectExplorer
diff --git a/src/plugins/projectexplorer/devicesupport/desktopdeviceprocess.h b/src/plugins/projectexplorer/devicesupport/desktopdeviceprocess.h
index 1a245a8195..8d1f68db11 100644
--- a/src/plugins/projectexplorer/devicesupport/desktopdeviceprocess.h
+++ b/src/plugins/projectexplorer/devicesupport/desktopdeviceprocess.h
@@ -60,6 +60,8 @@ public:
QByteArray readAllStandardOutput();
QByteArray readAllStandardError();
+ qint64 write(const QByteArray &data);
+
private:
QProcess * const m_process;
};
diff --git a/src/plugins/projectexplorer/devicesupport/deviceprocess.h b/src/plugins/projectexplorer/devicesupport/deviceprocess.h
index 92ef02dda0..ebaf2b6ef3 100644
--- a/src/plugins/projectexplorer/devicesupport/deviceprocess.h
+++ b/src/plugins/projectexplorer/devicesupport/deviceprocess.h
@@ -66,6 +66,8 @@ public:
virtual QByteArray readAllStandardOutput() = 0;
virtual QByteArray readAllStandardError() = 0;
+ virtual qint64 write(const QByteArray &data) = 0;
+
signals:
void started();
void finished();
diff --git a/src/plugins/projectexplorer/devicesupport/sshdeviceprocess.cpp b/src/plugins/projectexplorer/devicesupport/sshdeviceprocess.cpp
index 1fad5540b2..7703c3edcd 100644
--- a/src/plugins/projectexplorer/devicesupport/sshdeviceprocess.cpp
+++ b/src/plugins/projectexplorer/devicesupport/sshdeviceprocess.cpp
@@ -326,4 +326,9 @@ void SshDeviceProcess::SshDeviceProcessPrivate::setState(SshDeviceProcess::SshDe
}
}
+qint64 SshDeviceProcess::write(const QByteArray &data)
+{
+ return d->process->write(data);
+}
+
} // namespace ProjectExplorer
diff --git a/src/plugins/projectexplorer/devicesupport/sshdeviceprocess.h b/src/plugins/projectexplorer/devicesupport/sshdeviceprocess.h
index 6981921a72..1b82398319 100644
--- a/src/plugins/projectexplorer/devicesupport/sshdeviceprocess.h
+++ b/src/plugins/projectexplorer/devicesupport/sshdeviceprocess.h
@@ -61,6 +61,8 @@ public:
QByteArray readAllStandardOutput();
QByteArray readAllStandardError();
+ qint64 write(const QByteArray &data);
+
// Default is "false" due to OpenSSH not implementing this feature for some reason.
void setSshServerSupportsSignals(bool signalsSupported);