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, 2 insertions, 22 deletions

diff --git a/src/qml/qml/qqmlengine_p.h b/src/qml/qml/qqmlengine_p.h
index 1021c30f4a..1a317f6fbd 100644
--- a/src/qml/qml/qqmlengine_p.h
+++ b/src/qml/qml/qqmlengine_p.h
@@ -94,6 +94,7 @@ class QQmlObjectCreator;
 class QDir;
 class QQmlIncubator;
 class QQmlProfiler;
+class QQmlPropertyCapture;
 
 // This needs to be declared here so that the pool for it can live in QQmlEnginePrivate.
 // The inline method definitions are in qqmljavascriptexpression_p.h
@@ -122,16 +123,7 @@ public:
     // is just qmlClearTypeRegistrations (which can't be called while an engine exists)
     static bool baseModulesUninitialized;
 
-    class PropertyCapture {
-    public:
-        inline virtual ~PropertyCapture() {}
-        virtual void captureProperty(QQmlNotifier *) = 0;
-        virtual void captureProperty(QObject *, int, int) = 0;
-    };
-
-    PropertyCapture *propertyCapture;
-    inline void captureProperty(QQmlNotifier *);
-    inline void captureProperty(QObject *, int, int);
+    QQmlPropertyCapture *propertyCapture;
 
     QRecyclePool<QQmlJavaScriptExpressionGuard> jsExpressionGuardPool;
 
@@ -413,18 +405,6 @@ QQmlEnginePrivate *QQmlEnginePrivate::get(QV4::ExecutionEngine *e)
     return get(qmlEngine);
 }
 
-void QQmlEnginePrivate::captureProperty(QQmlNotifier *n)
-{
-    if (propertyCapture)
-        propertyCapture->captureProperty(n);
-}
-
-void QQmlEnginePrivate::captureProperty(QObject *o, int c, int n)
-{
-    if (propertyCapture)
-        propertyCapture->captureProperty(o, c, n);
-}
-
 void QQmlEnginePrivate::setDebugChangesCache(const QHash<QUrl, QByteArray> &changes)
 {
     Locker locker(this);