diff options
author | Christian Kandeler <christian.kandeler@nokia.com> | 2011-11-15 17:13:02 +0100 |
---|---|---|
committer | Christian Kandeler <christian.kandeler@nokia.com> | 2011-11-15 17:32:55 +0100 |
commit | 4c76e40617d22d3578bb95973b54b0e266591e7c (patch) | |
tree | 8b89776bde4cd291fd54db988ca5e79939ac191f /src/plugins | |
parent | d9dde0d5e8eedde5b82c441700babc4f2a394ce4 (diff) | |
download | qt-creator-4c76e40617d22d3578bb95973b54b0e266591e7c.tar.gz |
SSH: Derive SshRemoteProcess from QIODevice.
Now it looks even more like QProcess. Things like process channels are
still missing.
Change-Id: I3f30cd00ed4a054d02e83add9a6f4162b48f8345
Reviewed-by: Christian Kandeler <christian.kandeler@nokia.com>
Diffstat (limited to 'src/plugins')
-rw-r--r-- | src/plugins/debugger/gdb/remotegdbprocess.cpp | 2 | ||||
-rw-r--r-- | src/plugins/debugger/lldb/lldbenginehost.cpp | 4 | ||||
-rw-r--r-- | src/plugins/madde/maddedevicetester.cpp | 2 | ||||
-rw-r--r-- | src/plugins/madde/maemopublisherfremantlefree.cpp | 6 | ||||
-rw-r--r-- | src/plugins/madde/maemoremotemounter.cpp | 4 | ||||
-rw-r--r-- | src/plugins/remotelinux/linuxdevicetester.cpp | 2 | ||||
-rw-r--r-- | src/plugins/remotelinux/remotelinuxcustomcommanddeployservice.cpp | 2 |
7 files changed, 11 insertions, 11 deletions
diff --git a/src/plugins/debugger/gdb/remotegdbprocess.cpp b/src/plugins/debugger/gdb/remotegdbprocess.cpp index 80a1dd5837..e9bb37aefe 100644 --- a/src/plugins/debugger/gdb/remotegdbprocess.cpp +++ b/src/plugins/debugger/gdb/remotegdbprocess.cpp @@ -341,7 +341,7 @@ void RemoteGdbProcess::sendInput(const QByteArray &data) if (!isdigit(data.at(pos))) break; m_lastSeqNr = data.left(pos); - m_gdbProc->sendInput(data); + m_gdbProc->write(data); } void RemoteGdbProcess::handleAppOutput() diff --git a/src/plugins/debugger/lldb/lldbenginehost.cpp b/src/plugins/debugger/lldb/lldbenginehost.cpp index 70189a5139..d5115bbd6a 100644 --- a/src/plugins/debugger/lldb/lldbenginehost.cpp +++ b/src/plugins/debugger/lldb/lldbenginehost.cpp @@ -95,7 +95,7 @@ qint64 SshIODevice::writeData (const char * data, qint64 maxSize) startupbuffer += QByteArray::fromRawData(data, maxSize); return maxSize; } - proc->sendInput(QByteArray::fromRawData(data, maxSize)); + proc->write(data, maxSize); return maxSize; } qint64 SshIODevice::readData (char * data, qint64 maxSize) @@ -128,7 +128,7 @@ qint64 SshIODevice::readData (char * data, qint64 maxSize) void SshIODevice::processStarted() { proc = runner->process(); - proc->sendInput(startupbuffer); + proc->write(startupbuffer); } void SshIODevice::outputAvailable(const QByteArray &output) diff --git a/src/plugins/madde/maddedevicetester.cpp b/src/plugins/madde/maddedevicetester.cpp index a275971f4e..80090f07d6 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()->closeChannel(); + m_processRunner->process()->close(); break; } diff --git a/src/plugins/madde/maemopublisherfremantlefree.cpp b/src/plugins/madde/maemopublisherfremantlefree.cpp index aa85f8138b..e0cf2f7043 100644 --- a/src/plugins/madde/maemopublisherfremantlefree.cpp +++ b/src/plugins/madde/maemopublisherfremantlefree.cpp @@ -447,7 +447,7 @@ void MaemoPublisherFremantleFree::prepareToSendFile() emit progressReport(tr("Uploading file %1 ...") .arg(QDir::toNativeSeparators(nextFilePath))); QFileInfo info(nextFilePath); - m_uploader->process()->sendInput("C0644 " + QByteArray::number(info.size()) + m_uploader->process()->write("C0644 " + QByteArray::number(info.size()) + ' ' + info.fileName().toUtf8() + '\n'); } @@ -473,13 +473,13 @@ void MaemoPublisherFremantleFree::sendFile() tr("Upload failed.")); return; } - m_uploader->process()->sendInput(data); + m_uploader->process()->write(data); bytesToSend -= data.size(); QCoreApplication::processEvents(); if (m_state == Inactive) return; } - m_uploader->process()->sendInput(QByteArray(1, '\0')); + m_uploader->process()->write(QByteArray(1, '\0')); } void MaemoPublisherFremantleFree::handleScpStdOut(const QByteArray &output) diff --git a/src/plugins/madde/maemoremotemounter.cpp b/src/plugins/madde/maemoremotemounter.cpp index a151feaf3d..6144036243 100644 --- a/src/plugins/madde/maemoremotemounter.cpp +++ b/src/plugins/madde/maemoremotemounter.cpp @@ -380,11 +380,11 @@ void MaemoRemoteMounter::setState(State newState) m_utfsServerTimer->stop(); if (m_mountProcess) { disconnect(m_mountProcess.data(), 0, this, 0); - m_mountProcess->closeChannel(); + m_mountProcess->close(); } if (m_unmountProcess) { disconnect(m_unmountProcess.data(), 0, this, 0); - m_unmountProcess->closeChannel(); + m_unmountProcess->close(); } } m_state = newState; diff --git a/src/plugins/remotelinux/linuxdevicetester.cpp b/src/plugins/remotelinux/linuxdevicetester.cpp index 8c9e1cd2b9..cd9c465174 100644 --- a/src/plugins/remotelinux/linuxdevicetester.cpp +++ b/src/plugins/remotelinux/linuxdevicetester.cpp @@ -106,7 +106,7 @@ void GenericLinuxDeviceTester::stopTest() d->portsGatherer.stop(); break; case RunningUname: - d->process->closeChannel(); + d->process->close(); break; case Inactive: break; diff --git a/src/plugins/remotelinux/remotelinuxcustomcommanddeployservice.cpp b/src/plugins/remotelinux/remotelinuxcustomcommanddeployservice.cpp index 9f393b8924..d489d55030 100644 --- a/src/plugins/remotelinux/remotelinuxcustomcommanddeployservice.cpp +++ b/src/plugins/remotelinux/remotelinuxcustomcommanddeployservice.cpp @@ -115,7 +115,7 @@ void RemoteLinuxCustomCommandDeployService::stopDeployment() QTC_ASSERT(d->state == Running, return); disconnect(d->runner, 0, this, 0); - d->runner->process()->closeChannel(); + d->runner->process()->close(); d->state = Inactive; handleDeploymentDone(); } |