From: hjk <qtc-committer@nokia.com>
Date: Wed, 12 Jan 2011 13:14:27 +0000 (+0100)
Subject: debugger: QmlEngine: rename master/slave into cpp/qml
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=baab89762e57b8b2567c3d94f725fb5c35c99f66;p=qt-creator-jp%2Fqt-creator-jp.git

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

diff --git a/src/plugins/debugger/qml/qmlcppengine.cpp b/src/plugins/debugger/qml/qmlcppengine.cpp
index a93cbd6ffd..7dc404f7b0 100644
--- a/src/plugins/debugger/qml/qmlcppengine.cpp
+++ b/src/plugins/debugger/qml/qmlcppengine.cpp
@@ -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) {
diff --git a/src/plugins/debugger/qml/qmlcppengine.h b/src/plugins/debugger/qml/qmlcppengine.h
index 0e554aa295..e95e248ec5 100644
--- a/src/plugins/debugger/qml/qmlcppengine.h
+++ b/src/plugins/debugger/qml/qmlcppengine.h
@@ -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);