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/qml/qqmllocale.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/qml/qqmllocale.cpp')
-rw-r--r-- | src/qml/qml/qqmllocale.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/qml/qml/qqmllocale.cpp b/src/qml/qml/qqmllocale.cpp index 8cea66c99e..0ea9785673 100644 --- a/src/qml/qml/qqmllocale.cpp +++ b/src/qml/qml/qqmllocale.cpp @@ -502,7 +502,7 @@ QV4::ReturnedValue QQmlLocaleData::method_get_weekDays(QV4::CallContext *ctx) int day = days.at(i); if (day == 7) // JS Date days in range 0(Sunday) to 6(Saturday) day = 0; - result->arrayData->put(i, QV4::Primitive::fromInt32(day)); + result->arrayPut(i, QV4::Primitive::fromInt32(day)); } result->setArrayLengthUnchecked(days.size()); @@ -521,7 +521,7 @@ QV4::ReturnedValue QQmlLocaleData::method_get_uiLanguages(QV4::CallContext *ctx) result->arrayReserve(langs.size()); QV4::ScopedValue v(scope); for (int i = 0; i < langs.size(); ++i) - result->arrayData->put(i, (v = ctx->engine->newString(langs.at(i)))); + result->arrayPut(i, (v = ctx->engine->newString(langs.at(i)))); result->setArrayLengthUnchecked(langs.size()); |