From 89be8e111c34bf6e96710e574c251587dd59f42b Mon Sep 17 00:00:00 2001 From: Lars Knoll Date: Fri, 12 Apr 2013 15:29:05 +0200 Subject: Smaller cleanup in the lookup code Change-Id: I74835d7c088b803205aa417ec2b7a2808f66f6ca Reviewed-by: Simon Hausmann --- src/v4/qv4functionobject.h | 6 +++--- src/v4/qv4runtime.cpp | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/v4/qv4functionobject.h b/src/v4/qv4functionobject.h index e1860573fa..4ef9db196c 100644 --- a/src/v4/qv4functionobject.h +++ b/src/v4/qv4functionobject.h @@ -148,9 +148,9 @@ struct Lookup { return 0; } - Property *setterLookup(Object *o, bool *writable) { + Property *setterLookup(Object *o, PropertyAttributes *attrs) { if (o->internalClass == classList[0]) { - *writable = o->internalClass->propertyData[index].isWritable(); + *attrs = o->internalClass->propertyData[index]; return o->memberData + index; } @@ -158,7 +158,7 @@ struct Lookup { if (idx != UINT_MAX) { classList[0] = o->internalClass; index = idx; - *writable = o->internalClass->propertyData[index].isWritable(); + *attrs = o->internalClass->propertyData[index]; return o->memberData + index; } return 0; diff --git a/src/v4/qv4runtime.cpp b/src/v4/qv4runtime.cpp index 727aa6e4a8..6f1e1c9c89 100644 --- a/src/v4/qv4runtime.cpp +++ b/src/v4/qv4runtime.cpp @@ -748,10 +748,10 @@ void __qmljs_set_property_lookup(ExecutionContext *ctx, const Value &object, int Object *o = object.toObject(ctx); Lookup *l = ctx->lookups + lookupIndex; - bool writable; - Property *p = l->setterLookup(o, &writable); + PropertyAttributes attrs; + Property *p = l->setterLookup(o, &attrs); if (p && (l->index != ArrayObject::LengthPropertyIndex || !o->isArrayObject())) { - o->putValue(ctx, p, o->internalClass->propertyData[l->index], value); + o->putValue(ctx, p, attrs, value); return; } -- cgit v1.2.3