feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Debugger: Remove public access to QmlCppEngine::m_qmlEngine

Browse Source 
Not used anymore.

Change-Id: I30605916bcdb4e5231d86ddc371f2d41e3d9d526
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
This commit is contained in:
hjk
2017-11-07 17:00:24 +01:00
parent 2baf163044
commit dfbdc1e543
2 changed files with 9 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
src/plugins/debugger/qml/qmlcppengine.cpp
View File

@@ -457,7 +457,7 @@ void QmlCppEngine::slaveEngineStateChanged
break; break;
} }
case EngineSetupFailed: { case EngineSetupFailed: {
qmlEngine()->quitDebugger(); m_qmlEngine->quitDebugger();
notifyEngineSetupFailed(); notifyEngineSetupFailed();
break; break;
} }
@@ -471,7 +471,7 @@ void QmlCppEngine::slaveEngineStateChanged
break; break;
} }
case InferiorSetupFailed: { case InferiorSetupFailed: {
qmlEngine()->quitDebugger(); m_qmlEngine->quitDebugger();
notifyInferiorSetupFailed(); notifyInferiorSetupFailed();
break; break;
} }
@@ -484,12 +484,12 @@ void QmlCppEngine::slaveEngineStateChanged
break; break;
} }
case EngineRunFailed: { case EngineRunFailed: {
qmlEngine()->quitDebugger(); m_qmlEngine->quitDebugger();
notifyEngineRunFailed(); notifyEngineRunFailed();
break; break;
} }
case InferiorUnrunnable: { case InferiorUnrunnable: {
qmlEngine()->quitDebugger(); m_qmlEngine->quitDebugger();
notifyEngineRunOkAndInferiorUnrunnable(); notifyEngineRunOkAndInferiorUnrunnable();
break; break;
} }
@@ -509,7 +509,7 @@ void QmlCppEngine::slaveEngineStateChanged
else else
QTC_ASSERT(false, qDebug() << state()); QTC_ASSERT(false, qDebug() << state());
if (qmlEngine()->state() == InferiorStopOk) { if (m_qmlEngine->state() == InferiorStopOk) {
// track qml engine again // track qml engine again
setState(InferiorStopRequested); setState(InferiorStopRequested);
notifyInferiorStopOk(); notifyInferiorStopOk();
@@ -518,7 +518,7 @@ void QmlCppEngine::slaveEngineStateChanged
break; break;
} }
case InferiorRunFailed: { case InferiorRunFailed: {
qmlEngine()->quitDebugger(); m_qmlEngine->quitDebugger();
notifyInferiorRunFailed(); notifyInferiorRunFailed();
break; break;
} }
@@ -605,7 +605,7 @@ void QmlCppEngine::slaveEngineStateChanged
// might be set by queueShutdownInferior() already // might be set by queueShutdownInferior() already
CHECK_STATE(InferiorShutdownRequested); CHECK_STATE(InferiorShutdownRequested);
} }
qmlEngine()->quitDebugger(); m_qmlEngine->quitDebugger();
break; break;
} }
case InferiorShutdownFailed: { case InferiorShutdownFailed: {
@@ -656,7 +656,7 @@ void QmlCppEngine::slaveEngineStateChanged
notifyInferiorStopOk(); notifyInferiorStopOk();
// otherwise we're probably inside notifyInferiorStopOk already // otherwise we're probably inside notifyInferiorStopOk already
} else { } else {
if (m_activeEngine != qmlEngine()) { if (m_activeEngine != m_qmlEngine) {
showStatusMessage(tr("QML debugger activated")); showStatusMessage(tr("QML debugger activated"));
setActiveEngine(m_qmlEngine); setActiveEngine(m_qmlEngine);
} }
@@ -670,7 +670,7 @@ void QmlCppEngine::slaveEngineStateChanged
} }
} else if (newState == InferiorRunOk) { } else if (newState == InferiorRunOk) {
if (m_activeEngine == qmlEngine()) { if (m_activeEngine == m_qmlEngine) {
CHECK_STATE(InferiorRunRequested); CHECK_STATE(InferiorRunRequested);
notifyInferiorRunOk(); notifyInferiorRunOk();
} }
@@ -700,11 +700,6 @@ void QmlCppEngine::debugLastCommand()
m_cppEngine->debugLastCommand(); m_cppEngine->debugLastCommand();
} }
DebuggerEngine *QmlCppEngine::qmlEngine() const
{
return m_qmlEngine;
}
void QmlCppEngine::setRunTool(DebuggerRunTool *runTool) void QmlCppEngine::setRunTool(DebuggerRunTool *runTool)
{ {
DebuggerEngine::setRunTool(runTool); DebuggerEngine::setRunTool(runTool);

1
src/plugins/debugger/qml/qmlcppengine.h
View File

@@ -79,7 +79,6 @@ public:
const QString &expr, const QVariant &value) override; const QString &expr, const QVariant &value) override;
DebuggerEngine *cppEngine() override { return m_cppEngine; } DebuggerEngine *cppEngine() override { return m_cppEngine; }
DebuggerEngine *qmlEngine() const;
DebuggerEngine *activeEngine() override { return m_activeEngine; } DebuggerEngine *activeEngine() override { return m_activeEngine; }
void setRunTool(DebuggerRunTool *runTool) override; void setRunTool(DebuggerRunTool *runTool) override;