From 45f7120d42f628e86ae2bf3bd2789fdb190490e0 Mon Sep 17 00:00:00 2001 From: Lars Knoll Date: Thu, 8 May 2014 22:27:23 +0200 Subject: Convert regexps Change-Id: I5b62a265a7ce363a16b1e14ae93cadbb1ab0cb5b Reviewed-by: Simon Hausmann --- src/qml/qml/qqmllocale_p.h | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-) (limited to 'src/qml/qml/qqmllocale_p.h') diff --git a/src/qml/qml/qqmllocale_p.h b/src/qml/qml/qqmllocale_p.h index 02877d79c8..d5812ef78a 100644 --- a/src/qml/qml/qqmllocale_p.h +++ b/src/qml/qml/qqmllocale_p.h @@ -129,9 +129,14 @@ private: static QV4::ReturnedValue method_localeCompare(QV4::CallContext *ctx); }; -class QQmlLocaleData : public QV4::Object +struct QQmlLocaleData : public QV4::Object { - struct Data : QV4::Object::Data { + struct Data : Object::Data { + Data(QV4::ExecutionEngine *engine) + : Object::Data(engine) + { + setVTable(staticVTable()); + } QLocale locale; }; struct { @@ -139,13 +144,6 @@ class QQmlLocaleData : public QV4::Object } __data; V4_OBJECT -public: - QQmlLocaleData(QV4::ExecutionEngine *engine) - : QV4::Object(engine) - { - setVTable(staticVTable()); - } - static QLocale *getThisLocale(QV4::CallContext *ctx) { QQmlLocaleData *thisObject = ctx->d()->callData->thisObject.asObject()->as(); -- cgit v1.2.3