Simplify property capturing code

No need to inherit from a base class defined in QQmlEnginePrivate.
The capture handling can be a simple value based class without
virtual methods that is allocated on the stack.

Change-Id: Ib0ddf4afcaf154b3f953d8c9322f5bec196d7abf
Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>

1 files changed, 23 insertions, 21 deletions

diff --git a/src/qml/qml/qqmljavascriptexpression_p.h b/src/qml/qml/qqmljavascriptexpression_p.h
index ce490ee170..24e9878aa2 100644
--- a/src/qml/qml/qqmljavascriptexpression_p.h
+++ b/src/qml/qml/qqmljavascriptexpression_p.h
@@ -145,35 +145,16 @@ public:
 
 private:
     friend class QQmlContextData;
-    typedef QQmlJavaScriptExpressionGuard Guard;
+    friend class QQmlPropertyCapture;
     friend void QQmlJavaScriptExpressionGuard_callback(QQmlNotifierEndpoint *, void **);
 
-    struct GuardCapture : public QQmlEnginePrivate::PropertyCapture {
-        GuardCapture(QQmlEngine *engine, QQmlJavaScriptExpression *e, DeleteWatcher *w)
-        : engine(engine), expression(e), watcher(w), errorString(0) { }
-
-        ~GuardCapture()  {
-            Q_ASSERT(guards.isEmpty());
-            Q_ASSERT(errorString == 0);
-        }
-
-        virtual void captureProperty(QQmlNotifier *);
-        virtual void captureProperty(QObject *, int, int);
-
-        QQmlEngine *engine;
-        QQmlJavaScriptExpression *expression;
-        DeleteWatcher *watcher;
-        QFieldList<Guard, &Guard::next> guards;
-        QStringList *errorString;
-    };
-
     QQmlDelayedError *m_error;
 
     // We store some flag bits in the following flag pointers.
     //    activeGuards:flag1  - notifyOnValueChanged
     //    activeGuards:flag2  - useSharedContext
     QBiPointer<QObject, DeleteWatcher> m_scopeObject;
-    QForwardFieldList<Guard, &Guard::next> activeGuards;
+    QForwardFieldList<QQmlJavaScriptExpressionGuard, &QQmlJavaScriptExpressionGuard::next> activeGuards;
 
     QQmlContextData *m_context;
     QQmlJavaScriptExpression **m_prevExpression;
@@ -183,6 +164,27 @@ protected:
     QV4::PersistentValue m_function;
 };
 
+class QQmlPropertyCapture
+{
+public:
+    QQmlPropertyCapture(QQmlEngine *engine, QQmlJavaScriptExpression *e, QQmlJavaScriptExpression::DeleteWatcher *w)
+    : engine(engine), expression(e), watcher(w), errorString(0) { }
+
+    ~QQmlPropertyCapture()  {
+        Q_ASSERT(guards.isEmpty());
+        Q_ASSERT(errorString == 0);
+    }
+
+    void captureProperty(QQmlNotifier *);
+    void captureProperty(QObject *, int, int);
+
+    QQmlEngine *engine;
+    QQmlJavaScriptExpression *expression;
+    QQmlJavaScriptExpression::DeleteWatcher *watcher;
+    QFieldList<QQmlJavaScriptExpressionGuard, &QQmlJavaScriptExpressionGuard::next> guards;
+    QStringList *errorString;
+};
+
 QQmlJavaScriptExpression::DeleteWatcher::DeleteWatcher(QQmlJavaScriptExpression *e)
 : _c(0), _w(0), _s(e)
 {