diff options
| author | Lars Knoll <lars.knoll@theqtcompany.com> | 2015-01-15 21:28:01 +0100 |
|---|---|---|
| committer | Lars Knoll <lars.knoll@digia.com> | 2015-01-23 12:30:35 +0100 |
| commit | 3dbf4e9a6979802fff55e2f5e6aa54a14280e128 (patch) | |
| tree | 2bd9090f4bcf01e9c9e43c0d52fcbf80295ca6c0 /src/qml/jsruntime/qv4functionobject.cpp | |
| parent | 3f3652e43fc001df728ef00403b18d3202e2726a (diff) | |
Cleanups
Remove duplicated methods. Remove some mostly unused methods,
and simplify some others.
Change-Id: I605b249e54417bb32c3dfc8e22f2c8b6b684a1e1
Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
Diffstat (limited to 'src/qml/jsruntime/qv4functionobject.cpp')
| -rw-r--r-- | src/qml/jsruntime/qv4functionobject.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/qml/jsruntime/qv4functionobject.cpp b/src/qml/jsruntime/qv4functionobject.cpp index f49d53f6f6..1ead3b747f 100644 --- a/src/qml/jsruntime/qv4functionobject.cpp +++ b/src/qml/jsruntime/qv4functionobject.cpp @@ -419,7 +419,7 @@ ReturnedValue ScriptFunction::construct(Managed *that, CallData *callData) return Encode::undefined(); if (result->isObject()) - return result.asReturnedValue(); + return result->asReturnedValue(); return obj.asReturnedValue(); } @@ -442,7 +442,7 @@ ReturnedValue ScriptFunction::call(Managed *that, CallData *callData) if (f->function()->compiledFunction->hasQmlDependencies()) QmlContextWrapper::registerQmlDependencies(ctx->d()->engine, f->function()->compiledFunction); - return result.asReturnedValue(); + return result->asReturnedValue(); } DEFINE_OBJECT_VTABLE(SimpleScriptFunction); @@ -546,7 +546,7 @@ ReturnedValue SimpleScriptFunction::call(Managed *that, CallData *callData) if (f->function()->compiledFunction->hasQmlDependencies()) QmlContextWrapper::registerQmlDependencies(v4, f->function()->compiledFunction); - return result.asReturnedValue(); + return result->asReturnedValue(); } Heap::Object *SimpleScriptFunction::protoForConstructor() |