From de151fc1db8eb5bfc9ef70f0744f4a9f074b8603 Mon Sep 17 00:00:00 2001 From: Aurindam Jana Date: Fri, 13 Jan 2012 15:33:52 +0100 Subject: ScriptConsole: Refactor Clean up QmlEngine specific code from debbuger plugin. The logic to check if the current debug engine is qmlengine is done by scriptconsole. It also listens to debug engine state transitions to enable/disable itself accordingly. Change-Id: If21b1167e870e87166b2f7fd6f3283063e47ded0 Reviewed-by: Kai Koehne --- src/plugins/debugger/debuggerplugin.cpp | 24 +----------------------- 1 file changed, 1 insertion(+), 23 deletions(-) (limited to 'src/plugins/debugger/debuggerplugin.cpp') diff --git a/src/plugins/debugger/debuggerplugin.cpp b/src/plugins/debugger/debuggerplugin.cpp index d02d52396d..c799e09f6e 100644 --- a/src/plugins/debugger/debuggerplugin.cpp +++ b/src/plugins/debugger/debuggerplugin.cpp @@ -62,8 +62,6 @@ #include "watchwindow.h" #include "watchutils.h" #include "debuggertooltipmanager.h" -#include "qml/qmlengine.h" -#include "qml/qmlcppengine.h" #include "snapshothandler.h" #include "threadshandler.h" @@ -2097,14 +2095,7 @@ void DebuggerPluginPrivate::connectEngine(DebuggerEngine *engine) //m_threadBox->setModelColumn(ThreadData::ComboNameColumn); m_watchersWindow->setModel(engine->watchersModel()); - //Initialize QmlJSConsole - QmlEngine *qmlEngine = qobject_cast(engine); - QmlCppEngine *qmlCppEngine = qobject_cast(engine); - if (qmlCppEngine) - qmlEngine = qobject_cast(qmlCppEngine->qmlEngine()); - if (qmlEngine) { - m_scriptConsoleWindow->setQmlAdapter(qmlEngine->adapter()); - } + m_scriptConsoleWindow->setEngine(engine); engine->watchHandler()->rebuildModel(); @@ -2376,19 +2367,6 @@ void DebuggerPluginPrivate::updateState(DebuggerEngine *engine) || state == InferiorUnrunnable; setBusyCursor(!notbusy); - //Console should be enabled only for QML - QmlEngine *qmlEngine = qobject_cast(engine); - QmlCppEngine *qmlCppEngine = qobject_cast(engine); - if (qmlCppEngine) - qmlEngine = qobject_cast(qmlCppEngine->qmlEngine()); - - if (qmlEngine && (state == InferiorRunOk || state == InferiorStopOk)) { - m_scriptConsoleWindow->setEnabled(true); - m_scriptConsoleWindow->setInferiorStopped(state == InferiorStopOk); - } else { - m_scriptConsoleWindow->setEnabled(false); - } - } void DebuggerPluginPrivate::updateDebugActions() -- cgit v1.2.1