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

debugger: merge notifyEngineRemoteSetup* and handleRemoteSetup*

Browse Source 
Change-Id: I89abcb0dcceef6767cb3e78f4e85c1cd718e78c1
Reviewed-by: Aurindam Jana <aurindam.jana@nokia.com>
Reviewed-by: hjk <qthjk@ovi.com>
This commit is contained in:
hjk
2012-06-13 11:29:26 +02:00
committed by hjk
parent d601e3799f
commit ceb575741c
17 changed files with 56 additions and 81 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/plugins/debugger/gdb/remotegdbserveradapter.cpp
View File

@@ -96,7 +96,7 @@ void GdbRemoteServerEngine::setupEngine()
m_uploadProc.waitForStarted();
}
}
if (startParameters().requestRemoteSetup)
if (startParameters().remoteSetupNeeded)
notifyEngineRequestRemoteSetup();
else
startGdb();
@@ -158,7 +158,7 @@ void GdbRemoteServerEngine::uploadProcFinished()
&& m_uploadProc.exitCode() == 0)
startGdb();
else
handleRemoteSetupFailed(m_uploadProc.errorString());
notifyEngineRemoteSetupFailed(m_uploadProc.errorString());
}
void GdbRemoteServerEngine::setupInferior()
@@ -380,10 +380,10 @@ void GdbRemoteServerEngine::shutdownEngine()
notifyAdapterShutdownOk();
}
void GdbRemoteServerEngine::handleRemoteSetupDone(int gdbServerPort, int qmlPort)
void GdbRemoteServerEngine::notifyEngineRemoteSetupDone(int gdbServerPort, int qmlPort)
{
notifyEngineRemoteSetupDone();
QTC_ASSERT(state() == EngineSetupRequested, qDebug() << state());
DebuggerEngine::notifyEngineRemoteSetupDone(gdbServerPort, qmlPort);
if (qmlPort != -1)
startParameters().qmlServerPort = qmlPort;
@@ -398,9 +398,10 @@ void GdbRemoteServerEngine::handleRemoteSetupDone(int gdbServerPort, int qmlPort
startGdb();
}
void GdbRemoteServerEngine::handleRemoteSetupFailed(const QString &reason)
void GdbRemoteServerEngine::notifyEngineRemoteSetupFailed(const QString &reason)
{
QTC_ASSERT(state() == EngineSetupRequested, qDebug() << state());
DebuggerEngine::notifyEngineRemoteSetupFailed(reason);
handleAdapterStartFailed(reason);
}