Convert more methods to return a Returned<>

Change-Id: If294c9c4f574824c308b63a11da1337226180105
Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>

1 files changed, 6 insertions, 4 deletions

diff --git a/src/qml/qml/qqmllocale.cpp b/src/qml/qml/qqmllocale.cpp
index 5dcc807ab0..5e7116e271 100644
--- a/src/qml/qml/qqmllocale.cpp
+++ b/src/qml/qml/qqmllocale.cpp
@@ -519,10 +519,11 @@ QV4::ReturnedValue QQmlLocaleData::method_get_textDirection(QV4::SimpleCallConte
 
 QV4::ReturnedValue QQmlLocaleData::method_get_weekDays(QV4::SimpleCallContext *ctx)
 {
+    QV4::Scope scope(ctx);
     QLocale locale = getThisLocale(ctx);
     QList<Qt::DayOfWeek> days = locale.weekdays();
 
-    QV4::ArrayObject *result = ctx->engine->newArrayObject();
+    QV4::Scoped<QV4::ArrayObject> result(scope, ctx->engine->newArrayObject());
     result->arrayReserve(days.size());
     result->arrayDataLen = days.size();
     for (int i = 0; i < days.size(); ++i) {
@@ -533,21 +534,22 @@ QV4::ReturnedValue QQmlLocaleData::method_get_weekDays(QV4::SimpleCallContext *c
     }
     result->setArrayLengthUnchecked(days.size());
 
-    return QV4::Value::fromObject(result).asReturnedValue();
+    return result.asReturnedValue();
 }
 
 QV4::ReturnedValue QQmlLocaleData::method_get_uiLanguages(QV4::SimpleCallContext *ctx)
 {
+    QV4::Scope scope(ctx);
     QLocale locale = getThisLocale(ctx);
     QStringList langs = locale.uiLanguages();
-    QV4::ArrayObject *result = ctx->engine->newArrayObject();
+    QV4::Scoped<QV4::ArrayObject> result(scope, ctx->engine->newArrayObject());
     result->arrayReserve(langs.size());
     result->arrayDataLen = langs.size();
     for (int i = 0; i < langs.size(); ++i)
         result->arrayData[i].value = QV4::Value::fromString(ctx, langs.at(i));
     result->setArrayLengthUnchecked(langs.size());
 
-    return QV4::Value::fromObject(result).asReturnedValue();
+    return result.asReturnedValue();
 }
 
 QV4::ReturnedValue QQmlLocaleData::method_currencySymbol(QV4::SimpleCallContext *ctx)