diff options
| author | Lars Knoll <lars.knoll@digia.com> | 2013-09-30 15:41:24 +0200 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-10-02 16:07:33 +0200 |
| commit | 1e454c8aa6ad0782eee1c8c94ac2780954a08351 (patch) | |
| tree | e3be185e878972ff018e9610fea15248877ca499 /src/qml/jsruntime/qv4functionobject.cpp | |
| parent | 430dfd326cb9d8dab8ebd11e83dd52e6d55c4229 (diff) | |
Remove more uses of Value
Change-Id: I889e760f75b485a28e1f2a2c26b2337ae9bfafac
Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
Diffstat (limited to 'src/qml/jsruntime/qv4functionobject.cpp')
| -rw-r--r-- | src/qml/jsruntime/qv4functionobject.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/qml/jsruntime/qv4functionobject.cpp b/src/qml/jsruntime/qv4functionobject.cpp index 59b23bebbf..11580b00c4 100644 --- a/src/qml/jsruntime/qv4functionobject.cpp +++ b/src/qml/jsruntime/qv4functionobject.cpp @@ -385,11 +385,11 @@ ReturnedValue FunctionPrototype::method_bind(SimpleCallContext *ctx) ctx->throwTypeError(); ScopedValue boundThis(scope, ctx->argument(0)); - QVector<Value> boundArgs; + QVector<SafeValue> boundArgs; for (uint i = 1; i < ctx->callData->argc; ++i) boundArgs += ctx->callData->args[i]; - return ctx->engine->newBoundFunction(ctx->engine->rootContext, target.getPointer(), boundThis, boundArgs)->asReturnedValue(); + return ctx->engine->newBoundFunction(ctx->engine->rootContext, target, boundThis, boundArgs)->asReturnedValue(); } DEFINE_MANAGED_VTABLE(ScriptFunction); @@ -663,13 +663,13 @@ DEFINE_MANAGED_VTABLE(IndexedBuiltinFunction); DEFINE_MANAGED_VTABLE(BoundFunction); -BoundFunction::BoundFunction(ExecutionContext *scope, FunctionObject *target, Value boundThis, const QVector<Value> &boundArgs) +BoundFunction::BoundFunction(ExecutionContext *scope, FunctionObjectRef target, const ValueRef boundThis, const QVector<SafeValue> &boundArgs) : FunctionObject(scope, 0) , target(target) - , boundThis(boundThis) , boundArgs(boundArgs) { vtbl = &static_vtbl; + this->boundThis = boundThis; Scope s(scope); ScopedValue protectThis(s, this); |