diff options
author | Lars Knoll <lars.knoll@digia.com> | 2013-09-11 14:47:34 +0200 |
---|---|---|
committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-09-18 13:13:23 +0200 |
commit | d6837e9ca301e7b6c792e3d24db14fb7bab2db60 (patch) | |
tree | b0afdc2e224d8f28ec6f9fb516d0ad2cb63c4908 /src/qml/jsruntime/qv4scopedvalue_p.h | |
parent | 002e6105f61269f1474de878ccdb26205e5b226e (diff) |
Rename QV4::ValueScope to QV4::Scope
The class is going to be used all over the place, so let's
give it a short name :)
Change-Id: If61543cb2c885e7fbb95c8fc4d0e870097c352ed
Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
Diffstat (limited to 'src/qml/jsruntime/qv4scopedvalue_p.h')
-rw-r--r-- | src/qml/jsruntime/qv4scopedvalue_p.h | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/src/qml/jsruntime/qv4scopedvalue_p.h b/src/qml/jsruntime/qv4scopedvalue_p.h index d1b4a93aa3..7bb98e7a62 100644 --- a/src/qml/jsruntime/qv4scopedvalue_p.h +++ b/src/qml/jsruntime/qv4scopedvalue_p.h @@ -79,8 +79,8 @@ struct ScopedValueArray { struct ScopedValue; -struct ValueScope { - ValueScope(ExecutionContext *ctx) +struct Scope { + Scope(ExecutionContext *ctx) : engine(ctx->engine) #ifndef QT_NO_DEBUG , size(0) @@ -89,13 +89,13 @@ struct ValueScope { mark = ctx->engine->jsStackTop; } - ValueScope(ExecutionEngine *e) + Scope(ExecutionEngine *e) : engine(e) { mark = e->jsStackTop; } - ~ValueScope() { + ~Scope() { Q_ASSERT(engine->jsStackTop >= mark); engine->jsStackTop = mark; } @@ -112,7 +112,7 @@ struct ValueRef; struct ScopedValue { - ScopedValue(const ValueScope &scope) + ScopedValue(const Scope &scope) { ptr = scope.engine->jsStackTop++; #ifndef QT_NO_DEBUG @@ -120,7 +120,7 @@ struct ScopedValue #endif } - ScopedValue(const ValueScope &scope, const Value &v) + ScopedValue(const Scope &scope, const Value &v) { ptr = scope.engine->jsStackTop++; *ptr = v; @@ -129,7 +129,7 @@ struct ScopedValue #endif } - ScopedValue(const ValueScope &scope, const ReturnedValue &v) + ScopedValue(const Scope &scope, const ReturnedValue &v) { ptr = scope.engine->jsStackTop++; ptr->val = v; @@ -171,7 +171,7 @@ struct ScopedValue }; struct ScopedCallData { - ScopedCallData(ValueScope &scope, int argc) + ScopedCallData(Scope &scope, int argc) { int size = qMax(argc, (int)QV4::Global::ReservedArgumentCount) + offsetof(QV4::CallData, args)/sizeof(QV4::Value); ptr = reinterpret_cast<CallData *>(scope.engine->stackPush(size)); |