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/qv4engine.cpp | |
| parent | 0e6195a85c5b9beceac719a7ea0c1389667bfcb3 (diff) | |
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/qv4engine.cpp')
| -rw-r--r-- | src/qml/jsruntime/qv4engine.cpp | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/src/qml/jsruntime/qv4engine.cpp b/src/qml/jsruntime/qv4engine.cpp index cd3b60b77f..4254626d63 100644 --- a/src/qml/jsruntime/qv4engine.cpp +++ b/src/qml/jsruntime/qv4engine.cpp @@ -200,7 +200,7 @@ ExecutionEngine::ExecutionEngine(EvalISelFactory *factory) , memoryManager(new QV4::MemoryManager(this)) , executableAllocator(new QV4::ExecutableAllocator) , regExpAllocator(new QV4::ExecutableAllocator) - , currentExecutionContext(0) + , currentContext(0) , bumperPointerAllocator(new WTF::BumpPointerAllocator) , jsStack(new WTF::PageAllocation) , debugger(0) @@ -512,8 +512,8 @@ void ExecutionEngine::initRootContext() jsObjects[RootContect] = r; jsObjects[IntegerNull] = Encode((int)0); - currentExecutionContext = static_cast<ExecutionContext *>(jsObjects + RootContect); - current = currentExecutionContext->d(); + currentContext = static_cast<ExecutionContext *>(jsObjects + RootContect); + current = currentContext->d(); } InternalClass *ExecutionEngine::newClass(const InternalClass &other) @@ -526,7 +526,7 @@ ExecutionContext *ExecutionEngine::pushGlobalContext() pushContext(rootContext()->d()); Q_ASSERT(current == rootContext()->d()); - return currentExecutionContext; + return currentContext; } ExecutionContext *ExecutionEngine::parentContext(ExecutionContext *context) const @@ -741,7 +741,7 @@ Heap::QmlContext *ExecutionEngine::qmlContext() const // get the correct context when we're within a builtin function if (ctx->type == Heap::ExecutionContext::Type_SimpleCallContext && !ctx->outer) - ctx = parentContext(currentExecutionContext)->d(); + ctx = parentContext(currentContext)->d(); if (!ctx->outer) return 0; @@ -801,7 +801,7 @@ QVector<StackFrame> ExecutionEngine::stackTrace(int frameLimit) const ScopedString name(scope); QVector<StackFrame> stack; - ExecutionContext *c = currentExecutionContext; + ExecutionContext *c = currentContext; ScopedFunctionObject function(scope); while (c && frameLimit) { function = c->getFunctionObject(); @@ -889,7 +889,7 @@ QUrl ExecutionEngine::resolvedUrl(const QString &file) return src; QUrl base; - ExecutionContext *c = currentExecutionContext; + ExecutionContext *c = currentContext; while (c) { CallContext *callCtx = c->asCallContext(); if (callCtx && callCtx->d()->function) { |