Cleanup: Get rid of __data members

These are not needed anymore

Change-Id: Ib834aa294e84ca9fbdd5b6850d5bc172e8b54ba1
Reviewed-by: Lars Knoll <lars.knoll@digia.com>

9 files changed, 0 insertions, 89 deletions

diff --git a/src/qml/qml/qqmlcomponent.cpp b/src/qml/qml/qqmlcomponent.cpp
index a6a41ae365..40b6a34f07 100644
--- a/src/qml/qml/qqmlcomponent.cpp
+++ b/src/qml/qml/qqmlcomponent.cpp
@@ -1085,15 +1085,6 @@ struct QmlIncubatorObject : public QV4::Object
         QV4::Value qmlGlobal;
         QV4::Value statusChanged;
     };
-    struct {
-        QScopedPointer<QQmlComponentIncubator> incubator;
-        QV8Engine *v8;
-        QPointer<QObject> parent;
-        QV4::Value valuemap;
-        QV4::Value qmlGlobal;
-        QV4::Value statusChanged;
-    } __data;
-
     V4_OBJECT(QV4::Object)
 
     static QV4::ReturnedValue method_get_statusChanged(QV4::CallContext *ctx);
diff --git a/src/qml/qml/qqmlcontextwrapper_p.h b/src/qml/qml/qqmlcontextwrapper_p.h
index 73747cadfc..d6f25ac79a 100644
--- a/src/qml/qml/qqmlcontextwrapper_p.h
+++ b/src/qml/qml/qqmlcontextwrapper_p.h
@@ -84,16 +84,6 @@ struct Q_QML_EXPORT QmlContextWrapper : Object
         QPointer<QObject> scopeObject;
         QQmlIdObjectsArray *idObjectsWrapper;
     };
-    struct {
-        bool readOnly;
-        bool ownsContext;
-        bool isNullWrapper;
-
-        QQmlGuardedContextData context;
-        QPointer<QObject> scopeObject;
-        QQmlIdObjectsArray *idObjectsWrapper;
-    } __data;
-
     V4_OBJECT(Object)
 
     static ReturnedValue qmlScope(QV8Engine *e, QQmlContextData *ctxt, QObject *scope);
@@ -126,10 +116,6 @@ struct QQmlIdObjectsArray : public Object
         Data(ExecutionEngine *engine, QmlContextWrapper *contextWrapper);
         QmlContextWrapper *contextWrapper;
     };
-    struct {
-        QmlContextWrapper *contextWrapper;
-    } __data;
-
     V4_OBJECT(Object)
 
     static ReturnedValue getIndexed(Managed *m, uint index, bool *hasProperty);
diff --git a/src/qml/qml/qqmllistwrapper_p.h b/src/qml/qml/qqmllistwrapper_p.h
index 70f686b73c..f6aee04487 100644
--- a/src/qml/qml/qqmllistwrapper_p.h
+++ b/src/qml/qml/qqmllistwrapper_p.h
@@ -77,13 +77,6 @@ struct Q_QML_EXPORT QmlListWrapper : Object
         QQmlListProperty<QObject> property;
         int propertyType;
     };
-    struct {
-        QV8Engine *v8;
-        QPointer<QObject> object;
-        QQmlListProperty<QObject> property;
-        int propertyType;
-    } __data;
-
     V4_OBJECT(Object)
 
     static ReturnedValue create(QV8Engine *v8, QObject *object, int propId, int propType);
diff --git a/src/qml/qml/qqmllocale_p.h b/src/qml/qml/qqmllocale_p.h
index dcf4a349c4..8ec7cbf61f 100644
--- a/src/qml/qml/qqmllocale_p.h
+++ b/src/qml/qml/qqmllocale_p.h
@@ -139,10 +139,6 @@ struct QQmlLocaleData : public QV4::Object
         }
         QLocale locale;
     };
-    struct {
-        QLocale locale;
-    } __data;
-
     V4_OBJECT(Object)
 
     static QLocale *getThisLocale(QV4::CallContext *ctx) {
diff --git a/src/qml/qml/qqmltypewrapper_p.h b/src/qml/qml/qqmltypewrapper_p.h
index effebf8806..27ecac991e 100644
--- a/src/qml/qml/qqmltypewrapper_p.h
+++ b/src/qml/qml/qqmltypewrapper_p.h
@@ -81,16 +81,6 @@ struct Q_QML_EXPORT QmlTypeWrapper : Object
         QQmlTypeNameCache *typeNamespace;
         const void *importNamespace;
     };
-    struct {
-        QV8Engine *v8;
-        TypeNameMode mode;
-        QPointer<QObject> object;
-
-        QQmlType *type;
-        QQmlTypeNameCache *typeNamespace;
-        const void *importNamespace;
-    } __data;
-
     V4_OBJECT(Object)
 private:
 
diff --git a/src/qml/qml/qqmlvaluetypewrapper.cpp b/src/qml/qml/qqmlvaluetypewrapper.cpp
index f228d96603..1de596b4d3 100644
--- a/src/qml/qml/qqmlvaluetypewrapper.cpp
+++ b/src/qml/qml/qqmlvaluetypewrapper.cpp
@@ -67,11 +67,6 @@ struct QmlValueTypeReference : public QmlValueTypeWrapper
         QPointer<QObject> object;
         int property;
     };
-    struct
-    {
-        QPointer<QObject> object;
-        int property;
-    } __data;
     V4_OBJECT(QmlValueTypeWrapper)
 };
 
@@ -84,10 +79,6 @@ struct QmlValueTypeCopy : public QmlValueTypeWrapper
         Data(QV8Engine *engine);
         QVariant value;
     };
-    struct
-    {
-        QVariant value;
-    } __data;
     V4_OBJECT(QmlValueTypeWrapper)
 };
 
diff --git a/src/qml/qml/qqmlvaluetypewrapper_p.h b/src/qml/qml/qqmlvaluetypewrapper_p.h
index 7647c0c8cc..53d5ae95af 100644
--- a/src/qml/qml/qqmlvaluetypewrapper_p.h
+++ b/src/qml/qml/qqmlvaluetypewrapper_p.h
@@ -75,12 +75,6 @@ struct Q_QML_EXPORT QmlValueTypeWrapper : Object
         ObjectType objectType;
         mutable QQmlValueType *type;
     };
-    struct {
-        QV8Engine *v8;
-        ObjectType objectType;
-        mutable QQmlValueType *type;
-    } __data;
-
     V4_OBJECT(Object)
 
 public:
diff --git a/src/qml/qml/qqmlxmlhttprequest.cpp b/src/qml/qml/qqmlxmlhttprequest.cpp
index 0ba4eabbca..e7bea80a18 100644
--- a/src/qml/qml/qqmlxmlhttprequest.cpp
+++ b/src/qml/qml/qqmlxmlhttprequest.cpp
@@ -204,11 +204,6 @@ public:
         QList<NodeImpl *> list; // Only used in NamedNodeMap
         NodeImpl *d;
     };
-    struct {
-        QList<NodeImpl *> list; // Only used in NamedNodeMap
-        NodeImpl *d;
-    } __data;
-
     V4_OBJECT(Object)
 
     // C++ API
@@ -243,10 +238,6 @@ public:
         }
         NodeImpl *d;
     };
-    struct {
-        NodeImpl *d;
-    } __data;
-
     V4_OBJECT(Object)
 
     // JS API
@@ -336,9 +327,6 @@ struct Node : public Object
         }
         NodeImpl *d;
     };
-    struct {
-        NodeImpl *d;
-    } __data;
     V4_OBJECT(Object)
 
 
@@ -1625,10 +1613,6 @@ struct QQmlXMLHttpRequestWrapper : public Object
         }
         QQmlXMLHttpRequest *request;
     };
-    struct {
-        QQmlXMLHttpRequest *request;
-    } __data;
-
     V4_OBJECT(Object)
 
     static void destroy(Managed *that) {
@@ -1660,10 +1644,6 @@ struct QQmlXMLHttpRequestCtor : public FunctionObject
         }
         Object *proto;
     };
-    struct {
-        Object *proto;
-    } __data;
-
     V4_OBJECT(FunctionObject)
     static void markObjects(Managed *that, ExecutionEngine *e) {
         QQmlXMLHttpRequestCtor *c = that->as<QQmlXMLHttpRequestCtor>();
diff --git a/src/qml/qml/v8/qqmlbuiltinfunctions_p.h b/src/qml/qml/v8/qqmlbuiltinfunctions_p.h
index b4e680a4a3..9732a468df 100644
--- a/src/qml/qml/v8/qqmlbuiltinfunctions_p.h
+++ b/src/qml/qml/v8/qqmlbuiltinfunctions_p.h
@@ -70,11 +70,6 @@ struct QtObject : Object
         QObject *platform;
         QObject *application;
     };
-    struct {
-        QObject *platform;
-        QObject *application;
-    } __data;
-
     V4_OBJECT(Object)
 
 
@@ -162,11 +157,6 @@ struct QQmlBindingFunction : public QV4::FunctionObject
         // Set when the binding is created later
         QQmlSourceLocation bindingLocation;
     };
-    struct {
-        QV4::FunctionObject *originalFunction;
-        QQmlSourceLocation bindingLocation;
-    } __data;
-
     V4_OBJECT(QV4::FunctionObject)
 
     void initBindingLocation(); // from caller stack trace