diff options
author | Simon Hausmann <simon.hausmann@digia.com> | 2013-05-07 11:22:52 +0200 |
---|---|---|
committer | Lars Knoll <lars.knoll@digia.com> | 2013-05-07 12:28:58 +0200 |
commit | 5963aead75991ea8b0fded251e18ef75f099ab8f (patch) | |
tree | 17d6fdcb52fc1d59fa2ab3037121c679b9dd20aa /src/qml/qml/qqmllocale_p.h | |
parent | 40d2e435cfa29ba7465adc0486e6dabcdfc49773 (diff) |
More steps towards eliminating the v8 layer
* Changed the return type of the InvocationCallback from a v8 handle to a QV4::Value
* Removed v4 auto tests and fixed build of other tests
Change-Id: Ic927b925923ca8785170689a5c260969fd1cb794
Reviewed-by: Lars Knoll <lars.knoll@digia.com>
Diffstat (limited to 'src/qml/qml/qqmllocale_p.h')
-rw-r--r-- | src/qml/qml/qqmllocale_p.h | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/src/qml/qml/qqmllocale_p.h b/src/qml/qml/qqmllocale_p.h index 25f98d9168..dcc9746cc8 100644 --- a/src/qml/qml/qqmllocale_p.h +++ b/src/qml/qml/qqmllocale_p.h @@ -58,13 +58,13 @@ public: static void registerExtension(QV8Engine *engine); private: - static v8::Handle<v8::Value> toLocaleString(const v8::Arguments& args); - static v8::Handle<v8::Value> toLocaleTimeString(const v8::Arguments& args); - static v8::Handle<v8::Value> toLocaleDateString(const v8::Arguments& args); - static v8::Handle<v8::Value> fromLocaleString(const v8::Arguments& args); - static v8::Handle<v8::Value> fromLocaleTimeString(const v8::Arguments& args); - static v8::Handle<v8::Value> fromLocaleDateString(const v8::Arguments& args); - static v8::Handle<v8::Value> timeZoneUpdated(const v8::Arguments& args); + static QV4::Value toLocaleString(const v8::Arguments& args); + static QV4::Value toLocaleTimeString(const v8::Arguments& args); + static QV4::Value toLocaleDateString(const v8::Arguments& args); + static QV4::Value fromLocaleString(const v8::Arguments& args); + static QV4::Value fromLocaleTimeString(const v8::Arguments& args); + static QV4::Value fromLocaleDateString(const v8::Arguments& args); + static QV4::Value timeZoneUpdated(const v8::Arguments& args); }; @@ -74,9 +74,9 @@ public: static void registerExtension(QV8Engine *engine); private: - static v8::Handle<v8::Value> toLocaleString(const v8::Arguments& args); - static v8::Handle<v8::Value> fromLocaleString(const v8::Arguments& args); - static v8::Handle<v8::Value> toLocaleCurrencyString(const v8::Arguments& args); + static QV4::Value toLocaleString(const v8::Arguments& args); + static QV4::Value fromLocaleString(const v8::Arguments& args); + static QV4::Value toLocaleCurrencyString(const v8::Arguments& args); }; @@ -118,14 +118,14 @@ public: Saturday = Qt::Saturday }; - static v8::Handle<v8::Value> locale(QV8Engine *v8engine, const QString &lang); + static QV4::Value locale(QV8Engine *v8engine, const QString &lang); static void registerStringLocaleCompare(QV8Engine *engine); private: QQmlLocale(); - static v8::Handle<v8::Value> localeCompare(const v8::Arguments &args); + static QV4::Value localeCompare(const v8::Arguments &args); }; |