diff options
author | hjk <qtc-committer@nokia.com> | 2010-07-08 18:10:50 +0200 |
---|---|---|
committer | hjk <qtc-committer@nokia.com> | 2010-07-14 17:49:16 +0200 |
commit | 9e7a4564576040879118ef6d6adfa6d9161e50a2 (patch) | |
tree | 4e3f5f4ab674309de9df6c3060eb5e0117687653 /src/plugins/debugger/script/scriptengine.cpp | |
parent | f2c7d33fa651b48b382a353b9863e4a86fa69e7f (diff) | |
download | qt-creator-9e7a4564576040879118ef6d6adfa6d9161e50a2.tar.gz |
debugger: refactor startup logic
Diffstat (limited to 'src/plugins/debugger/script/scriptengine.cpp')
-rw-r--r-- | src/plugins/debugger/script/scriptengine.cpp | 24 |
1 files changed, 14 insertions, 10 deletions
diff --git a/src/plugins/debugger/script/scriptengine.cpp b/src/plugins/debugger/script/scriptengine.cpp index 569dfc525a..f5d6e3f626 100644 --- a/src/plugins/debugger/script/scriptengine.cpp +++ b/src/plugins/debugger/script/scriptengine.cpp @@ -65,7 +65,7 @@ #include <QtScript/QScriptValue> #include <QtScript/QScriptValueIterator> -// #define DEBUG_SCRIPT 1 +#define DEBUG_SCRIPT 1 #if DEBUG_SCRIPT # define SDEBUG(s) qDebug() << s #else @@ -229,7 +229,7 @@ void ScriptEngine::exitDebugger() setState(DebuggerNotReady); } -void ScriptEngine::startEngine() +void ScriptEngine::setupEngine() { QTC_ASSERT(state() == EngineStarting, qDebug() << state()); showMessage(_("STARTING SCRIPT DEBUGGER"), LogMisc); @@ -246,9 +246,12 @@ void ScriptEngine::startEngine() m_stopOnNextLine = false; m_scriptEngine->abortEvaluation(); - notifyEngineStarted(); - setState(InferiorStarting); + notifyEngineStartOk(); +} +void ScriptEngine::setupInferior() +{ + QTC_ASSERT(state() == InferiorSettingUp, qDebug() << state()); m_scriptFileName = QFileInfo(startParameters().executable).absoluteFilePath(); showMessage(_("SCRIPT FILE: ") + m_scriptFileName); QFile scriptFile(m_scriptFileName); @@ -262,10 +265,7 @@ void ScriptEngine::startEngine() m_scriptContents = stream.readAll(); scriptFile.close(); attemptBreakpointSynchronization(); - setState(InferiorRunningRequested); - showStatusMessage(tr("Running requested..."), 5000); - showMessage(QLatin1String("Running: ") + m_scriptFileName, LogMisc); - QTimer::singleShot(0, this, SLOT(runInferior())); + notifyInferiorSetupOk(); } void ScriptEngine::continueInferior() @@ -322,9 +322,13 @@ bool ScriptEngine::importExtensions() return failExtensions.isEmpty(); } -void ScriptEngine::runInferior() +void ScriptEngine::runEngine() { - SDEBUG("ScriptEngine::runInferior()"); + QTC_ASSERT(state() == InferiorSetupOk, qDebug() << state()); + setState(InferiorRunningRequested); + showStatusMessage(tr("Running requested..."), 5000); + showMessage(QLatin1String("Running: ") + m_scriptFileName, LogMisc); + SDEBUG("ScriptEngine::runEngine()"); importExtensions(); setState(InferiorRunning); const QScriptValue result = m_scriptEngine->evaluate(m_scriptContents, m_scriptFileName); |