diff options
author | Lars Knoll <[email protected]> | 2014-04-05 20:47:36 +0200 |
---|---|---|
committer | Simon Hausmann <[email protected]> | 2014-07-22 13:48:54 +0200 |
commit | 393c92a82170260fc322f7fc389a5594d71a8876 (patch) | |
tree | daa493130b95a53313f830b657f24859f8b5bfa5 /src/qml/jsruntime/qv4functionobject.cpp | |
parent | 6452f7a57452dc35c414d7e3c13c79115dd145ed (diff) |
Move object data into internal structure
Change-Id: I1fcccd535ed356e736468337bd450270cd290044
Reviewed-by: Simon Hausmann <[email protected]>
Diffstat (limited to 'src/qml/jsruntime/qv4functionobject.cpp')
-rw-r--r-- | src/qml/jsruntime/qv4functionobject.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/qml/jsruntime/qv4functionobject.cpp b/src/qml/jsruntime/qv4functionobject.cpp index e5d210eae9..1edf6c7d0b 100644 --- a/src/qml/jsruntime/qv4functionobject.cpp +++ b/src/qml/jsruntime/qv4functionobject.cpp @@ -111,7 +111,7 @@ FunctionObject::FunctionObject(InternalClass *ic) { managedData()->needsActivation = false; managedData()->strictMode = false; - memberData[Index_Prototype] = Encode::undefined(); + memberData()[Index_Prototype] = Encode::undefined(); } FunctionObject::~FunctionObject() @@ -130,10 +130,10 @@ void FunctionObject::init(const StringRef n, bool createProto) if (createProto) { Scoped<Object> proto(s, scope->engine->newObject(scope->engine->protoClass)); - proto->memberData[Index_ProtoConstructor] = this->asReturnedValue(); - memberData[Index_Prototype] = proto.asReturnedValue(); + proto->memberData()[Index_ProtoConstructor] = this->asReturnedValue(); + memberData()[Index_Prototype] = proto.asReturnedValue(); } else { - memberData[Index_Prototype] = Encode::undefined(); + memberData()[Index_Prototype] = Encode::undefined(); } ScopedValue v(s, n.asReturnedValue()); @@ -304,9 +304,9 @@ ReturnedValue FunctionPrototype::method_apply(CallContext *ctx) for (quint32 i = 0; i < len; ++i) callData->args[i] = arr->getIndexed(i); } else { - int alen = qMin(len, arr->arrayData->length()); + int alen = qMin(len, arr->arrayData()->length()); if (alen) - memcpy(callData->args, arr->arrayData->data, alen*sizeof(Value)); + memcpy(callData->args, arr->arrayData()->data, alen*sizeof(Value)); for (quint32 i = alen; i < len; ++i) callData->args[i] = Primitive::undefinedValue(); } |