Cleanup: Remove ExternalResource from QV4::Object

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

diff --git a/src/qml/qml/v4/qv4object.cpp b/src/qml/qml/v4/qv4object.cpp
index 1849cc8..16b5787 100644 (file)
--- a/src/qml/qml/v4/qv4object.cpp
+++ b/src/qml/qml/v4/qv4object.cpp
@@ -73,7 +73,6 @@ Object::Object(ExecutionEngine *engine)
     , prototype(0)
     , memberDataAlloc(InlinePropertySize), memberData(inlineProperties)
     , arrayOffset(0), arrayDataLen(0), arrayAlloc(0), arrayAttributes(0), arrayData(0), sparseArray(0)
-    , externalResource(0)
 {
     vtbl = &static_vtbl;
     type = Type_Object;
@@ -85,7 +84,6 @@ Object::Object(ExecutionContext *context)
     , prototype(0)
     , memberDataAlloc(InlinePropertySize), memberData(inlineProperties)
     , arrayOffset(0), arrayDataLen(0), arrayAlloc(0), arrayAttributes(0), arrayData(0), sparseArray(0)
-    , externalResource(0)
 {
     vtbl = &static_vtbl;
     type = Type_Object;
@@ -97,7 +95,6 @@ Object::Object(ExecutionEngine *engine, InternalClass *internalClass)
     , prototype(0)
     , memberDataAlloc(InlinePropertySize), memberData(inlineProperties)
     , arrayOffset(0), arrayDataLen(0), arrayAlloc(0), arrayAttributes(0), arrayData(0), sparseArray(0)
-    , externalResource(0)
 {
     vtbl = &static_vtbl;
     type = Type_Object;
@@ -111,7 +108,6 @@ Object::Object(ExecutionEngine *engine, InternalClass *internalClass)
 
 Object::~Object()
 {
-    delete externalResource;
     if (memberData != inlineProperties)
         delete [] memberData;
     delete [] (arrayData - (sparseArray ? 0 : arrayOffset));

diff --git a/src/qml/qml/v4/qv4object_p.h b/src/qml/qml/v4/qv4object_p.h
index c0850a0..a6f1c04 100644 (file)
--- a/src/qml/qml/v4/qv4object_p.h
+++ b/src/qml/qml/v4/qv4object_p.h
@@ -102,12 +102,6 @@ typedef Value (*PropertyEnumeratorFunction)(Object *object);
 typedef PropertyAttributes (*PropertyQueryFunction)(const Object *object, String *name);
 
 struct Q_QML_EXPORT Object: Managed {
-
-    class ExternalResource {
-    public:
-        virtual ~ExternalResource() {}
-    };
-
     Object *prototype;
     uint memberDataAlloc;
     Property *memberData;
@@ -121,7 +115,6 @@ struct Q_QML_EXPORT Object: Managed {
     PropertyAttributes *arrayAttributes;
     Property *arrayData;
     SparseArray *sparseArray;
-    ExternalResource *externalResource;
 
     enum {
         InlinePropertySize = 4