Abstract expression and binding APIs

By splitting the interface through which the system interacts with bindings
away from a specific implementation, we can introduce highly specialized
implementations for specific optimizations.

This commit also includes a sample optimization for object properties being
assigned directly from a local id.

1 files changed, 5 insertions, 1 deletions

diff --git a/src/declarative/qml/qmlcontext_p.h b/src/declarative/qml/qmlcontext_p.h
index 0424a85..b5479d9 100644
--- a/src/declarative/qml/qmlcontext_p.h
+++ b/src/declarative/qml/qmlcontext_p.h
@@ -68,6 +68,8 @@ class QmlExpression;
 class QmlEngine;
 class QmlExpression;
 class QmlExpressionPrivate;
+class QmlAbstractExpression;
+class QmlBindingIdOptimization;
 
 class QmlContextPrivate : public QObjectPrivate
 {
@@ -104,13 +106,15 @@ public:
     void invalidateEngines();
     QSet<QmlContext *> childContexts;
 
-    QmlExpressionPrivate *expressions;
+    QmlAbstractExpression *expressions;
 
     QObjectList contextObjects;
 
     struct ContextGuard : public QGuard<QObject>
     {
+        ContextGuard() : priv(0), bindings(0) {}
         QmlContextPrivate *priv;
+        QmlBindingIdOptimization *bindings;
         ContextGuard &operator=(QObject *obj) {
             (QGuard<QObject>&)*this = obj; return *this;
         }