diff options
| author | Lars Knoll <lars.knoll@digia.com> | 2013-09-26 22:07:27 +0200 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-09-30 08:05:38 +0200 |
| commit | aacebc74b2d6d982caa4ba0952fd848ffdc54c7a (patch) | |
| tree | d71c8520255ee7309641e7ace32f6dbf677c3183 /src/qml/jsruntime/qv4scopedvalue_p.h | |
| parent | 72af16f7f48fec3d13e6537953d723cc7a50841e (diff) | |
Remove more occurrences of QV4::Value
Change-Id: I66c370680d7e6bee2e73a7a940aa96ab4009ec57
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 | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/qml/jsruntime/qv4scopedvalue_p.h b/src/qml/jsruntime/qv4scopedvalue_p.h index 0f6c738411..b32aed12d9 100644 --- a/src/qml/jsruntime/qv4scopedvalue_p.h +++ b/src/qml/jsruntime/qv4scopedvalue_p.h @@ -72,12 +72,12 @@ struct Scope { ~Scope() { #ifndef QT_NO_DEBUG Q_ASSERT(engine->jsStackTop >= mark); - memset(mark, 0, (engine->jsStackTop - mark)*sizeof(Value)); + memset(mark, 0, (engine->jsStackTop - mark)*sizeof(SafeValue)); #endif engine->jsStackTop = mark; } - Value *alloc(int nValues) { + SafeValue *alloc(int nValues) { SafeValue *ptr = engine->jsStackTop; engine->jsStackTop += nValues; #ifndef QT_NO_DEBUG @@ -364,7 +364,7 @@ struct CallData struct ScopedCallData { ScopedCallData(Scope &scope, int argc) { - int size = qMax(argc, (int)QV4::Global::ReservedArgumentCount) + qOffsetOf(QV4::CallData, args)/sizeof(QV4::Value); + int size = qMax(argc, (int)QV4::Global::ReservedArgumentCount) + qOffsetOf(QV4::CallData, args)/sizeof(QV4::SafeValue); ptr = reinterpret_cast<CallData *>(scope.engine->stackPush(size)); ptr->tag = QV4::Value::Integer_Type; ptr->argc = argc; |