From 10fa3b2b764be7d29c0ad34d0b29148e2dada12c Mon Sep 17 00:00:00 2001
From: hjk <qtc-committer@nokia.com>
Date: Tue, 29 Sep 2009 10:15:52 +0200
Subject: [PATCH] debugger: remove inferiorStarted() signal.
It had unclear semantics and was only used to show a statusmessage.
We do that directly now.
---
src/plugins/debugger/debuggerconstants.h | 14 +++++++-------
src/plugins/debugger/gdb/abstractgdbadapter.h | 3 ++-
src/plugins/debugger/gdb/attachgdbadapter.cpp | 12 +++++++-----
src/plugins/debugger/gdb/coregdbadapter.cpp | 3 ++-
src/plugins/debugger/gdb/gdbengine.cpp | 13 -------------
src/plugins/debugger/gdb/gdbengine.h | 1 -
src/plugins/debugger/gdb/plaingdbadapter.cpp | 3 ++-
src/plugins/debugger/gdb/remotegdbadapter.cpp | 3 ++-
src/plugins/debugger/gdb/trkgdbadapter.cpp | 5 ++---
9 files changed, 24 insertions(+), 33 deletions(-)
diff --git a/src/plugins/debugger/debuggerconstants.h b/src/plugins/debugger/debuggerconstants.h
index 97ef111096a..87882b8ce35 100644
--- a/src/plugins/debugger/debuggerconstants.h
+++ b/src/plugins/debugger/debuggerconstants.h
@@ -73,22 +73,22 @@ enum DebuggerState
InferiorPrepared,
InferiorPreparationFailed,
InferiorStarting,
- // InferiorStarted, // That's either InferiorRunningRequested or InferiorStopped
+ // InferiorStarted, // Use InferiorRunningRequested or InferiorStopped
InferiorStartFailed,
InferiorRunningRequested, // Debuggee requested to run
InferiorRunning, // Debuggee running
- InferiorStopping, // Debuggee running, stop requested
+ InferiorStopping, // Debuggee running, stop requested
InferiorStopped, // Debuggee stopped
- InferiorStopFailed, // Debuggee stopped
+ InferiorStopFailed, // Debuggee stopped
InferiorShuttingDown,
InferiorShutDown,
InferiorShutdownFailed,
AdapterShuttingDown,
- //AdapterShutDown, // use DebuggerNotReady
+ //AdapterShutDown, // Use DebuggerNotReady instead
AdapterShutdownFailed,
};
@@ -106,12 +106,12 @@ enum DebuggerStartMode
enum LogChannel
{
- LogInput, // Used for user input
+ LogInput, // Used for user input
LogOutput,
LogWarning,
LogError,
- LogStatus, // Used for status changed messages
- LogTime, // Used for time stamp messages
+ LogStatus, // Used for status changed messages
+ LogTime, // Used for time stamp messages
LogDebug,
LogMisc
};
diff --git a/src/plugins/debugger/gdb/abstractgdbadapter.h b/src/plugins/debugger/gdb/abstractgdbadapter.h
index 943842fc449..e471f4fcd88 100644
--- a/src/plugins/debugger/gdb/abstractgdbadapter.h
+++ b/src/plugins/debugger/gdb/abstractgdbadapter.h
@@ -76,7 +76,6 @@ signals:
void inferiorPrepared();
void inferiorPreparationFailed(const QString &msg);
- void inferiorStarted();
void inferiorStartFailed(const QString &msg);
void inferiorShutDown();
void inferiorShutdownFailed(const QString &msg);
@@ -95,6 +94,8 @@ protected:
{ return m_engine->startParameters(); }
void debugMessage(const QString &msg) const
{ m_engine->debugMessage(msg); }
+ void showStatusMessage(const QString &msg) const
+ { m_engine->showStatusMessage(msg); }
GdbEngine * const m_engine;
};
diff --git a/src/plugins/debugger/gdb/attachgdbadapter.cpp b/src/plugins/debugger/gdb/attachgdbadapter.cpp
index 75757dc45ff..b401943e696 100644
--- a/src/plugins/debugger/gdb/attachgdbadapter.cpp
+++ b/src/plugins/debugger/gdb/attachgdbadapter.cpp
@@ -134,13 +134,14 @@ void AttachGdbAdapter::handleAttach(const GdbResponse &response)
void AttachGdbAdapter::startInferior()
{
QTC_ASSERT(state() == InferiorStarting, qDebug() << state());
-#if 0
+#if 1
+ setState(InferiorStopped);
+ debugMessage(_("INFERIOR STARTED"));
+ showStatusMessage(tr("Attached to stopped inferior."));
+#else
// continue on attach
setState(InferiorRunningRequested);
m_engine->postCommand(_("-exec-continue"), CB(handleContinue));
-#else
- setState(InferiorStopped);
- emit inferiorStarted();
#endif
}
@@ -149,7 +150,8 @@ void AttachGdbAdapter::handleContinue(const GdbResponse &response)
QTC_ASSERT(state() == InferiorStarting, qDebug() << state());
if (response.resultClass == GdbResultRunning) {
setState(InferiorRunning);
- emit inferiorStarted();
+ debugMessage(_("INFERIOR STARTED"));
+ showStatusMessage(tr("Inferior running."));
} else {
QTC_ASSERT(response.resultClass == GdbResultError, /**/);
const QByteArray &msg = response.data.findChild("msg").data();
diff --git a/src/plugins/debugger/gdb/coregdbadapter.cpp b/src/plugins/debugger/gdb/coregdbadapter.cpp
index 3eda30cef03..a9f48b3fc82 100644
--- a/src/plugins/debugger/gdb/coregdbadapter.cpp
+++ b/src/plugins/debugger/gdb/coregdbadapter.cpp
@@ -151,7 +151,8 @@ void CoreGdbAdapter::handleTargetCore(const GdbResponse &response)
QTC_ASSERT(state() == InferiorStarting, qDebug() << state());
if (response.resultClass == GdbResultDone) {
setState(InferiorStopped);
- emit inferiorStarted();
+ debugMessage(_("INFERIOR STARTED"));
+ showStatusMessage(tr("Attached to core."));
m_engine->updateAll();
} else {
QTC_ASSERT(response.resultClass == GdbResultError, /**/);
diff --git a/src/plugins/debugger/gdb/gdbengine.cpp b/src/plugins/debugger/gdb/gdbengine.cpp
index 4323ca65b3d..783ac198652 100644
--- a/src/plugins/debugger/gdb/gdbengine.cpp
+++ b/src/plugins/debugger/gdb/gdbengine.cpp
@@ -268,8 +268,6 @@ void GdbEngine::connectAdapter()
connect(m_gdbAdapter, SIGNAL(inferiorPreparationFailed(QString)),
this, SLOT(handleInferiorPreparationFailed(QString)));
- connect(m_gdbAdapter, SIGNAL(inferiorStarted()),
- this, SLOT(handleInferiorStarted()));
connect(m_gdbAdapter, SIGNAL(inferiorStartFailed(QString)),
this, SLOT(handleInferiorStartFailed(QString)));
connect(m_gdbAdapter, SIGNAL(inferiorShutDown()),
@@ -4163,17 +4161,6 @@ void GdbEngine::handleInferiorStartFailed(const QString &msg)
shutdown();
}
-void GdbEngine::handleInferiorStarted()
-{
- QTC_ASSERT(state() == InferiorRunning
- || state() == InferiorStopped, qDebug() << state());
- debugMessage(_("INFERIOR STARTED"));
- if (state() == InferiorStopped)
- showStatusMessage(tr("Inferior stopped."));
- else
- showStatusMessage(tr("Inferior started."));
-}
-
void GdbEngine::handleInferiorShutDown()
{
debugMessage(_("INFERIOR SUCCESSFULLY SHUT DOWN"));
diff --git a/src/plugins/debugger/gdb/gdbengine.h b/src/plugins/debugger/gdb/gdbengine.h
index 6bfc7444fb0..29aa87845f2 100644
--- a/src/plugins/debugger/gdb/gdbengine.h
+++ b/src/plugins/debugger/gdb/gdbengine.h
@@ -239,7 +239,6 @@ private slots:
void handleInferiorPrepared();
void handleInferiorPreparationFailed(const QString &msg);
- void handleInferiorStarted();
void handleInferiorStartFailed(const QString &msg);
void handleInferiorShutDown();
void handleInferiorShutdownFailed(const QString &msg);
diff --git a/src/plugins/debugger/gdb/plaingdbadapter.cpp b/src/plugins/debugger/gdb/plaingdbadapter.cpp
index ba657427a6c..a7b92ae92a0 100644
--- a/src/plugins/debugger/gdb/plaingdbadapter.cpp
+++ b/src/plugins/debugger/gdb/plaingdbadapter.cpp
@@ -211,7 +211,8 @@ void PlainGdbAdapter::handleExecRun(const GdbResponse &response)
{
if (response.resultClass == GdbResultRunning) {
QTC_ASSERT(state() == InferiorRunning, qDebug() << state());
- emit inferiorStarted();
+ debugMessage(_("INFERIOR STARTED"));
+ showStatusMessage(tr("Inferior started."));
} else {
QTC_ASSERT(state() == InferiorRunningRequested, qDebug() << state());
QTC_ASSERT(response.resultClass == GdbResultError, /**/);
diff --git a/src/plugins/debugger/gdb/remotegdbadapter.cpp b/src/plugins/debugger/gdb/remotegdbadapter.cpp
index 842f08daaa2..233f96e1ddb 100644
--- a/src/plugins/debugger/gdb/remotegdbadapter.cpp
+++ b/src/plugins/debugger/gdb/remotegdbadapter.cpp
@@ -251,7 +251,8 @@ void RemoteGdbAdapter::handleFirstContinue(const GdbResponse &record)
QTC_ASSERT(state() == InferiorRunningRequested, qDebug() << state());
if (record.resultClass == GdbResultDone) {
setState(InferiorStopped);
- emit inferiorStarted();
+ debugMessage(_("INFERIOR STARTED"));
+ showStatusMessage(tr("Attached to stopped inferior."));
} else if (record.resultClass == GdbResultError) {
//QString msg = __(record.data.findChild("msg").data());
QString msg1 = tr("Connecting to remote server failed:\n");
diff --git a/src/plugins/debugger/gdb/trkgdbadapter.cpp b/src/plugins/debugger/gdb/trkgdbadapter.cpp
index 94a65e22249..f6587be9289 100644
--- a/src/plugins/debugger/gdb/trkgdbadapter.cpp
+++ b/src/plugins/debugger/gdb/trkgdbadapter.cpp
@@ -1463,15 +1463,14 @@ void TrkGdbAdapter::startInferior()
QTC_ASSERT(state() == InferiorStarting, qDebug() << state());
setState(InferiorRunningRequested);
m_engine->postCommand(_("-exec-continue"), CB(handleFirstContinue));
- // FIXME: Is there a way to properly recognize a successful start?
- emit inferiorStarted();
}
void TrkGdbAdapter::handleFirstContinue(const GdbResponse &record)
{
QTC_ASSERT(state() == InferiorRunningRequested, qDebug() << state());
if (record.resultClass == GdbResultDone) {
- // inferiorStarted already emitted above, see FIXME
+ debugMessage(_("INFERIOR STARTED"));
+ showStatusMessage(tr("Inferior running."));
} else if (record.resultClass == GdbResultError) {
//QString msg = __(record.data.findChild("msg").data());
QString msg1 = tr("Connecting to remote server failed:");
--
GitLab