From de9b4e83654a2aa7db6baad8d9e5463d78c37443 Mon Sep 17 00:00:00 2001
From: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
Date: Thu, 15 Oct 2009 13:48:25 +0200
Subject: [PATCH] centralize setting of AdapterStarted state

---
 src/plugins/debugger/gdb/attachgdbadapter.cpp | 1 -
 src/plugins/debugger/gdb/coregdbadapter.cpp   | 1 -
 src/plugins/debugger/gdb/gdbengine.cpp        | 1 +
 src/plugins/debugger/gdb/plaingdbadapter.cpp  | 1 -
 src/plugins/debugger/gdb/remotegdbadapter.cpp | 1 -
 src/plugins/debugger/gdb/trkgdbadapter.cpp    | 1 -
 6 files changed, 1 insertion(+), 5 deletions(-)

diff --git a/src/plugins/debugger/gdb/attachgdbadapter.cpp b/src/plugins/debugger/gdb/attachgdbadapter.cpp
index e6325deb61d..4bfd9cfe61d 100644
--- a/src/plugins/debugger/gdb/attachgdbadapter.cpp
+++ b/src/plugins/debugger/gdb/attachgdbadapter.cpp
@@ -73,7 +73,6 @@ void AttachGdbAdapter::startAdapter()
 void AttachGdbAdapter::handleGdbStarted()
 {
     QTC_ASSERT(state() == AdapterStarting, qDebug() << state());
-    setState(AdapterStarted);
     emit adapterStarted();
 }
 
diff --git a/src/plugins/debugger/gdb/coregdbadapter.cpp b/src/plugins/debugger/gdb/coregdbadapter.cpp
index b0ddd2d7b52..a6cd809a0e5 100644
--- a/src/plugins/debugger/gdb/coregdbadapter.cpp
+++ b/src/plugins/debugger/gdb/coregdbadapter.cpp
@@ -73,7 +73,6 @@ void CoreGdbAdapter::startAdapter()
 void CoreGdbAdapter::handleGdbStarted()
 {
     QTC_ASSERT(state() == AdapterStarting, qDebug() << state());
-    setState(AdapterStarted);
     emit adapterStarted();
 }
 
diff --git a/src/plugins/debugger/gdb/gdbengine.cpp b/src/plugins/debugger/gdb/gdbengine.cpp
index e4b5deb8a8b..3d63dfe69f5 100644
--- a/src/plugins/debugger/gdb/gdbengine.cpp
+++ b/src/plugins/debugger/gdb/gdbengine.cpp
@@ -4100,6 +4100,7 @@ void GdbEngine::handleAdapterStartFailed(const QString &msg, const QString &sett
 
 void GdbEngine::handleAdapterStarted()
 {
+    setState(AdapterStarted);
     debugMessage(_("ADAPTER SUCCESSFULLY STARTED, INITIALIZING GDB"));
 
     postCommand(_("show version"), CB(handleShowVersion));
diff --git a/src/plugins/debugger/gdb/plaingdbadapter.cpp b/src/plugins/debugger/gdb/plaingdbadapter.cpp
index b1395f6439c..a879968a3c5 100644
--- a/src/plugins/debugger/gdb/plaingdbadapter.cpp
+++ b/src/plugins/debugger/gdb/plaingdbadapter.cpp
@@ -93,7 +93,6 @@ void PlainGdbAdapter::startAdapter()
 void PlainGdbAdapter::handleGdbStarted()
 {
     QTC_ASSERT(state() == AdapterStarting, qDebug() << state());
-    setState(AdapterStarted);
     emit adapterStarted();
 }
 
diff --git a/src/plugins/debugger/gdb/remotegdbadapter.cpp b/src/plugins/debugger/gdb/remotegdbadapter.cpp
index d6fdb3381a6..7f134eaeec2 100644
--- a/src/plugins/debugger/gdb/remotegdbadapter.cpp
+++ b/src/plugins/debugger/gdb/remotegdbadapter.cpp
@@ -93,7 +93,6 @@ void RemoteGdbAdapter::startAdapter()
 void RemoteGdbAdapter::handleGdbStarted()
 {
     QTC_ASSERT(state() == AdapterStarting, qDebug() << state());
-    setState(AdapterStarted);
     emit adapterStarted();
 }
 
diff --git a/src/plugins/debugger/gdb/trkgdbadapter.cpp b/src/plugins/debugger/gdb/trkgdbadapter.cpp
index bd32a388104..04a9e30ee1b 100644
--- a/src/plugins/debugger/gdb/trkgdbadapter.cpp
+++ b/src/plugins/debugger/gdb/trkgdbadapter.cpp
@@ -1563,7 +1563,6 @@ void TrkGdbAdapter::maybeAdapterStarted()
 {
     QTC_ASSERT(state() == AdapterStarting, qDebug() << state());
     if (m_gdbProc.state() == QProcess::Running && m_trkDevice.isOpen()) {
-        setState(AdapterStarted);
         emit adapterStarted();
     }
 }