diff --git a/src/plugins/debugger/cdb/cdbdebugengine.cpp b/src/plugins/debugger/cdb/cdbdebugengine.cpp index ec12862315e..7d42085b4ac 100644 --- a/src/plugins/debugger/cdb/cdbdebugengine.cpp +++ b/src/plugins/debugger/cdb/cdbdebugengine.cpp @@ -374,7 +374,7 @@ void CdbDebugEngine::startupChecks() syncDebuggerPaths(); } -void CdbDebugEngine::startDebugger() +void CdbDebugEngine::startEngine() { QTC_ASSERT(state() == EngineStarting, qDebug() << state()); const DebuggerStartParameters &sp = startParameters(); diff --git a/src/plugins/debugger/cdb/cdbdebugengine.h b/src/plugins/debugger/cdb/cdbdebugengine.h index 265e0bb1baf..55aa365444a 100644 --- a/src/plugins/debugger/cdb/cdbdebugengine.h +++ b/src/plugins/debugger/cdb/cdbdebugengine.h @@ -58,7 +58,7 @@ public: virtual void shutdown(); virtual void setToolTipExpression(const QPoint &mousePos, TextEditor::ITextEditor *editor, int cursorPos); - virtual void startDebugger(); + virtual void startEngine(); virtual void exitDebugger(); virtual void detachDebugger(); virtual void updateWatchData(const WatchData &data); diff --git a/src/plugins/debugger/debuggerengine.cpp b/src/plugins/debugger/debuggerengine.cpp index c89a03d751b..6b4853e408a 100644 --- a/src/plugins/debugger/debuggerengine.cpp +++ b/src/plugins/debugger/debuggerengine.cpp @@ -636,7 +636,7 @@ void DebuggerEngine::startDebugger(DebuggerRunControl *runControl) ->setEnabled(engineCapabilities & DisassemblerCapability); setState(EngineStarting); - startDebugger(); + startEngine(); } void DebuggerEngine::breakByFunctionMain() diff --git a/src/plugins/debugger/debuggerengine.h b/src/plugins/debugger/debuggerengine.h index 3249ece97a4..0f7ba095238 100644 --- a/src/plugins/debugger/debuggerengine.h +++ b/src/plugins/debugger/debuggerengine.h @@ -126,7 +126,7 @@ public: TextEditor::ITextEditor * /* editor */, int /* cursorPos */) { } void initializeFromTemplate(DebuggerEngine *other); void startDebugger(DebuggerRunControl *runControl); - virtual void startDebugger() {} + virtual void startEngine() {} virtual void exitDebugger() {} virtual void detachDebugger() {} virtual void updateWatchData(const WatchData & /* data */) { } diff --git a/src/plugins/debugger/gdb/gdbengine.cpp b/src/plugins/debugger/gdb/gdbengine.cpp index ba6b663c2be..0cd5b96f4ef 100644 --- a/src/plugins/debugger/gdb/gdbengine.cpp +++ b/src/plugins/debugger/gdb/gdbengine.cpp @@ -1759,7 +1759,7 @@ AbstractGdbAdapter *GdbEngine::createAdapter() } } -void GdbEngine::startDebugger() +void GdbEngine::startEngine() { //qDebug() << "GDB START DEBUGGER"; QTC_ASSERT(state() == EngineStarting, qDebug() << state()); diff --git a/src/plugins/debugger/gdb/gdbengine.h b/src/plugins/debugger/gdb/gdbengine.h index cfaa8447a71..4008b7d658a 100644 --- a/src/plugins/debugger/gdb/gdbengine.h +++ b/src/plugins/debugger/gdb/gdbengine.h @@ -105,7 +105,7 @@ private: private: ////////// General Interface ////////// - virtual void startDebugger(); + virtual void startEngine(); virtual unsigned debuggerCapabilities() const; virtual void exitDebugger(); virtual void quitDebugger(); diff --git a/src/plugins/debugger/pdb/pdbengine.cpp b/src/plugins/debugger/pdb/pdbengine.cpp index a42ba43ec9f..4c92eb09cd7 100644 --- a/src/plugins/debugger/pdb/pdbengine.cpp +++ b/src/plugins/debugger/pdb/pdbengine.cpp @@ -138,7 +138,7 @@ void PdbEngine::exitDebugger() setState(DebuggerNotReady); } -void PdbEngine::startDebugger() +void PdbEngine::startEngine() { QTC_ASSERT(state() == EngineStarting, qDebug() << state()); diff --git a/src/plugins/debugger/pdb/pdbengine.h b/src/plugins/debugger/pdb/pdbengine.h index b36b2d1508c..28bfa46a3e1 100644 --- a/src/plugins/debugger/pdb/pdbengine.h +++ b/src/plugins/debugger/pdb/pdbengine.h @@ -72,7 +72,7 @@ private: void shutdown(); void setToolTipExpression(const QPoint &mousePos, TextEditor::ITextEditor *editor, int cursorPos); - void startDebugger(); + void startEngine(); void exitDebugger(); diff --git a/src/plugins/debugger/qml/qmlengine.cpp b/src/plugins/debugger/qml/qmlengine.cpp index 5a4ff1408f0..5960acdbb4f 100644 --- a/src/plugins/debugger/qml/qmlengine.cpp +++ b/src/plugins/debugger/qml/qmlengine.cpp @@ -226,7 +226,7 @@ void QmlEngine::exitDebugger() const int serverPort = 3768; -void QmlEngine::startDebugger() +void QmlEngine::startEngine() { QTC_ASSERT(state() == EngineStarting, qDebug() << state()); const DebuggerStartParameters &sp = startParameters(); diff --git a/src/plugins/debugger/qml/qmlengine.h b/src/plugins/debugger/qml/qmlengine.h index 8e53808852b..abcd335439e 100644 --- a/src/plugins/debugger/qml/qmlengine.h +++ b/src/plugins/debugger/qml/qmlengine.h @@ -88,7 +88,7 @@ private: void shutdown(); void setToolTipExpression(const QPoint &mousePos, TextEditor::ITextEditor *editor, int cursorPos); - void startDebugger(); + void startEngine(); void exitDebugger(); void continueInferior(); diff --git a/src/plugins/debugger/script/scriptengine.cpp b/src/plugins/debugger/script/scriptengine.cpp index c2ccecf7b8d..70ffe851906 100644 --- a/src/plugins/debugger/script/scriptengine.cpp +++ b/src/plugins/debugger/script/scriptengine.cpp @@ -229,7 +229,7 @@ void ScriptEngine::exitDebugger() setState(DebuggerNotReady); } -void ScriptEngine::startDebugger() +void ScriptEngine::startEngine() { QTC_ASSERT(state() == EngineStarting, qDebug() << state()); showMessage(_("STARTING SCRIPT DEBUGGER"), LogMisc); diff --git a/src/plugins/debugger/script/scriptengine.h b/src/plugins/debugger/script/scriptengine.h index 580b0230768..b149243e281 100644 --- a/src/plugins/debugger/script/scriptengine.h +++ b/src/plugins/debugger/script/scriptengine.h @@ -71,7 +71,7 @@ private: void shutdown(); void setToolTipExpression(const QPoint &mousePos, TextEditor::ITextEditor *editor, int cursorPos); - void startDebugger(); + void startEngine(); void exitDebugger(); void continueInferior(); diff --git a/src/plugins/debugger/tcf/tcfengine.cpp b/src/plugins/debugger/tcf/tcfengine.cpp index fdfe8f2f1d4..cd458ef48bb 100644 --- a/src/plugins/debugger/tcf/tcfengine.cpp +++ b/src/plugins/debugger/tcf/tcfengine.cpp @@ -200,7 +200,7 @@ void TcfEngine::exitDebugger() SDEBUG("TcfEngine::exitDebugger()"); } -void TcfEngine::startDebugger() +void TcfEngine::startEngine() { QTC_ASSERT(state() == EngineStarting, qDebug() << state()); setState(InferiorRunningRequested); diff --git a/src/plugins/debugger/tcf/tcfengine.h b/src/plugins/debugger/tcf/tcfengine.h index 41f5bb6cdc3..ff1a0a98481 100644 --- a/src/plugins/debugger/tcf/tcfengine.h +++ b/src/plugins/debugger/tcf/tcfengine.h @@ -74,7 +74,7 @@ private: void shutdown(); void setToolTipExpression(const QPoint &mousePos, TextEditor::ITextEditor *editor, int cursorPos); - void startDebugger(); + void startEngine(); void exitDebugger(); void continueInferior();