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

Maemo: Add missing initialization.

Browse Source 
Task-number: QTCREATORBUG-1461 (part 1)

Conflicts:

	src/plugins/qt4projectmanager/qt-maemo/maemosshthread.cpp
	src/plugins/qt4projectmanager/qt-maemo/maemosshthread.h
This commit is contained in:
ck
2010-05-26 11:43:19 +02:00
parent 058d76fca8
commit fae7a9fae7
2 changed files with 9 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/plugins/qt4projectmanager/qt-maemo/maemosshthread.cpp
View File

@@ -104,8 +104,7 @@ bool MaemoSshRunner::runInternal()
createConnection();
connect(m_connection.data(), SIGNAL(remoteOutput(QByteArray)),
this, SLOT(handleRemoteOutput(QByteArray)));
m_endMarkerCount = 0;
m_promptEncountered = false;
initState();
if (!m_connection->start())
return false;
if (stopRequested())
@@ -115,6 +114,13 @@ bool MaemoSshRunner::runInternal()
return !m_connection->hasError();
}
void MaemoSshRunner::initState()
{
m_endMarkerCount = 0;
m_promptEncountered = false;
m_potentialEndMarkerPrefix.clear();
}
void MaemoSshRunner::handleRemoteOutput(const QByteArray &curOutput)
{
const QByteArray output = m_potentialEndMarkerPrefix + curOutput;

1
src/plugins/qt4projectmanager/qt-maemo/maemosshthread.h
View File

@@ -97,6 +97,7 @@ signals:
private:
virtual bool runInternal();
Q_SLOT void handleRemoteOutput(const QByteArray &output);
void initState();
static const QByteArray EndMarker;