diff options
| author | Lars Knoll <lars.knoll@digia.com> | 2014-01-22 15:25:50 +0100 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2014-01-24 14:32:33 +0100 |
| commit | c53fef423a8f607e1443b1d409712864f8cac9d5 (patch) | |
| tree | 87d1efbdcf64ecb14fa6980a70fb20ffc994831d /src/qml/jsruntime/qv4jsonobject.cpp | |
| parent | 6ae57f01bb1495a74b23a81c590672ce788d5400 (diff) | |
Change virtual methods in ArrayData to take Object pointer
Pass a pointer to the underlying object instead of the ArrayData
to virtual methods that modify the arrayData. This prepares
for allocating the ArrayData together with the array itself.
Change-Id: I66fe187f8b1e4d382ab243a518dbde5f18a1d16d
Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
Diffstat (limited to 'src/qml/jsruntime/qv4jsonobject.cpp')
| -rw-r--r-- | src/qml/jsruntime/qv4jsonobject.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/qml/jsruntime/qv4jsonobject.cpp b/src/qml/jsruntime/qv4jsonobject.cpp index 0614346cff..20927ab8e7 100644 --- a/src/qml/jsruntime/qv4jsonobject.cpp +++ b/src/qml/jsruntime/qv4jsonobject.cpp @@ -1058,7 +1058,7 @@ QV4::ReturnedValue JsonObject::fromJsonArray(ExecutionEngine *engine, const QJso a->arrayReserve(size); ScopedValue v(scope); for (int i = 0; i < size; i++) - a->arrayData->put(i, (v = fromJsonValue(engine, array.at(i)))); + a->arrayPut(i, (v = fromJsonValue(engine, array.at(i)))); a->setArrayLengthUnchecked(size); return a.asReturnedValue(); } |