diff --git a/src/plugins/debugger/debuggerengine.cpp b/src/plugins/debugger/debuggerengine.cpp index 8de1daaac33..b8580587cdc 100644 --- a/src/plugins/debugger/debuggerengine.cpp +++ b/src/plugins/debugger/debuggerengine.cpp @@ -291,9 +291,6 @@ public: // The current state. DebuggerState m_state = DebuggerNotReady; - // The state we had before something unexpected happend. - DebuggerState m_lastGoodState = DebuggerNotReady; - // Terminal m_terminal; ProcessHandle m_inferiorPid; @@ -507,7 +504,6 @@ void DebuggerEngine::start() QTC_ASSERT(state() == DebuggerNotReady || state() == DebuggerFinished, qDebug() << state()); - d->m_lastGoodState = DebuggerNotReady; d->m_progress.setProgressValue(200); // d->m_terminal.setup(); @@ -598,11 +594,6 @@ DebuggerState DebuggerEngine::state() const return d->m_state; } -DebuggerState DebuggerEngine::lastGoodState() const -{ - return d->m_lastGoodState; -} - static bool isAllowedTransition(DebuggerState from, DebuggerState to) { switch (from) { @@ -903,7 +894,6 @@ void DebuggerEngine::notifyInferiorShutdownOk() { showMessage("INFERIOR SUCCESSFULLY SHUT DOWN"); QTC_ASSERT(state() == InferiorShutdownRequested, qDebug() << this << state()); - d->m_lastGoodState = DebuggerNotReady; // A "neutral" value. setState(InferiorShutdownOk); if (isMasterEngine()) d->doShutdownEngine(); @@ -924,7 +914,6 @@ void DebuggerEngine::notifyInferiorIll() // This can be issued in almost any state. The inferior could still be // alive as some previous notifications might have been bogus. runTool()->startDying(); - d->m_lastGoodState = d->m_state; if (state() == InferiorRunRequested) { // We asked for running, but did not see a response. // Assume the inferior is dead. @@ -982,7 +971,6 @@ void DebuggerEngine::notifyEngineIll() //#endif showMessage("NOTE: ENGINE ILL ******"); runTool()->startDying(); - d->m_lastGoodState = d->m_state; switch (state()) { case InferiorRunRequested: case InferiorRunOk: diff --git a/src/plugins/debugger/debuggerengine.h b/src/plugins/debugger/debuggerengine.h index 6e8d1b63acd..aa6d3e5e606 100644 --- a/src/plugins/debugger/debuggerengine.h +++ b/src/plugins/debugger/debuggerengine.h @@ -344,7 +344,6 @@ public: static bool debuggerActionsEnabled(DebuggerState state); DebuggerState state() const; - DebuggerState lastGoodState() const; bool isDying() const; static QString stateName(int s); diff --git a/src/plugins/debugger/gdb/gdbengine.cpp b/src/plugins/debugger/gdb/gdbengine.cpp index 3ae97704ab3..8e15bde5eec 100644 --- a/src/plugins/debugger/gdb/gdbengine.cpp +++ b/src/plugins/debugger/gdb/gdbengine.cpp @@ -4546,8 +4546,7 @@ void GdbEngine::shutdownEngine() } CHECK_STATE(EngineShutdownRequested); - showMessage(QString("INITIATE GDBENGINE SHUTDOWN IN STATE %1, PROC: %2") - .arg(lastGoodState()).arg(m_gdbProc.state())); + showMessage(QString("INITIATE GDBENGINE SHUTDOWN, PROC STATE: %1").arg(m_gdbProc.state())); m_commandsDoneCallback = 0; switch (m_gdbProc.state()) { case QProcess::Running: {