diff options
| author | Simon Hausmann <simon.hausmann@theqtcompany.com> | 2014-11-11 13:34:18 +0100 |
|---|---|---|
| committer | Simon Hausmann <simon.hausmann@digia.com> | 2014-11-12 17:55:57 +0100 |
| commit | faf13a3aa0c97b7386e44d02f323a9156a733c9f (patch) | |
| tree | ee3741b0724f52c3c1e66cd8963022fc877ab3b8 /src/qml/jsruntime/qv4value.cpp | |
| parent | 9bad6eea0f30f6a6c1878c2773dc39071cb41584 (diff) | |
Ported most ExecutionEnginew::new* factory methods away from Returned<T>
We don't need Returned<T> anymore with the QV4:: vs. Heap:: separation.
Eliminating Returned<T> simplifies also some code.
Change-Id: Ic2a9cd3c1a94f2ea37b539d3984d63997121c2b9
Reviewed-by: Lars Knoll <lars.knoll@digia.com>
Diffstat (limited to 'src/qml/jsruntime/qv4value.cpp')
| -rw-r--r-- | src/qml/jsruntime/qv4value.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/qml/jsruntime/qv4value.cpp b/src/qml/jsruntime/qv4value.cpp index 004f7cb6a3..410fa6482e 100644 --- a/src/qml/jsruntime/qv4value.cpp +++ b/src/qml/jsruntime/qv4value.cpp @@ -279,14 +279,14 @@ String *Value::toString(ExecutionContext *ctx) const return toString(ctx->engine()); } -Object *Value::toObject(ExecutionEngine *e) const +Heap::Object *Value::toObject(ExecutionEngine *e) const { if (isObject()) - return objectValue(); - return RuntimeHelpers::convertToObject(e, ValueRef::fromRawValue(this))->getPointer(); + return objectValue()->d(); + return RuntimeHelpers::convertToObject(e, ValueRef::fromRawValue(this)); } -Object *Value::toObject(ExecutionContext *ctx) const +Heap::Object *Value::toObject(ExecutionContext *ctx) const { return toObject(ctx->engine()); } |