Move data of more Qml related objects into Heap namespace.

Change-Id: Ifb3a7093351474d6feb2f64498b531c36fdf669b
Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>

1 files changed, 20 insertions, 9 deletions

diff --git a/src/qml/qml/qqmllocale_p.h b/src/qml/qml/qqmllocale_p.h
index 96c0712378..34224b44ff 100644
--- a/src/qml/qml/qqmllocale_p.h
+++ b/src/qml/qml/qqmllocale_p.h
@@ -121,17 +121,20 @@ private:
     static QV4::ReturnedValue method_localeCompare(QV4::CallContext *ctx);
 };
 
+namespace QV4 {
+
+namespace Heap {
+
+struct QQmlLocaleData : Object {
+    inline QQmlLocaleData(ExecutionEngine *engine);
+    QLocale locale;
+};
+
+}
+
 struct QQmlLocaleData : public QV4::Object
 {
-    struct Data : QV4::Heap::Object {
-        Data(QV4::ExecutionEngine *engine)
-            : QV4::Heap::Object(engine)
-        {
-            setVTable(staticVTable());
-        }
-        QLocale locale;
-    };
-    V4_OBJECT(Object)
+    V4_OBJECT2(QQmlLocaleData, Object)
 
     static QLocale *getThisLocale(QV4::CallContext *ctx) {
         QV4::Object *o = ctx->d()->callData->thisObject.asObject();
@@ -178,6 +181,14 @@ private:
     }
 };
 
+Heap::QQmlLocaleData::QQmlLocaleData(ExecutionEngine *engine)
+    : Heap::Object(engine)
+{
+    setVTable(QV4::QQmlLocaleData::staticVTable());
+}
+
+}
+
 QT_END_NAMESPACE
 
 #endif