diff options
author | Lars Knoll <lars.knoll@digia.com> | 2014-04-05 20:47:36 +0200 |
---|---|---|
committer | Simon Hausmann <simon.hausmann@digia.com> | 2014-07-22 13:48:54 +0200 |
commit | 393c92a82170260fc322f7fc389a5594d71a8876 (patch) | |
tree | daa493130b95a53313f830b657f24859f8b5bfa5 /src/qml/jsruntime/qv4argumentsobject.cpp | |
parent | 6452f7a57452dc35c414d7e3c13c79115dd145ed (diff) |
Move object data into internal structure
Change-Id: I1fcccd535ed356e736468337bd450270cd290044
Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
Diffstat (limited to 'src/qml/jsruntime/qv4argumentsobject.cpp')
-rw-r--r-- | src/qml/jsruntime/qv4argumentsobject.cpp | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/src/qml/jsruntime/qv4argumentsobject.cpp b/src/qml/jsruntime/qv4argumentsobject.cpp index 7d4df899a6..72629b4f83 100644 --- a/src/qml/jsruntime/qv4argumentsobject.cpp +++ b/src/qml/jsruntime/qv4argumentsobject.cpp @@ -71,10 +71,10 @@ ArgumentsObject::ArgumentsObject(CallContext *context) } else { setHasAccessorProperty(); Q_ASSERT(CalleePropertyIndex == internalClass()->find(context->engine->id_callee)); - memberData[CalleePropertyIndex] = context->function->asReturnedValue(); + memberData()[CalleePropertyIndex] = context->function->asReturnedValue(); } Q_ASSERT(LengthPropertyIndex == internalClass()->find(context->engine->id_length)); - memberData[LengthPropertyIndex] = Primitive::fromInt32(context->realArgumentCount); + memberData()[LengthPropertyIndex] = Primitive::fromInt32(context->realArgumentCount); Q_ASSERT(internalClass()->vtable == staticVTable()); } @@ -105,19 +105,19 @@ bool ArgumentsObject::defineOwnProperty(ExecutionContext *ctx, uint index, const fullyCreate(); Scope scope(ctx); - Property *pd = arrayData->getProperty(index); + Property *pd = arrayData()->getProperty(index); Property map; PropertyAttributes mapAttrs; bool isMapped = false; uint numAccessors = qMin((int)context->function->formalParameterCount(), context->realArgumentCount); if (pd && index < (uint)numAccessors) - isMapped = arrayData->attributes(index).isAccessor() && pd->getter() == context->engine->argumentsAccessors[index].getter(); + isMapped = arrayData()->attributes(index).isAccessor() && pd->getter() == context->engine->argumentsAccessors[index].getter(); if (isMapped) { - mapAttrs = arrayData->attributes(index); + mapAttrs = arrayData()->attributes(index); map.copy(*pd, mapAttrs); setArrayAttributes(index, Attr_Data); - pd = arrayData->getProperty(index); + pd = arrayData()->getProperty(index); pd->value = mappedArguments[index]; } @@ -134,7 +134,7 @@ bool ArgumentsObject::defineOwnProperty(ExecutionContext *ctx, uint index, const if (attrs.isWritable()) { setArrayAttributes(index, mapAttrs); - pd = arrayData->getProperty(index); + pd = arrayData()->getProperty(index); pd->copy(map, mapAttrs); } } |