diff options
| author | Lars Knoll <[email protected]> | 2014-01-24 22:13:06 +0100 |
|---|---|---|
| committer | The Qt Project <[email protected]> | 2014-01-31 11:13:48 +0100 |
| commit | d96478044ae0dfbcc35113e3941aa79604ba83a0 (patch) | |
| tree | be3950a5ae4e5b241c33c74e3b1bc88ccc683213 /src/qml/jsruntime/qv4objectiterator.cpp | |
| parent | 28f422ebf516aefb34f1602aeef8f87432cc4fb9 (diff) | |
Get rid of the SafeObject class
Having SafeValue is enough, and we can pass an ObjectRef instead
of a SafeObject * for function calls.
Change-Id: I4e1435105403f8091b43eeda01303f9602c74235
Reviewed-by: Simon Hausmann <[email protected]>
Diffstat (limited to 'src/qml/jsruntime/qv4objectiterator.cpp')
| -rw-r--r-- | src/qml/jsruntime/qv4objectiterator.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/qml/jsruntime/qv4objectiterator.cpp b/src/qml/jsruntime/qv4objectiterator.cpp index 0e35996710..707bea0c45 100644 --- a/src/qml/jsruntime/qv4objectiterator.cpp +++ b/src/qml/jsruntime/qv4objectiterator.cpp @@ -46,9 +46,9 @@ using namespace QV4; -ObjectIterator::ObjectIterator(SafeObject *scratch1, SafeObject *scratch2, const ObjectRef o, uint flags) - : object(*scratch1) - , current(*scratch2) +ObjectIterator::ObjectIterator(ObjectRef scratch1, ObjectRef scratch2, const ObjectRef o, uint flags) + : object(scratch1) + , current(scratch2) , arrayNode(0) , arrayIndex(0) , memberIndex(0) @@ -64,8 +64,8 @@ ObjectIterator::ObjectIterator(SafeObject *scratch1, SafeObject *scratch2, const } ObjectIterator::ObjectIterator(Scope &scope, const ObjectRef o, uint flags) - : object(*static_cast<SafeObject *>(scope.alloc(1))) - , current(*static_cast<SafeObject *>(scope.alloc(1))) + : object(ObjectRef::fromValuePointer(scope.alloc(1))) + , current(ObjectRef::fromValuePointer(scope.alloc(1))) , arrayNode(0) , arrayIndex(0) , memberIndex(0) |