diff options
| author | Lars Knoll <lars.knoll@digia.com> | 2013-09-13 17:07:44 +0200 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-09-18 13:14:08 +0200 |
| commit | 9dcc12d52343960400192c817f54a16f7e1f8247 (patch) | |
| tree | 24d4b194f6dd2f5b35296dfb8b385f6e714611c0 /src/qml/qml/qqmllocale.cpp | |
| parent | 19f7850176e95fb181efb45b2c9a5319582a086c (diff) | |
Convert a few more methods in ExecutionEngine to use protected pointers
Change-Id: I2e6b1b9dff52bbd16f35a00152c9ac557f8346eb
Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
Diffstat (limited to 'src/qml/qml/qqmllocale.cpp')
| -rw-r--r-- | src/qml/qml/qqmllocale.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/qml/qml/qqmllocale.cpp b/src/qml/qml/qqmllocale.cpp index 38ffc5386d..5dcc807ab0 100644 --- a/src/qml/qml/qqmllocale.cpp +++ b/src/qml/qml/qqmllocale.cpp @@ -270,7 +270,7 @@ QV4::ReturnedValue QQmlDateExtension::method_fromLocaleString(QV4::SimpleCallCon QLocale locale; QString dateString = ctx->arguments[0].stringValue()->toQString(); QDateTime dt = locale.toDateTime(dateString); - return QV4::Value::fromObject(engine->newDateObject(dt)).asReturnedValue(); + return QV4::Encode(engine->newDateObject(dt)); } if (ctx->argumentCount < 1 || ctx->argumentCount > 3 || !isLocaleObject(ctx->arguments[0])) @@ -296,7 +296,7 @@ QV4::ReturnedValue QQmlDateExtension::method_fromLocaleString(QV4::SimpleCallCon dt = r->locale.toDateTime(dateString, enumFormat); } - return QV4::Value::fromObject(engine->newDateObject(dt)).asReturnedValue(); + return QV4::Encode(engine->newDateObject(dt)); } QV4::ReturnedValue QQmlDateExtension::method_fromLocaleTimeString(QV4::SimpleCallContext *ctx) @@ -309,7 +309,7 @@ QV4::ReturnedValue QQmlDateExtension::method_fromLocaleTimeString(QV4::SimpleCal QTime time = locale.toTime(timeString); QDateTime dt = QDateTime::currentDateTime(); dt.setTime(time); - return QV4::Value::fromObject(engine->newDateObject(dt)).asReturnedValue(); + return QV4::Encode(engine->newDateObject(dt)); } if (ctx->argumentCount < 1 || ctx->argumentCount > 3 || !isLocaleObject(ctx->arguments[0])) @@ -338,7 +338,7 @@ QV4::ReturnedValue QQmlDateExtension::method_fromLocaleTimeString(QV4::SimpleCal QDateTime dt = QDateTime::currentDateTime(); dt.setTime(tm); - return QV4::Value::fromObject(engine->newDateObject(dt)).asReturnedValue(); + return QV4::Encode(engine->newDateObject(dt)); } QV4::ReturnedValue QQmlDateExtension::method_fromLocaleDateString(QV4::SimpleCallContext *ctx) @@ -349,7 +349,7 @@ QV4::ReturnedValue QQmlDateExtension::method_fromLocaleDateString(QV4::SimpleCal QLocale locale; QString dateString = ctx->arguments[0].stringValue()->toQString(); QDate date = locale.toDate(dateString); - return QV4::Value::fromObject(engine->newDateObject(QDateTime(date))).asReturnedValue(); + return QV4::Encode(engine->newDateObject(QDateTime(date))); } if (ctx->argumentCount < 1 || ctx->argumentCount > 3 || !isLocaleObject(ctx->arguments[0])) @@ -375,7 +375,7 @@ QV4::ReturnedValue QQmlDateExtension::method_fromLocaleDateString(QV4::SimpleCal dt = r->locale.toDate(dateString, enumFormat); } - return QV4::Value::fromObject(engine->newDateObject(QDateTime(dt))).asReturnedValue(); + return QV4::Encode(engine->newDateObject(QDateTime(dt))); } QV4::ReturnedValue QQmlDateExtension::method_timeZoneUpdated(QV4::SimpleCallContext *ctx) |