diff options
author | Lars Knoll <lars.knoll@theqtcompany.com> | 2015-08-24 16:18:11 +0200 |
---|---|---|
committer | Lars Knoll <lars.knoll@theqtcompany.com> | 2015-09-15 07:37:26 +0000 |
commit | 830376c9621dc8ada8e63b8b15f9abf856facfef (patch) | |
tree | 87bb68f0d17d7ceecdaf49991b810e1a9bd5d537 /src/qml/jsruntime/qv4debugging.cpp | |
parent | 0e6195a85c5b9beceac719a7ea0c1389667bfcb3 (diff) | |
download | qtdeclarative-830376c9621dc8ada8e63b8b15f9abf856facfef.tar.gz |
Rename currentExecutionContext to currentContext
Now that the other method is gone, let's use
the shorter currentContext
Change-Id: I2a6fb3b77f83a1ffdf314ad29081e303d17030ed
Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>
Diffstat (limited to 'src/qml/jsruntime/qv4debugging.cpp')
-rw-r--r-- | src/qml/jsruntime/qv4debugging.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/qml/jsruntime/qv4debugging.cpp b/src/qml/jsruntime/qv4debugging.cpp index 687ea35808..79fd58f700 100644 --- a/src/qml/jsruntime/qv4debugging.cpp +++ b/src/qml/jsruntime/qv4debugging.cpp @@ -68,7 +68,7 @@ void Debugger::JavaScriptJob::run() ExecutionContextSaver saver(scope); - ExecutionContext *ctx = engine->currentExecutionContext; + ExecutionContext *ctx = engine->currentContext; if (frameNr > 0) { for (int i = 0; i < frameNr; ++i) { ctx = engine->parentContext(ctx); @@ -150,7 +150,7 @@ void Debugger::resume(Speed speed) if (!m_returnedValue.isUndefined()) m_returnedValue.set(m_engine, Encode::undefined()); - m_currentContext.set(m_engine, *m_engine->currentExecutionContext); + m_currentContext.set(m_engine, *m_engine->currentContext); m_stepping = speed; m_runningCondition.wakeAll(); } @@ -235,7 +235,7 @@ void Debugger::enteringFunction() QMutexLocker locker(&m_lock); if (m_stepping == StepIn) { - m_currentContext.set(m_engine, *m_engine->currentExecutionContext); + m_currentContext.set(m_engine, *m_engine->currentContext); } } @@ -248,7 +248,7 @@ void Debugger::leavingFunction(const ReturnedValue &retVal) QMutexLocker locker(&m_lock); if (m_stepping != NotStepping && m_currentContext.asManaged()->d() == m_engine->current) { - m_currentContext.set(m_engine, *m_engine->parentContext(m_engine->currentExecutionContext)); + m_currentContext.set(m_engine, *m_engine->parentContext(m_engine->currentContext)); m_stepping = StepOver; m_returnedValue.set(m_engine, retVal); } @@ -269,7 +269,7 @@ void Debugger::aboutToThrow() Function *Debugger::getFunction() const { Scope scope(m_engine); - ExecutionContext *context = m_engine->currentExecutionContext; + ExecutionContext *context = m_engine->currentContext; ScopedFunctionObject function(scope, context->getFunctionObject()); if (function) return function->function(); |