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_p.h | |
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_p.h')
-rw-r--r-- | src/qml/jsruntime/qv4engine_p.h | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/src/qml/jsruntime/qv4engine_p.h b/src/qml/jsruntime/qv4engine_p.h index eaa0439c74..eba60bf215 100644 --- a/src/qml/jsruntime/qv4engine_p.h +++ b/src/qml/jsruntime/qv4engine_p.h @@ -87,7 +87,7 @@ public: ExecutableAllocator *regExpAllocator; QScopedPointer<EvalISelFactory> iselFactory; - ExecutionContext *currentExecutionContext; + ExecutionContext *currentContext; Value *jsStackLimit; quintptr cStackLimit; @@ -446,12 +446,12 @@ public: inline void ExecutionEngine::pushContext(Heap::ExecutionContext *context) { - Q_ASSERT(currentExecutionContext && context); + Q_ASSERT(currentContext && context); Value *v = jsAlloca(2); v[0] = Encode(context); - v[1] = Encode((int)(v - static_cast<Value *>(currentExecutionContext))); - currentExecutionContext = static_cast<ExecutionContext *>(v); - current = currentExecutionContext->d(); + v[1] = Encode((int)(v - static_cast<Value *>(currentContext))); + currentContext = static_cast<ExecutionContext *>(v); + current = currentContext->d(); } inline void ExecutionEngine::pushContext(ExecutionContext *context) @@ -462,13 +462,13 @@ inline void ExecutionEngine::pushContext(ExecutionContext *context) inline void ExecutionEngine::popContext() { - Q_ASSERT(jsStackTop > currentExecutionContext); - QV4::Value *offset = (currentExecutionContext + 1); + Q_ASSERT(jsStackTop > currentContext); + QV4::Value *offset = (currentContext + 1); Q_ASSERT(offset->isInteger()); int o = offset->integerValue(); Q_ASSERT(o); - currentExecutionContext -= o; - current = currentExecutionContext->d(); + currentContext -= o; + current = currentContext->d(); } inline |