diff --git a/src/plugins/debugger/gdb/gdbengine.cpp b/src/plugins/debugger/gdb/gdbengine.cpp index e2c11155c1bb39b8591bb9d193863b80b5caf7b3..aeb7ef745469659c6d443a74a1d67c860c8baab2 100644 --- a/src/plugins/debugger/gdb/gdbengine.cpp +++ b/src/plugins/debugger/gdb/gdbengine.cpp @@ -278,7 +278,7 @@ void GdbEngine::initializeVariables() m_oldestAcceptableToken = -1; m_outputCodec = QTextCodec::codecForLocale(); m_pendingRequests = 0; - m_continuationAfterDone = 0; + m_commandsDoneCallback = 0; m_commandsToRunOnTemporaryBreak.clear(); m_cookieForToken.clear(); m_customOutputForToken.clear(); @@ -841,9 +841,9 @@ void GdbEngine::handleResultRecord(const GdbResponse &response) // An optimization would be requesting the continue immediately when the // event loop is entered, and let individual commands have a flag to suppress // that behavior. - if (m_continuationAfterDone && m_cookieForToken.isEmpty()) { - Continuation cont = m_continuationAfterDone; - m_continuationAfterDone = 0; + if (m_commandsDoneCallback && m_cookieForToken.isEmpty()) { + CommandsDoneCallback cont = m_commandsDoneCallback; + m_commandsDoneCallback = 0; (this->*cont)(); showStatusMessage(tr("Continuing after temporary stop."), 1000); } else { @@ -1045,8 +1045,8 @@ void GdbEngine::handleAsyncOutput(const GdbMi &data) flushCommand(cmd); } showStatusMessage(tr("Processing queued commands."), 1000); - QTC_ASSERT(m_continuationAfterDone == 0, /**/); - m_continuationAfterDone = &GdbEngine::continueInferior; + QTC_ASSERT(m_commandsDoneCallback == 0, /**/); + m_commandsDoneCallback = &GdbEngine::continueInferior; return; } @@ -4089,9 +4089,9 @@ void GdbEngine::handleInferiorPrepared() } // Initial attempt to set breakpoints - QTC_ASSERT(m_continuationAfterDone == 0, /**/); + QTC_ASSERT(m_commandsDoneCallback == 0, /**/); showStatusMessage(tr("Setting breakpoints...")); - m_continuationAfterDone = &GdbEngine::startInferior; + m_commandsDoneCallback = &GdbEngine::startInferior; attemptBreakpointSynchronization(); } diff --git a/src/plugins/debugger/gdb/gdbengine.h b/src/plugins/debugger/gdb/gdbengine.h index 37a0442600f66c0c591381d2ad62b918de972bfc..e4a3c652b03a54d1b89e1eb3f6b093515a6397c1 100644 --- a/src/plugins/debugger/gdb/gdbengine.h +++ b/src/plugins/debugger/gdb/gdbengine.h @@ -409,9 +409,9 @@ private: QString m_currentFrame; QMap<QString, QString> m_varToType; - typedef void (GdbEngine::*Continuation)(); + typedef void (GdbEngine::*CommandsDoneCallback)(); // function called after all previous responses have been received - Continuation m_continuationAfterDone; + CommandsDoneCallback m_commandsDoneCallback; void startInferior(); bool m_modulesListOutdated;