QQmlComponent: Make it harder to leak deferred states

The previous pointer wrangling was ripe with foot guns. Let's just use a
vector of unique_ptr to keep track of the states.

Change-Id: I3ae225b3ab8644aa690d506d0a5de0bfb9ecce23
Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>

1 files changed, 3 insertions, 17 deletions

diff --git a/src/qml/qml/qqmlcomponent_p.h b/src/qml/qml/qqmlcomponent_p.h
index 59ef47f2c3..f95e83f15e 100644
--- a/src/qml/qml/qqmlcomponent_p.h
+++ b/src/qml/qml/qqmlcomponent_p.h
@@ -112,27 +112,13 @@ public:
     QQmlRefPointer<QV4::ExecutableCompilationUnit> compilationUnit;
 
     struct ConstructionState {
-        ConstructionState()
-            : completePending(false)
-        {}
-        ~ConstructionState()
-        {
-        }
-
-        QScopedPointer<QQmlObjectCreator> creator;
+        std::unique_ptr<QQmlObjectCreator> creator;
         QList<QQmlError> errors;
-        bool completePending;
+        bool completePending = false;
     };
     ConstructionState state;
 
-    struct DeferredState {
-        ~DeferredState() {
-            qDeleteAll(constructionStates);
-            constructionStates.clear();
-        }
-        QVector<ConstructionState *> constructionStates;
-    };
-
+    using DeferredState = std::vector<ConstructionState>;
     static void beginDeferred(QQmlEnginePrivate *enginePriv, QObject *object, DeferredState* deferredState);
     static void completeDeferred(QQmlEnginePrivate *enginePriv, DeferredState *deferredState);