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

Merge branch '1.3' of git@scm.dev.nokia.troll.no:creator/mainline into 1.3

Browse Source
This commit is contained in:
Friedemann Kleint
2009-10-08 12:48:50 +02:00
parent f39e5d8ceb aa97f43a92
commit 8f0ea147f7
2 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/plugins/debugger/gdb/gdbengine.cpp
View File

@@ -278,7 +278,7 @@ void GdbEngine::initializeVariables()
m_oldestAcceptableToken = -1; m_oldestAcceptableToken = -1;
m_outputCodec = QTextCodec::codecForLocale(); m_outputCodec = QTextCodec::codecForLocale();
m_pendingRequests = 0; m_pendingRequests = 0;
m_continuationAfterDone = 0; m_commandsDoneCallback = 0;
m_commandsToRunOnTemporaryBreak.clear(); m_commandsToRunOnTemporaryBreak.clear();
m_cookieForToken.clear(); m_cookieForToken.clear();
m_customOutputForToken.clear(); m_customOutputForToken.clear();
@@ -841,9 +841,9 @@ void GdbEngine::handleResultRecord(const GdbResponse &response)
// An optimization would be requesting the continue immediately when the // An optimization would be requesting the continue immediately when the
// event loop is entered, and let individual commands have a flag to suppress // event loop is entered, and let individual commands have a flag to suppress
// that behavior. // that behavior.
if (m_continuationAfterDone && m_cookieForToken.isEmpty()) { if (m_commandsDoneCallback && m_cookieForToken.isEmpty()) {
Continuation cont = m_continuationAfterDone; CommandsDoneCallback cont = m_commandsDoneCallback;
m_continuationAfterDone = 0; m_commandsDoneCallback = 0;
(this->*cont)(); (this->*cont)();
showStatusMessage(tr("Continuing after temporary stop."), 1000); showStatusMessage(tr("Continuing after temporary stop."), 1000);
} else { } else {
@@ -1045,8 +1045,8 @@ void GdbEngine::handleAsyncOutput(const GdbMi &data)
flushCommand(cmd); flushCommand(cmd);
} }
showStatusMessage(tr("Processing queued commands."), 1000); showStatusMessage(tr("Processing queued commands."), 1000);
QTC_ASSERT(m_continuationAfterDone == 0, /**/); QTC_ASSERT(m_commandsDoneCallback == 0, /**/);
m_continuationAfterDone = &GdbEngine::continueInferior; m_commandsDoneCallback = &GdbEngine::continueInferior;
return; return;
} }
@@ -4089,9 +4089,9 @@ void GdbEngine::handleInferiorPrepared()
} }
// Initial attempt to set breakpoints // Initial attempt to set breakpoints
QTC_ASSERT(m_continuationAfterDone == 0, /**/); QTC_ASSERT(m_commandsDoneCallback == 0, /**/);
showStatusMessage(tr("Setting breakpoints...")); showStatusMessage(tr("Setting breakpoints..."));
m_continuationAfterDone = &GdbEngine::startInferior; m_commandsDoneCallback = &GdbEngine::startInferior;
attemptBreakpointSynchronization(); attemptBreakpointSynchronization();
} }

4
src/plugins/debugger/gdb/gdbengine.h
View File

@@ -409,9 +409,9 @@ private:
QString m_currentFrame; QString m_currentFrame;
QMap<QString, QString> m_varToType; QMap<QString, QString> m_varToType;
typedef void (GdbEngine::*Continuation)(); typedef void (GdbEngine::*CommandsDoneCallback)();
// function called after all previous responses have been received // function called after all previous responses have been received
Continuation m_continuationAfterDone; CommandsDoneCallback m_commandsDoneCallback;
void startInferior(); void startInferior();
bool m_modulesListOutdated; bool m_modulesListOutdated;