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

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

Browse Source
This commit is contained in:
hjk
2011-01-12 14:14:27 +01:00
parent ae46124a63
commit baab89762e
2 changed files with 8 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -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) {

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

@@ -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);