diff options
author | Simon Hausmann <simon.hausmann@digia.com> | 2013-05-07 13:17:08 +0200 |
---|---|---|
committer | Lars Knoll <lars.knoll@digia.com> | 2013-05-07 13:43:07 +0200 |
commit | 41f8a7c0f645e04dba5952c4cdb87828ea2a884b (patch) | |
tree | 33a3d50e8032410a8bddf552183942b2a610fd77 /src/qml/qml | |
parent | 3fe97384fef6fd7d167017cd950313b34a64c9c1 (diff) |
Get rid of QV8Engine::qtDateTimeFromJsDate
Change-Id: I6a748ace761661ffe40e8fa73839f974e8a0afac
QV4::DateObject has a very convenient toQDateTime() function :)
Reviewed-by: Lars Knoll <lars.knoll@digia.com>
Diffstat (limited to 'src/qml/qml')
-rw-r--r-- | src/qml/qml/qqmllocale.cpp | 6 | ||||
-rw-r--r-- | src/qml/qml/v8/qv8engine.cpp | 10 | ||||
-rw-r--r-- | src/qml/qml/v8/qv8engine_p.h | 2 |
3 files changed, 4 insertions, 14 deletions
diff --git a/src/qml/qml/qqmllocale.cpp b/src/qml/qml/qqmllocale.cpp index 3dc7f690d1..c71973fac6 100644 --- a/src/qml/qml/qqmllocale.cpp +++ b/src/qml/qml/qqmllocale.cpp @@ -176,7 +176,7 @@ QV4::Value QQmlDateExtension::toLocaleString(const v8::Arguments& args) if (!args.This()->IsDate()) return QV4::Value::undefinedValue(); - QDateTime dt = QV8Engine::qtDateTimeFromJsDate(v8::Handle<v8::Date>::Cast(args.This())->NumberValue()); + QDateTime dt = args.This()->v4Value().asDateObject()->toQDateTime(); if (args.Length() == 0) { // Use QLocale for standard toLocaleString() function @@ -217,7 +217,7 @@ QV4::Value QQmlDateExtension::toLocaleTimeString(const v8::Arguments& args) if (!args.This()->IsDate()) return QV4::Value::undefinedValue(); - QDateTime dt = QV8Engine::qtDateTimeFromJsDate(v8::Handle<v8::Date>::Cast(args.This())->NumberValue()); + QDateTime dt = args.This()->v4Value().asDateObject()->toQDateTime();; QTime time = dt.time(); if (args.Length() == 0) { @@ -259,7 +259,7 @@ QV4::Value QQmlDateExtension::toLocaleDateString(const v8::Arguments& args) if (!args.This()->IsDate()) return QV4::Value::undefinedValue(); - QDateTime dt = QV8Engine::qtDateTimeFromJsDate(v8::Handle<v8::Date>::Cast(args.This())->NumberValue()); + QDateTime dt = args.This()->v4Value().asDateObject()->toQDateTime();; QDate date = dt.date(); if (args.Length() == 0) { diff --git a/src/qml/qml/v8/qv8engine.cpp b/src/qml/qml/v8/qv8engine.cpp index 6dc3ac714b..bf361a37b8 100644 --- a/src/qml/qml/v8/qv8engine.cpp +++ b/src/qml/qml/v8/qv8engine.cpp @@ -508,7 +508,7 @@ QVariant QV8Engine::toBasicVariant(const QV4::Value &value) if (value.isString()) return value.stringValue()->toQString(); if (QV4::DateObject *d = value.asDateObject()) - return qtDateTimeFromJsDate(d->value.doubleValue()); + return d->toQDateTime(); // NOTE: since we convert QTime to JS Date, round trip will change the variant type (to QDateTime)! Q_ASSERT(value.isObject()); @@ -763,14 +763,6 @@ void QV8Engine::setExtensionData(int index, Deletable *data) m_extensionData[index] = data; } -QDateTime QV8Engine::qtDateTimeFromJsDate(double jsDate) -{ - if (qIsNaN(jsDate)) - return QDateTime(); - - return QDateTime::fromMSecsSinceEpoch(jsDate); -} - v8::Persistent<v8::Object> *QV8Engine::findOwnerAndStrength(QObject *object, bool *shouldBeStrong) { QQmlData *data = QQmlData::get(object); diff --git a/src/qml/qml/v8/qv8engine_p.h b/src/qml/qml/v8/qv8engine_p.h index db8984ccda..7d3bd21571 100644 --- a/src/qml/qml/v8/qv8engine_p.h +++ b/src/qml/qml/v8/qv8engine_p.h @@ -408,8 +408,6 @@ public: QObject *qtObjectFromJS(const QV4::Value &value); - static QDateTime qtDateTimeFromJsDate(double jsDate); - void addRelationshipForGC(QObject *object, v8::Persistent<v8::Value> handle); void addRelationshipForGC(QObject *object, QObject *other); |