Qml Debugger: Code style and cleanup

Reviewed-by: hjk

1 files changed, 5 insertions, 31 deletions

diff --git a/src/plugins/debugger/debuggerrunner.cpp b/src/plugins/debugger/debuggerrunner.cpp
index 5c658d7f1a1..19c159b958c 100644
--- a/src/plugins/debugger/debuggerrunner.cpp
+++ b/src/plugins/debugger/debuggerrunner.cpp
@@ -229,8 +229,9 @@ DebuggerRunControl::DebuggerRunControl(RunConfiguration *runConfiguration,
 
 {
     connect(this, SIGNAL(finished()), this, SLOT(handleFinished()));
-    m_isQmlProject = isQmlProject(runConfiguration);
-    createEngine(sp);
+    DebuggerStartParameters startParams = sp;
+    startParams.m_isQmlProject = isQmlProject(runConfiguration);
+    createEngine(startParams);
 }
 
 DebuggerRunControl::~DebuggerRunControl()
@@ -378,8 +379,8 @@ void DebuggerRunControl::createEngine(const DebuggerStartParameters &startParams
     if (!engineType)
         engineType = engineForMode(sp.startMode);
 
-    if (engineType != QmlEngineType && m_isQmlProject && (activeLangs & Lang_Qml)) {
-        if (activeLangs & Lang_Cpp) {
+    if (engineType != QmlEngineType && sp.m_isQmlProject && (activeLangs & QmlLanguage)) {
+        if (activeLangs & CppLanguage) {
             sp.cppEngineType = engineType;
             engineType = QmlCppEngineType;
         } else {
@@ -596,31 +597,4 @@ bool DebuggerRunControl::isQmlProject(RunConfiguration *config)
     return false;
 }
 
-bool DebuggerRunControl::isCurrentProjectQmlCppBased()
-{
-    Project *startupProject = ProjectExplorerPlugin::instance()->startupProject();
-    if (!startupProject)
-        return false;
-
-    if (!startupProject->activeTarget())
-        return false;
-
-    RunConfiguration *rc = startupProject->activeTarget()->activeRunConfiguration();
-
-    return isQmlProject(rc);
-}
-
-bool DebuggerRunControl::isCurrentProjectCppBased()
-{
-    Project *startupProject = ProjectExplorerPlugin::instance()->startupProject();
-    if (!startupProject)
-        return false;
-    const QString id = startupProject->id();
-    return id == _("GenericProjectManager.GenericProject")
-        || id == _("CMakeProjectManager.CMakeProject")
-        || id == _("Qt4ProjectManager.Qt4Project");
-}
-
-
-
 } // namespace Debugger