Commit e2d338ee authored by ck's avatar ck
Browse files

Maemo: Fix botched merge.

parent 1e1c66f5
......@@ -102,8 +102,8 @@ MaemoSshRunner::MaemoSshRunner(const Core::SshServerInfo &server,
bool MaemoSshRunner::runInternal()
connect(, SIGNAL(remoteOutput(QByteArray)),
this, SLOT(handleRemoteOutput(QByteArray)));
connect(, SIGNAL(remoteOutputAvailable()),
this, SLOT(handleRemoteOutput()));
if (!m_connection->start())
return false;
......@@ -121,7 +121,7 @@ void MaemoSshRunner::initState()
void MaemoSshRunner::handleRemoteOutput(const QByteArray &curOutput)
void MaemoSshRunner::handleRemoteOutput()
const QByteArray output
= m_potentialEndMarkerPrefix + m_connection->waitForRemoteOutput(0);
......@@ -96,7 +96,7 @@ signals:
virtual bool runInternal();
Q_SLOT void handleRemoteOutput(const QByteArray &output);
Q_SLOT void handleRemoteOutput();
void initState();
static const QByteArray EndMarker;
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment