From 0c8283234aceefb721613a4b0353f680b2e4be79 Mon Sep 17 00:00:00 2001
From: hjk <hjk@qt.io>
Date: Tue, 26 Sep 2017 15:22:14 +0200
Subject: [PATCH] Debugger: Simplify GdbEngine construction

Change-Id: I4af1cb7d7480b1db68693881254cbc89d985c33e
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
---
 src/plugins/debugger/debuggerruncontrol.cpp | 4 ++--
 src/plugins/debugger/gdb/gdbengine.cpp      | 9 +++++----
 src/plugins/debugger/gdb/gdbengine.h        | 4 ++--
 3 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/src/plugins/debugger/debuggerruncontrol.cpp b/src/plugins/debugger/debuggerruncontrol.cpp
index 4953efe54bf..5d9870d8679 100644
--- a/src/plugins/debugger/debuggerruncontrol.cpp
+++ b/src/plugins/debugger/debuggerruncontrol.cpp
@@ -77,7 +77,7 @@ namespace Debugger {
 namespace Internal {
 
 DebuggerEngine *createCdbEngine(QStringList *error, DebuggerStartMode sm);
-DebuggerEngine *createGdbEngine(DebuggerStartMode sm);
+DebuggerEngine *createGdbEngine();
 DebuggerEngine *createPdbEngine();
 DebuggerEngine *createQmlEngine(bool useTerminal);
 DebuggerEngine *createQmlCppEngine(DebuggerEngine *cppEngine, bool useTerminal);
@@ -482,7 +482,7 @@ void DebuggerRunTool::start()
 
     switch (m_runParameters.cppEngineType) {
         case GdbEngineType:
-            cppEngine = createGdbEngine(m_runParameters.startMode);
+            cppEngine = createGdbEngine();
             break;
         case CdbEngineType: {
             QStringList errors;
diff --git a/src/plugins/debugger/gdb/gdbengine.cpp b/src/plugins/debugger/gdb/gdbengine.cpp
index 7a10520f31c..2370d6f22f9 100644
--- a/src/plugins/debugger/gdb/gdbengine.cpp
+++ b/src/plugins/debugger/gdb/gdbengine.cpp
@@ -189,8 +189,7 @@ private:
 //
 ///////////////////////////////////////////////////////////////////////
 
-GdbEngine::GdbEngine(DebuggerStartMode startMode)
-    : m_startMode(startMode)
+GdbEngine::GdbEngine()
 {
     setObjectName("GdbEngine");
 
@@ -4317,6 +4316,8 @@ bool GdbEngine::isTermEngine() const
 
 void GdbEngine::setupEngine()
 {
+    m_startMode = runParameters().startMode;
+
     CHECK_STATE(EngineSetupRequested);
     showMessage("TRYING TO START ADAPTER");
 
@@ -5161,9 +5162,9 @@ QString GdbEngine::mainFunction() const
 // Factory
 //
 
-DebuggerEngine *createGdbEngine(DebuggerStartMode startMode)
+DebuggerEngine *createGdbEngine()
 {
-    return new GdbEngine(startMode);
+    return new GdbEngine;
 }
 
 } // namespace Internal
diff --git a/src/plugins/debugger/gdb/gdbengine.h b/src/plugins/debugger/gdb/gdbengine.h
index 554286b9dbd..506f68c34c6 100644
--- a/src/plugins/debugger/gdb/gdbengine.h
+++ b/src/plugins/debugger/gdb/gdbengine.h
@@ -72,7 +72,7 @@ class GdbEngine : public DebuggerEngine
     Q_OBJECT
 
 public:
-    explicit GdbEngine(DebuggerStartMode startMode);
+    GdbEngine();
     ~GdbEngine() final;
 
 private: ////////// General Interface //////////
@@ -92,7 +92,6 @@ private: ////////// General Interface //////////
 
     ////////// General State //////////
 
-    const DebuggerStartMode m_startMode;
     bool m_registerNamesListed = false;
 
     ////////// Gdb Process Management //////////
@@ -462,6 +461,7 @@ private: ////////// General Interface //////////
     Utils::QtcProcess m_gdbProc;
     OutputCollector m_outputCollector;
     QString m_errorString;
+    DebuggerStartMode m_startMode = NoStartMode;
 };
 
 } // namespace Internal