diff options
author | Lars Knoll <lars.knoll@digia.com> | 2014-04-29 16:56:17 +0200 |
---|---|---|
committer | Simon Hausmann <simon.hausmann@digia.com> | 2014-07-22 13:49:06 +0200 |
commit | 07e27d030fb181bd9d9c38de6ee08ad15a9171fd (patch) | |
tree | 7dc884e719b7438bb0977e25f7a59c075324ca2d /src/qml/qml/qqmllocale_p.h | |
parent | b6b88a63becc773a955b63021b32144b7b100ac6 (diff) |
Convert qml locale object to new data layout
Change-Id: I1c02498102d89be1127fb6bbf0b38e21c48bed8b
Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
Diffstat (limited to 'src/qml/qml/qqmllocale_p.h')
-rw-r--r-- | src/qml/qml/qqmllocale_p.h | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/src/qml/qml/qqmllocale_p.h b/src/qml/qml/qqmllocale_p.h index cafe448313..5e095a7e06 100644 --- a/src/qml/qml/qqmllocale_p.h +++ b/src/qml/qml/qqmllocale_p.h @@ -131,7 +131,14 @@ private: class QQmlLocaleData : public QV4::Object { - V4_OBJECT + struct Data : QV4::Object::Data { + QLocale locale; + }; + struct { + QLocale locale; + } __data; + + V4_OBJECT_NEW public: QQmlLocaleData(QV4::ExecutionEngine *engine) : QV4::Object(engine) @@ -139,7 +146,6 @@ public: setVTable(staticVTable()); } - QLocale locale; static QLocale *getThisLocale(QV4::CallContext *ctx) { QQmlLocaleData *thisObject = ctx->callData->thisObject.asObject()->as<QQmlLocaleData>(); @@ -147,7 +153,7 @@ public: ctx->throwTypeError(); return 0; } - return &thisObject->locale; + return &thisObject->d()->locale; } static QV4::ReturnedValue method_currencySymbol(QV4::CallContext *ctx); |