QML: Introduce destroy() on Base subclasses

This removes the destructors of subclasses of Base, making them nearly
trivial.

Change-Id: Ia6f7d467e87899b5ad37b8709a8f633a51689d59
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>

1 files changed, 31 insertions, 27 deletions

diff --git a/src/qml/jsruntime/qv4sequenceobject.cpp b/src/qml/jsruntime/qv4sequenceobject.cpp
index 59086c245c..fb9ef4a2b2 100644
--- a/src/qml/jsruntime/qv4sequenceobject.cpp
+++ b/src/qml/jsruntime/qv4sequenceobject.cpp
@@ -218,9 +218,12 @@ template <typename Container>
 struct QQmlSequence : Object {
     QQmlSequence(const Container &container);
     QQmlSequence(QObject *object, int propertyIndex);
-    ~QQmlSequence() { object.destroy(); }
+    void destroy() {
+        delete container;
+        object.destroy();
+    }
 
-    mutable Container container;
+    mutable Container *container;
     QQmlQPointer<QObject> object;
     int propertyIndex;
     bool isReference;
@@ -260,10 +263,10 @@ public:
             loadReference();
         }
         qint32 signedIdx = static_cast<qint32>(index);
-        if (signedIdx < d()->container.count()) {
+        if (signedIdx < d()->container->count()) {
             if (hasProperty)
                 *hasProperty = true;
-            return convertElementToValue(engine(), d()->container.at(signedIdx));
+            return convertElementToValue(engine(), d()->container->at(signedIdx));
         }
         if (hasProperty)
             *hasProperty = false;
@@ -289,22 +292,22 @@ public:
 
         qint32 signedIdx = static_cast<qint32>(index);
 
-        int count = d()->container.count();
+        int count = d()->container->count();
 
         typename Container::value_type element = convertValueToElement<typename Container::value_type>(value);
 
         if (signedIdx == count) {
-            d()->container.append(element);
+            d()->container->append(element);
         } else if (signedIdx < count) {
-            d()->container[signedIdx] = element;
+            (*d()->container)[signedIdx] = element;
         } else {
             /* according to ECMA262r3 we need to insert */
             /* the value at the given index, increasing length to index+1. */
-            d()->container.reserve(signedIdx + 1);
+            d()->container->reserve(signedIdx + 1);
             while (signedIdx > count++) {
-                d()->container.append(typename Container::value_type());
+                d()->container->append(typename Container::value_type());
             }
-            d()->container.append(element);
+            d()->container->append(element);
         }
 
         if (d()->isReference)
@@ -324,7 +327,7 @@ public:
             loadReference();
         }
         qint32 signedIdx = static_cast<qint32>(index);
-        return (signedIdx < d()->container.count()) ? QV4::Attr_Data : QV4::Attr_Invalid;
+        return (signedIdx < d()->container->count()) ? QV4::Attr_Data : QV4::Attr_Invalid;
     }
 
     void containerAdvanceIterator(ObjectIterator *it, Value *name, uint *index, Property *p, PropertyAttributes *attrs)
@@ -340,11 +343,11 @@ public:
             loadReference();
         }
 
-        if (it->arrayIndex < static_cast<uint>(d()->container.count())) {
+        if (it->arrayIndex < static_cast<uint>(d()->container->count())) {
             *index = it->arrayIndex;
             ++it->arrayIndex;
             *attrs = QV4::Attr_Data;
-            p->value = convertElementToValue(engine(), d()->container.at(*index));
+            p->value = convertElementToValue(engine(), d()->container->at(*index));
             return;
         }
         QV4::Object::advanceIterator(this, it, name, index, p, attrs);
@@ -362,12 +365,12 @@ public:
         }
         qint32 signedIdx = static_cast<qint32>(index);
 
-        if (signedIdx >= d()->container.count())
+        if (signedIdx >= d()->container->count())
             return false;
 
         /* according to ECMA262r3 it should be Undefined, */
         /* but we cannot, so we insert a default-value instead. */
-        d()->container.replace(signedIdx, typename Container::value_type());
+        d()->container->replace(signedIdx, typename Container::value_type());
 
         if (d()->isReference)
             storeReference();
@@ -432,10 +435,10 @@ public:
         QV4::Scope scope(ctx);
         if (ctx->argc() == 1 && ctx->args()[0].as<FunctionObject>()) {
             CompareFunctor cf(ctx, ctx->args()[0]);
-            std::sort(d()->container.begin(), d()->container.end(), cf);
+            std::sort(d()->container->begin(), d()->container->end(), cf);
         } else {
             DefaultCompareFunctor cf;
-            std::sort(d()->container.begin(), d()->container.end(), cf);
+            std::sort(d()->container->begin(), d()->container->end(), cf);
         }
 
         if (d()->isReference)
@@ -454,7 +457,7 @@ public:
                 return QV4::Encode(0);
             This->loadReference();
         }
-        return QV4::Encode(This->d()->container.count());
+        return QV4::Encode(This->d()->container->count());
     }
 
     static QV4::ReturnedValue method_set_length(QV4::CallContext* ctx)
@@ -478,23 +481,23 @@ public:
         }
         /* Determine whether we need to modify the sequence */
         qint32 newCount = static_cast<qint32>(newLength);
-        qint32 count = This->d()->container.count();
+        qint32 count = This->d()->container->count();
         if (newCount == count) {
             return QV4::Encode::undefined();
         } else if (newCount > count) {
             /* according to ECMA262r3 we need to insert */
             /* undefined values increasing length to newLength. */
             /* We cannot, so we insert default-values instead. */
-            This->d()->container.reserve(newCount);
+            This->d()->container->reserve(newCount);
             while (newCount > count++) {
-                This->d()->container.append(typename Container::value_type());
+                This->d()->container->append(typename Container::value_type());
             }
         } else {
             /* according to ECMA262r3 we need to remove */
             /* elements until the sequence is the required length. */
             while (newCount < count) {
                 count--;
-                This->d()->container.removeAt(count);
+                This->d()->container->removeAt(count);
             }
         }
         /* write back if required. */
@@ -506,7 +509,7 @@ public:
     }
 
     QVariant toVariant() const
-    { return QVariant::fromValue<Container>(d()->container); }
+    { return QVariant::fromValue<Container>(*d()->container); }
 
     static QVariant toVariant(QV4::ArrayObject *array)
     {
@@ -523,7 +526,7 @@ public:
     {
         Q_ASSERT(d()->object);
         Q_ASSERT(d()->isReference);
-        void *a[] = { &d()->container, 0 };
+        void *a[] = { d()->container, 0 };
         QMetaObject::metacall(d()->object, QMetaObject::ReadProperty, d()->propertyIndex, a);
     }
 
@@ -533,7 +536,7 @@ public:
         Q_ASSERT(d()->isReference);
         int status = -1;
         QQmlPropertyData::WriteFlags flags = QQmlPropertyData::DontRemoveBinding;
-        void *a[] = { &d()->container, 0, &status, &flags };
+        void *a[] = { d()->container, 0, &status, &flags };
         QMetaObject::metacall(d()->object, QMetaObject::WriteProperty, d()->propertyIndex, a);
     }
 
@@ -555,7 +558,7 @@ public:
 
 template <typename Container>
 Heap::QQmlSequence<Container>::QQmlSequence(const Container &container)
-    : container(container)
+    : container(new Container(container))
     , propertyIndex(-1)
     , isReference(false)
 {
@@ -569,7 +572,8 @@ Heap::QQmlSequence<Container>::QQmlSequence(const Container &container)
 
 template <typename Container>
 Heap::QQmlSequence<Container>::QQmlSequence(QObject *object, int propertyIndex)
-    : propertyIndex(propertyIndex)
+    : container(new Container)
+    , propertyIndex(propertyIndex)
     , isReference(true)
 {
     this->object.init(object);