Commit baab8976 authored by hjk's avatar hjk

debugger: QmlEngine: rename master/slave into cpp/qml

parent ae46124a
......@@ -71,9 +71,9 @@ QmlCppEngine::QmlCppEngine(const DebuggerStartParameters &sp)
d->m_activeEngine = d->m_cppEngine;
connect(d->m_cppEngine, SIGNAL(stateChanged(DebuggerState)),
SLOT(masterEngineStateChanged(DebuggerState)));
SLOT(cppEngineStateChanged(DebuggerState)));
connect(d->m_qmlEngine, SIGNAL(stateChanged(DebuggerState)),
SLOT(slaveEngineStateChanged(DebuggerState)));
SLOT(qmlEngineStateChanged(DebuggerState)));
connect(Core::EditorManager::instance(),
SIGNAL(currentEditorChanged(Core::IEditor*)),
......@@ -528,23 +528,20 @@ void QmlCppEngine::setupSlaveEngine()
d->m_qmlEngine->startDebugger(runControl());
}
void QmlCppEngine::masterEngineStateChanged(const DebuggerState &newState)
void QmlCppEngine::cppEngineStateChanged(const DebuggerState &newState)
{
if (newState == InferiorStopOk) {
if (newState == InferiorStopOk)
setActiveEngine(CppLanguage);
}
engineStateChanged(newState);
}
void QmlCppEngine::slaveEngineStateChanged(const DebuggerState &newState)
void QmlCppEngine::qmlEngineStateChanged(const DebuggerState &newState)
{
if (newState == InferiorStopOk) {
if (newState == InferiorStopOk)
setActiveEngine(QmlLanguage);
}
engineStateChanged(newState);
}
void QmlCppEngine::engineStateChanged(const DebuggerState &newState)
{
switch (newState) {
......
......@@ -104,8 +104,8 @@ protected:
virtual void shutdownEngine();
private slots:
void masterEngineStateChanged(const DebuggerState &state);
void slaveEngineStateChanged(const DebuggerState &state);
void cppEngineStateChanged(const DebuggerState &state);
void qmlEngineStateChanged(const DebuggerState &state);
void setupSlaveEngine();
void editorChanged(Core::IEditor *editor);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment