diff options
| author | Lars Knoll <lars.knoll@digia.com> | 2013-09-16 22:02:27 +0200 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-09-22 01:06:20 +0200 |
| commit | e441692b0b8f8fffdfdfa8a21c570adcd5cbae7a (patch) | |
| tree | 9b764401d87682012328c46dc947721f47b428b2 /src/qml/jsruntime/qv4serialize.cpp | |
| parent | a0f8be4021caa9bb5055923f0eea3bee0e345235 (diff) | |
Further work towards an exact GC
Add some more convenience in the helper classes
in qscopedvalue_p.h
Make accesses to CallData safer, and change
ExecutionEngine::newObject() to return a safe
pointer.
Change-Id: I980909754ce9681cf6faa1355bab3a1e5d6dd186
Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
Diffstat (limited to 'src/qml/jsruntime/qv4serialize.cpp')
| -rw-r--r-- | src/qml/jsruntime/qv4serialize.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/qml/jsruntime/qv4serialize.cpp b/src/qml/jsruntime/qv4serialize.cpp index 41481ac1b8..35022acfd5 100644 --- a/src/qml/jsruntime/qv4serialize.cpp +++ b/src/qml/jsruntime/qv4serialize.cpp @@ -328,7 +328,7 @@ ReturnedValue Serialize::deserialize(const char *&data, QV8Engine *engine) case WorkerObject: { quint32 size = headersize(header); - QV4::Object *o = v4->newObject(); + Scoped<Object> o(scope, v4->newObject()); ScopedValue name(scope); ScopedValue value(scope); for (quint32 ii = 0; ii < size; ++ii) { @@ -336,7 +336,7 @@ ReturnedValue Serialize::deserialize(const char *&data, QV8Engine *engine) value = deserialize(data, engine); o->put(name->asString(), value); } - return QV4::Value::fromObject(o).asReturnedValue(); + return o.asReturnedValue(); } case WorkerInt32: return QV4::Encode((qint32)popUint32(data)); |