From 3ebc5220a38c94a10077fc9aff7a89ac36331f44 Mon Sep 17 00:00:00 2001
From: hjk <hjk121@nokiamail.com>
Date: Thu, 22 May 2014 17:56:14 +0200
Subject: [PATCH] Debugger: Simplify raise-on-stop logic

Also slightly change meaning (now all stops may cause raising).

Change-Id: Ie3fee7371ab119e4e9747dc44a4d8ef2cd62c8d8
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
---
 src/plugins/debugger/debuggerengine.cpp     |  3 ++-
 src/plugins/debugger/debuggerengine.h       |  1 -
 src/plugins/debugger/debuggermainwindow.cpp | 13 -------------
 src/plugins/debugger/debuggermainwindow.h   |  2 --
 src/plugins/debugger/debuggerplugin.cpp     |  1 -
 5 files changed, 2 insertions(+), 18 deletions(-)

diff --git a/src/plugins/debugger/debuggerengine.cpp b/src/plugins/debugger/debuggerengine.cpp
index 1eec639b814..283ab977386 100644
--- a/src/plugins/debugger/debuggerengine.cpp
+++ b/src/plugins/debugger/debuggerengine.cpp
@@ -49,6 +49,7 @@
 
 #include <coreplugin/editormanager/editormanager.h>
 #include <coreplugin/editormanager/ieditor.h>
+#include <coreplugin/icore.h>
 #include <coreplugin/progressmanager/progressmanager.h>
 #include <coreplugin/progressmanager/futureprogress.h>
 
@@ -944,7 +945,7 @@ void DebuggerEngine::notifyInferiorSpontaneousStop()
     showStatusMessage(tr("Stopped."));
     setState(InferiorStopOk);
     if (debuggerCore()->boolSetting(RaiseOnInterrupt))
-        emit raiseWindow();
+        ICore::raiseWindow(debuggerCore()->mainWindow());
 }
 
 void DebuggerEngine::notifyInferiorStopFailed()
diff --git a/src/plugins/debugger/debuggerengine.h b/src/plugins/debugger/debuggerengine.h
index d9a3aa51d04..d513ee61040 100644
--- a/src/plugins/debugger/debuggerengine.h
+++ b/src/plugins/debugger/debuggerengine.h
@@ -283,7 +283,6 @@ signals:
      * a server start script should be used, but none is given.
      */
     void requestRemoteSetup();
-    void raiseWindow();
 
 protected:
     // The base notify*() function implementation should be sufficient
diff --git a/src/plugins/debugger/debuggermainwindow.cpp b/src/plugins/debugger/debuggermainwindow.cpp
index a84532d8d25..576713e67be 100644
--- a/src/plugins/debugger/debuggermainwindow.cpp
+++ b/src/plugins/debugger/debuggermainwindow.cpp
@@ -29,7 +29,6 @@
 
 #include "debuggermainwindow.h"
 #include "debuggercore.h"
-#include "debuggerengine.h"
 #include "debuggerrunconfigurationaspect.h"
 
 #include <utils/appmainwindow.h>
@@ -131,8 +130,6 @@ public:
     Project *m_previousProject;
     Target *m_previousTarget;
     RunConfiguration *m_previousRunConfiguration;
-
-    DebuggerEngine *m_engine;
 };
 
 DebuggerMainWindowPrivate::DebuggerMainWindowPrivate(DebuggerMainWindow *mw)
@@ -150,7 +147,6 @@ DebuggerMainWindowPrivate::DebuggerMainWindowPrivate(DebuggerMainWindow *mw)
     , m_previousProject(0)
     , m_previousTarget(0)
     , m_previousRunConfiguration(0)
-    , m_engine(0)
 {
     m_debugToolBarLayout->setMargin(0);
     m_debugToolBarLayout->setSpacing(0);
@@ -266,15 +262,6 @@ DebuggerMainWindow::~DebuggerMainWindow()
     delete d;
 }
 
-void DebuggerMainWindow::setCurrentEngine(DebuggerEngine *engine)
-{
-    if (d->m_engine)
-        disconnect(d->m_engine, SIGNAL(raiseWindow()), ICore::mainWindow(), SLOT(raiseWindow()));
-    d->m_engine = engine;
-    if (d->m_engine)
-        connect(d->m_engine, SIGNAL(raiseWindow()), ICore::mainWindow(), SLOT(raiseWindow()));
-}
-
 DebuggerLanguages DebuggerMainWindow::activeDebugLanguages() const
 {
     return d->m_activeDebugLanguages;
diff --git a/src/plugins/debugger/debuggermainwindow.h b/src/plugins/debugger/debuggermainwindow.h
index 23c87cfb38e..ad9b55599df 100644
--- a/src/plugins/debugger/debuggermainwindow.h
+++ b/src/plugins/debugger/debuggermainwindow.h
@@ -69,8 +69,6 @@ public:
     DebuggerMainWindow();
     ~DebuggerMainWindow();
 
-    void setCurrentEngine(DebuggerEngine *engine);
-
     // Debugger toolbars are registered with this function.
     void setToolBar(DebuggerLanguage language, QWidget *widget);
 
diff --git a/src/plugins/debugger/debuggerplugin.cpp b/src/plugins/debugger/debuggerplugin.cpp
index 6438b86e83e..9f2b49258ac 100644
--- a/src/plugins/debugger/debuggerplugin.cpp
+++ b/src/plugins/debugger/debuggerplugin.cpp
@@ -2109,7 +2109,6 @@ void DebuggerPluginPrivate::connectEngine(DebuggerEngine *engine)
     m_inspectorWindow->setModel(engine->watchModel());
 
     mainWindow()->setEngineDebugLanguages(engine->startParameters().languages);
-    mainWindow()->setCurrentEngine(engine);
 }
 
 static void changeFontSize(QWidget *widget, qreal size)