diff options
author | Lars Knoll <[email protected]> | 2013-09-26 13:05:25 +0200 |
---|---|---|
committer | The Qt Project <[email protected]> | 2013-09-28 13:33:58 +0200 |
commit | 62d1b5a08aa2c21c95a2a77afbe34c38ed37a2aa (patch) | |
tree | d9e542dfb9d7fa5d8e1c71633f6cd18cf234b5e6 /src/qml/jsruntime/qv4object.cpp | |
parent | 112531bc23494ba3c5cf2e0a51b2d654be28dbfd (diff) |
Fix API for Object::define*Property
use ValueRef instead of const Value &.
Change-Id: I3fd0ca829870db27f036825d713c53dc0600be07
Reviewed-by: Simon Hausmann <[email protected]>
Diffstat (limited to 'src/qml/jsruntime/qv4object.cpp')
-rw-r--r-- | src/qml/jsruntime/qv4object.cpp | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/src/qml/jsruntime/qv4object.cpp b/src/qml/jsruntime/qv4object.cpp index 05dc24e5e4..3fdbf66523 100644 --- a/src/qml/jsruntime/qv4object.cpp +++ b/src/qml/jsruntime/qv4object.cpp @@ -215,13 +215,13 @@ void Object::inplaceBinOpValue(ExecutionContext *ctx, BinOpContext op, const Val inplaceBinOp(ctx, op, name, rhs); } -void Object::defineDefaultProperty(const StringRef name, Value value) +void Object::defineDefaultProperty(const StringRef name, ValueRef value) { Property *pd = insertMember(name, Attr_Data|Attr_NotEnumerable); - pd->value = value; + pd->value = *value; } -void Object::defineDefaultProperty(const QString &name, Value value) +void Object::defineDefaultProperty(const QString &name, ValueRef value) { ExecutionEngine *e = engine(); Scope scope(e); @@ -236,7 +236,7 @@ void Object::defineDefaultProperty(const QString &name, ReturnedValue (*code)(Si ScopedString s(scope, e->newIdentifier(name)); Scoped<FunctionObject> function(scope, e->newBuiltinFunction(e->rootContext, s, code)); function->defineReadonlyProperty(e->id_length, Primitive::fromInt32(argumentCount)); - defineDefaultProperty(s, function.asValue()); + defineDefaultProperty(s, function); } void Object::defineDefaultProperty(const StringRef name, ReturnedValue (*code)(SimpleCallContext *), int argumentCount) @@ -245,7 +245,7 @@ void Object::defineDefaultProperty(const StringRef name, ReturnedValue (*code)(S Scope scope(e); Scoped<FunctionObject> function(scope, e->newBuiltinFunction(e->rootContext, name, code)); function->defineReadonlyProperty(e->id_length, Primitive::fromInt32(argumentCount)); - defineDefaultProperty(name, function.asValue()); + defineDefaultProperty(name, function); } void Object::defineAccessorProperty(const QString &name, ReturnedValue (*getter)(SimpleCallContext *), ReturnedValue (*setter)(SimpleCallContext *)) @@ -267,7 +267,7 @@ void Object::defineAccessorProperty(const StringRef name, ReturnedValue (*getter p->setSetter(v4->newBuiltinFunction(v4->rootContext, name, setter)->getPointer()); } -void Object::defineReadonlyProperty(const QString &name, Value value) +void Object::defineReadonlyProperty(const QString &name, ValueRef value) { QV4::ExecutionEngine *e = engine(); Scope scope(e); @@ -275,10 +275,10 @@ void Object::defineReadonlyProperty(const QString &name, Value value) defineReadonlyProperty(s, value); } -void Object::defineReadonlyProperty(const StringRef name, Value value) +void Object::defineReadonlyProperty(const StringRef name, ValueRef value) { Property *pd = insertMember(name, Attr_ReadOnly); - pd->value = value; + pd->value = *value; } void Object::markObjects(Managed *that) |