diff options
| author | hjk <hjk@qt.io> | 2017-11-07 17:00:24 +0100 |
|---|---|---|
| committer | hjk <hjk@qt.io> | 2017-11-08 12:59:14 +0000 |
| commit | dfbdc1e5438d06ac8de44e8adf0e98dc9cdd066a (patch) | |
| tree | d8915ad9a1597caf242c81b99fba82cfa0269853 /src | |
| parent | 2baf1630441810e206c8c12e6f06417e8eadb5fc (diff) | |
Debugger: Remove public access to QmlCppEngine::m_qmlEngine
Not used anymore.
Change-Id: I30605916bcdb4e5231d86ddc371f2d41e3d9d526
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
Diffstat (limited to 'src')
| -rw-r--r-- | src/plugins/debugger/qml/qmlcppengine.cpp | 23 | ||||
| -rw-r--r-- | src/plugins/debugger/qml/qmlcppengine.h | 1 |
2 files changed, 9 insertions, 15 deletions
diff --git a/src/plugins/debugger/qml/qmlcppengine.cpp b/src/plugins/debugger/qml/qmlcppengine.cpp index 27bcdb3f28..e53fd21872 100644 --- a/src/plugins/debugger/qml/qmlcppengine.cpp +++ b/src/plugins/debugger/qml/qmlcppengine.cpp @@ -457,7 +457,7 @@ void QmlCppEngine::slaveEngineStateChanged break; } case EngineSetupFailed: { - qmlEngine()->quitDebugger(); + m_qmlEngine->quitDebugger(); notifyEngineSetupFailed(); break; } @@ -471,7 +471,7 @@ void QmlCppEngine::slaveEngineStateChanged break; } case InferiorSetupFailed: { - qmlEngine()->quitDebugger(); + m_qmlEngine->quitDebugger(); notifyInferiorSetupFailed(); break; } @@ -484,12 +484,12 @@ void QmlCppEngine::slaveEngineStateChanged break; } case EngineRunFailed: { - qmlEngine()->quitDebugger(); + m_qmlEngine->quitDebugger(); notifyEngineRunFailed(); break; } case InferiorUnrunnable: { - qmlEngine()->quitDebugger(); + m_qmlEngine->quitDebugger(); notifyEngineRunOkAndInferiorUnrunnable(); break; } @@ -509,7 +509,7 @@ void QmlCppEngine::slaveEngineStateChanged else QTC_ASSERT(false, qDebug() << state()); - if (qmlEngine()->state() == InferiorStopOk) { + if (m_qmlEngine->state() == InferiorStopOk) { // track qml engine again setState(InferiorStopRequested); notifyInferiorStopOk(); @@ -518,7 +518,7 @@ void QmlCppEngine::slaveEngineStateChanged break; } case InferiorRunFailed: { - qmlEngine()->quitDebugger(); + m_qmlEngine->quitDebugger(); notifyInferiorRunFailed(); break; } @@ -605,7 +605,7 @@ void QmlCppEngine::slaveEngineStateChanged // might be set by queueShutdownInferior() already CHECK_STATE(InferiorShutdownRequested); } - qmlEngine()->quitDebugger(); + m_qmlEngine->quitDebugger(); break; } case InferiorShutdownFailed: { @@ -656,7 +656,7 @@ void QmlCppEngine::slaveEngineStateChanged notifyInferiorStopOk(); // otherwise we're probably inside notifyInferiorStopOk already } else { - if (m_activeEngine != qmlEngine()) { + if (m_activeEngine != m_qmlEngine) { showStatusMessage(tr("QML debugger activated")); setActiveEngine(m_qmlEngine); } @@ -670,7 +670,7 @@ void QmlCppEngine::slaveEngineStateChanged } } else if (newState == InferiorRunOk) { - if (m_activeEngine == qmlEngine()) { + if (m_activeEngine == m_qmlEngine) { CHECK_STATE(InferiorRunRequested); notifyInferiorRunOk(); } @@ -700,11 +700,6 @@ void QmlCppEngine::debugLastCommand() m_cppEngine->debugLastCommand(); } -DebuggerEngine *QmlCppEngine::qmlEngine() const -{ - return m_qmlEngine; -} - void QmlCppEngine::setRunTool(DebuggerRunTool *runTool) { DebuggerEngine::setRunTool(runTool); diff --git a/src/plugins/debugger/qml/qmlcppengine.h b/src/plugins/debugger/qml/qmlcppengine.h index 751fa3c410..a9ca357efc 100644 --- a/src/plugins/debugger/qml/qmlcppengine.h +++ b/src/plugins/debugger/qml/qmlcppengine.h @@ -79,7 +79,6 @@ public: const QString &expr, const QVariant &value) override; DebuggerEngine *cppEngine() override { return m_cppEngine; } - DebuggerEngine *qmlEngine() const; DebuggerEngine *activeEngine() override { return m_activeEngine; } void setRunTool(DebuggerRunTool *runTool) override; |