From e2421afd1b2c100d35fe9b7d6a8775eba8b7b792 Mon Sep 17 00:00:00 2001
From: hjk <hjk@theqtcompany.com>
Date: Wed, 4 Mar 2015 17:50:52 +0100
Subject: [PATCH] Debugger: Simplify *SlaveEngineType StartParameters members

The secondSlaveEngineType was not really used, and the first
either NoEngineType or identical to the cppEngineType.

Change-Id: I1725728ca38636f228ff9b9d8ca7d643a34c64e8
Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
---
 src/plugins/debugger/debuggerruncontrol.cpp    | 7 ++-----
 src/plugins/debugger/debuggerstartparameters.h | 6 ------
 src/plugins/debugger/qml/qmlcppengine.cpp      | 2 +-
 3 files changed, 3 insertions(+), 12 deletions(-)

diff --git a/src/plugins/debugger/debuggerruncontrol.cpp b/src/plugins/debugger/debuggerruncontrol.cpp
index dc5711d30b3..4162ca16298 100644
--- a/src/plugins/debugger/debuggerruncontrol.cpp
+++ b/src/plugins/debugger/debuggerruncontrol.cpp
@@ -414,13 +414,10 @@ DebuggerRunControl *DebuggerRunControlFactory::doCreate
                 const bool useCppDebugger = aspect->useCppDebugger() && (sp.languages & CppLanguage);
                 const bool useQmlDebugger = aspect->useQmlDebugger() && (sp.languages & QmlLanguage);
                 if (useQmlDebugger) {
-                    if (useCppDebugger) {
+                    if (useCppDebugger)
                         sp.masterEngineType = QmlCppEngineType;
-                        sp.firstSlaveEngineType = sp.cppEngineType;
-                        sp.secondSlaveEngineType = QmlCppEngineType;
-                    } else {
+                    else
                         sp.masterEngineType = QmlEngineType;
-                    }
                 } else {
                     sp.masterEngineType = sp.cppEngineType;
                 }
diff --git a/src/plugins/debugger/debuggerstartparameters.h b/src/plugins/debugger/debuggerstartparameters.h
index cb083d0173b..03ece7fc8b5 100644
--- a/src/plugins/debugger/debuggerstartparameters.h
+++ b/src/plugins/debugger/debuggerstartparameters.h
@@ -79,8 +79,6 @@ public:
 
     DebuggerStartParameters()
       : masterEngineType(NoEngineType),
-        firstSlaveEngineType(NoEngineType),
-        secondSlaveEngineType(NoEngineType),
         cppEngineType(NoEngineType),
         runConfiguration(0),
         isSnapshot(false),
@@ -102,11 +100,7 @@ public:
         testCase(0)
     {}
 
-    //Core::Id profileId;
-
     DebuggerEngineType masterEngineType;
-    DebuggerEngineType firstSlaveEngineType;
-    DebuggerEngineType secondSlaveEngineType;
     DebuggerEngineType cppEngineType;
     QString sysRoot;
     QString deviceSymbolsRoot;
diff --git a/src/plugins/debugger/qml/qmlcppengine.cpp b/src/plugins/debugger/qml/qmlcppengine.cpp
index f2a5b82ab93..be9a936b396 100644
--- a/src/plugins/debugger/qml/qmlcppengine.cpp
+++ b/src/plugins/debugger/qml/qmlcppengine.cpp
@@ -74,7 +74,7 @@ QmlCppEngine::QmlCppEngine(const DebuggerStartParameters &sp, QString *errorMess
 {
     setObjectName(QLatin1String("QmlCppEngine"));
     m_qmlEngine = new QmlEngine(sp, this);
-    m_cppEngine = DebuggerRunControlFactory::createEngine(sp.firstSlaveEngineType, sp, errorMessage);
+    m_cppEngine = DebuggerRunControlFactory::createEngine(sp.cppEngineType, sp, errorMessage);
     if (!m_cppEngine) {
         *errorMessage = tr("The slave debugging engine required for combined QML/C++-Debugging could not be created: %1").arg(*errorMessage);
         return;