diff options
| author | Lars Knoll <lars.knoll@digia.com> | 2013-09-30 13:48:05 +0200 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-10-02 16:07:33 +0200 |
| commit | 430dfd326cb9d8dab8ebd11e83dd52e6d55c4229 (patch) | |
| tree | 0d1dd82ddf8f027a591e93def6ce369237af725a /src/qml/qml | |
| parent | 3dc090fc1eb0a810d96ffc87e4662f7eb9ac8fd2 (diff) | |
Fix ObjectIterator API to be GC safe
Change-Id: I3a9c48d53d8dbadcb9b32c00fcef1f89447c4b8c
Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
Diffstat (limited to 'src/qml/qml')
| -rw-r--r-- | src/qml/qml/qqmllistwrapper.cpp | 4 | ||||
| -rw-r--r-- | src/qml/qml/qqmllistwrapper_p.h | 2 | ||||
| -rw-r--r-- | src/qml/qml/v8/qv8engine.cpp | 7 |
3 files changed, 6 insertions, 7 deletions
diff --git a/src/qml/qml/qqmllistwrapper.cpp b/src/qml/qml/qqmllistwrapper.cpp index 523b7cc5de..de4fbbb408 100644 --- a/src/qml/qml/qqmllistwrapper.cpp +++ b/src/qml/qml/qqmllistwrapper.cpp @@ -147,9 +147,9 @@ void QmlListWrapper::destroy(Managed *that) w->~QmlListWrapper(); } -Property *QmlListWrapper::advanceIterator(Managed *m, ObjectIterator *it, String **name, uint *index, PropertyAttributes *attrs) +Property *QmlListWrapper::advanceIterator(Managed *m, ObjectIterator *it, StringRef name, uint *index, PropertyAttributes *attrs) { - *name = 0; + name = (String *)0; *index = UINT_MAX; QmlListWrapper *w = m->as<QmlListWrapper>(); quint32 count = w->property.count ? w->property.count(&w->property) : 0; diff --git a/src/qml/qml/qqmllistwrapper_p.h b/src/qml/qml/qqmllistwrapper_p.h index ea35ad091d..9ece5851ed 100644 --- a/src/qml/qml/qqmllistwrapper_p.h +++ b/src/qml/qml/qqmllistwrapper_p.h @@ -84,7 +84,7 @@ public: static ReturnedValue get(Managed *m, const StringRef name, bool *hasProperty); static ReturnedValue getIndexed(Managed *m, uint index, bool *hasProperty); static void put(Managed *m, const StringRef name, const ValueRef value); - static Property *advanceIterator(Managed *m, ObjectIterator *it, String **name, uint *index, PropertyAttributes *attributes); + static Property *advanceIterator(Managed *m, ObjectIterator *it, StringRef name, uint *index, PropertyAttributes *attributes); static void destroy(Managed *that); private: diff --git a/src/qml/qml/v8/qv8engine.cpp b/src/qml/qml/v8/qv8engine.cpp index 9211ffd484..7cf769a219 100644 --- a/src/qml/qml/v8/qv8engine.cpp +++ b/src/qml/qml/v8/qv8engine.cpp @@ -613,16 +613,15 @@ QVariantMap QV8Engine::variantMapFromJS(QV4::ObjectRef o, visitedObjects.insert(o); - QV4::ObjectIterator it(o, QV4::ObjectIterator::EnumerableOnly); + QV4::ObjectIterator it(scope, o, QV4::ObjectIterator::EnumerableOnly); QV4::ScopedValue name(scope); + QV4::ScopedValue val(scope); while (1) { - QV4::Value v; - name = it.nextPropertyNameAsString(&v); + name = it.nextPropertyNameAsString(val); if (name->isNull()) break; QString key = name->toQStringNoThrow(); - QV4::ScopedValue val(scope, v); result.insert(key, variantFromJS(val, visitedObjects)); } |