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/qv4scopedvalue_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/qv4scopedvalue_p.h')
-rw-r--r-- | src/qml/jsruntime/qv4scopedvalue_p.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/qml/jsruntime/qv4scopedvalue_p.h b/src/qml/jsruntime/qv4scopedvalue_p.h index 221c4e23c8..0c79897015 100644 --- a/src/qml/jsruntime/qv4scopedvalue_p.h +++ b/src/qml/jsruntime/qv4scopedvalue_p.h @@ -67,7 +67,7 @@ struct Scope { ~Scope() { #ifndef QT_NO_DEBUG Q_ASSERT(engine->jsStackTop >= mark); - Q_ASSERT(engine->currentExecutionContext < mark); + Q_ASSERT(engine->currentContext < mark); memset(mark, 0, (engine->jsStackTop - mark)*sizeof(Value)); #endif #ifdef V4_USE_VALGRIND @@ -363,12 +363,12 @@ struct ExecutionContextSaver ExecutionContextSaver(Scope &scope) : engine(scope.engine) { - savedContext = engine->currentExecutionContext; + savedContext = engine->currentContext; } ~ExecutionContextSaver() { - Q_ASSERT(engine->jsStackTop > engine->currentExecutionContext); - engine->currentExecutionContext = savedContext; + Q_ASSERT(engine->jsStackTop > engine->currentContext); + engine->currentContext = savedContext; engine->current = savedContext->d(); } }; |