diff options
author | Lars Knoll <lars.knoll@theqtcompany.com> | 2014-12-31 13:21:39 +0100 |
---|---|---|
committer | Simon Hausmann <simon.hausmann@digia.com> | 2015-01-08 22:08:55 +0100 |
commit | a6c36616b0ccf9c1aeb71d90437c9226ae76fe10 (patch) | |
tree | 5c8e796b9fe6f15c08bd20dc20d084976c75845b /src/qml/qml/qqmllocale.cpp | |
parent | fbf674e566032121d6d0a865dbff2a5dac2b3f0d (diff) |
Move extension mechanism over to use the v4 engine
Change-Id: Ib329fc7bcae3c78d962a116f53b2244a71f81228
Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
Diffstat (limited to 'src/qml/qml/qqmllocale.cpp')
-rw-r--r-- | src/qml/qml/qqmllocale.cpp | 19 |
1 files changed, 9 insertions, 10 deletions
diff --git a/src/qml/qml/qqmllocale.cpp b/src/qml/qml/qqmllocale.cpp index 295347dcd5..9aba5824bb 100644 --- a/src/qml/qml/qqmllocale.cpp +++ b/src/qml/qml/qqmllocale.cpp @@ -643,20 +643,19 @@ LOCALE_STRING_PROPERTY(exponential) LOCALE_STRING_PROPERTY(amText) LOCALE_STRING_PROPERTY(pmText) -class QV8LocaleDataDeletable : public QV8Engine::Deletable +class QV4LocaleDataDeletable : public QV8Engine::Deletable { public: - QV8LocaleDataDeletable(QV8Engine *engine); - ~QV8LocaleDataDeletable(); + QV4LocaleDataDeletable(QV4::ExecutionEngine *engine); + ~QV4LocaleDataDeletable(); QV4::PersistentValue prototype; }; -QV8LocaleDataDeletable::QV8LocaleDataDeletable(QV8Engine *engine) +QV4LocaleDataDeletable::QV4LocaleDataDeletable(QV4::ExecutionEngine *engine) { - QV4::ExecutionEngine *eng = QV8Engine::getV4(engine); - QV4::Scope scope(eng); - QV4::ScopedObject o(scope, eng->newObject()); + QV4::Scope scope(engine); + QV4::Scoped<QV4::Object> o(scope, engine->newObject()); o->defineDefaultProperty(QStringLiteral("dateFormat"), QQmlLocaleData::method_dateFormat, 0); o->defineDefaultProperty(QStringLiteral("standaloneDayName"), QQmlLocaleData::method_standaloneDayName, 0); @@ -687,11 +686,11 @@ QV8LocaleDataDeletable::QV8LocaleDataDeletable(QV8Engine *engine) prototype = o; } -QV8LocaleDataDeletable::~QV8LocaleDataDeletable() +QV4LocaleDataDeletable::~QV4LocaleDataDeletable() { } -V8_DEFINE_EXTENSION(QV8LocaleDataDeletable, localeV8Data); +V4_DEFINE_EXTENSION(QV4LocaleDataDeletable, localeV4Data); /*! \qmltype Locale @@ -805,9 +804,9 @@ QV4::ReturnedValue QQmlLocale::locale(QV8Engine *v8engine, const QString &locale QV4::ReturnedValue QQmlLocale::wrap(QV8Engine *engine, const QLocale &locale) { - QV8LocaleDataDeletable *d = localeV8Data(engine); QV4::ExecutionEngine *v4 = QV8Engine::getV4(engine); QV4::Scope scope(v4); + QV4LocaleDataDeletable *d = localeV4Data(scope.engine); QV4::Scoped<QQmlLocaleData> wrapper(scope, v4->memoryManager->alloc<QQmlLocaleData>(v4)); wrapper->d()->locale = locale; QV4::ScopedObject p(scope, d->prototype.value()); |