feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

SSH: Make API of SshRemoteProcess more similar to the one of QProcess.

Browse Source 
In the end, we want to derive it from QIODevice as well.

Change-Id: I30e7cb23ec8e5753c363d1f4457b650556860ac2
Reviewed-by: Christian Kandeler <christian.kandeler@nokia.com>
This commit is contained in:
Christian Kandeler
2011-11-14 17:23:51 +01:00
parent 75a7bf2919
commit 232724cc11
20 changed files with 135 additions and 137 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
src/plugins/debugger/gdb/remotegdbprocess.cpp
View File

@@ -151,8 +151,8 @@ void RemoteGdbProcess::handleAppOutputReaderStarted()
QTC_ASSERT(m_state == StartingFifoReader, return);
setState(StartingGdb);
connect(m_appOutputReader.data(), SIGNAL(outputAvailable(QByteArray)),
this, SLOT(handleAppOutput(QByteArray)));
connect(m_appOutputReader.data(), SIGNAL(readyReadStandardOutput()),
this, SLOT(handleAppOutput()));
QByteArray cmdLine = "DISPLAY=:0.0 " + m_command.toUtf8() + ' '
+ Utils::QtcProcess::joinArgsUnix(m_cmdArgs).toUtf8()
+ " -tty=" + m_appOutputFileName;
@@ -163,10 +163,10 @@ void RemoteGdbProcess::handleAppOutputReaderStarted()
SLOT(handleGdbStarted()));
connect(m_gdbProc.data(), SIGNAL(closed(int)), this,
SLOT(handleGdbFinished(int)));
connect(m_gdbProc.data(), SIGNAL(outputAvailable(QByteArray)), this,
SLOT(handleGdbOutput(QByteArray)));
connect(m_gdbProc.data(), SIGNAL(errorOutputAvailable(QByteArray)), this,
SLOT(handleErrOutput(QByteArray)));
connect(m_gdbProc.data(), SIGNAL(readyReadStandardOutput()), this,
SLOT(handleGdbOutput()));
connect(m_gdbProc.data(), SIGNAL(readyReadStandardError()), this,
SLOT(handleErrOutput()));
m_gdbProc->start();
}
@@ -265,12 +265,13 @@ QString RemoteGdbProcess::errorString() const
return m_error;
}
void RemoteGdbProcess::handleGdbOutput(const QByteArray &output)
void RemoteGdbProcess::handleGdbOutput()
{
if (m_state == Inactive)
return;
QTC_ASSERT(m_state == RunningGdb, return);
const QByteArray &output = m_gdbProc->readAllStandardOutput();
// TODO: Carriage return removal still necessary?
m_currentGdbOutput += removeCarriageReturn(output);
#if 0
@@ -343,16 +344,16 @@ void RemoteGdbProcess::sendInput(const QByteArray &data)
m_gdbProc->sendInput(data);
}
void RemoteGdbProcess::handleAppOutput(const QByteArray &output)
void RemoteGdbProcess::handleAppOutput()
{
if (m_state == RunningGdb)
m_adapter->handleApplicationOutput(output);
m_adapter->handleApplicationOutput(m_appOutputReader->readAllStandardOutput());
}
void RemoteGdbProcess::handleErrOutput(const QByteArray &output)
void RemoteGdbProcess::handleErrOutput()
{
if (m_state == RunningGdb) {
m_errorOutput += output;
m_errorOutput += m_gdbProc->readAllStandardError();
emit readyReadStandardError();
}
}

6
src/plugins/debugger/gdb/remotegdbprocess.h
View File

@@ -88,9 +88,9 @@ private slots:
void handleAppOutputReaderFinished(int exitStatus);
void handleGdbStarted();
void handleGdbFinished(int exitStatus);
void handleGdbOutput(const QByteArray &output);
void handleAppOutput(const QByteArray &output);
void handleErrOutput(const QByteArray &output);
void handleGdbOutput();
void handleAppOutput();
void handleErrOutput();
private:
enum State {