Rename QmlBindableValue to QmlBinding

28 files changed, 100 insertions, 109 deletions

diff --git a/src/declarative/fx/qfxanchors.cpp b/src/declarative/fx/qfxanchors.cpp
index e1b450d..350cbc0 100644
--- a/src/declarative/fx/qfxanchors.cpp
+++ b/src/declarative/fx/qfxanchors.cpp
@@ -44,7 +44,6 @@
 #include "qfxitem_p.h"
 #include <QDebug>
 #include <QtDeclarative/qmlinfo.h>
-#include <QtDeclarative/qmlbindablevalue.h>
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/declarative/fx/qfxpathview.cpp b/src/declarative/fx/qfxpathview.cpp
index f940f68..3c61050 100644
--- a/src/declarative/fx/qfxpathview.cpp
+++ b/src/declarative/fx/qfxpathview.cpp
@@ -42,7 +42,6 @@
 #include <math.h>
 #include <QDebug>
 #include <QEvent>
-#include "qmlbindablevalue.h"
 #include "qmlstate.h"
 #include "qlistmodelinterface.h"
 #include "qmlopenmetaobject.h"
diff --git a/src/declarative/fx/qfxwebview.cpp b/src/declarative/fx/qfxwebview.cpp
index a3dca79e..42b8d2c 100644
--- a/src/declarative/fx/qfxwebview.cpp
+++ b/src/declarative/fx/qfxwebview.cpp
@@ -53,7 +53,6 @@
 #include <QtWebKit/QWebElement>
 
 #include "qml.h"
-#include "qmlbindablevalue.h"
 #include "qmlengine.h"
 #include "qmlstate.h"
 #include "qfxtransform.h"
diff --git a/src/declarative/qml/qml.pri b/src/declarative/qml/qml.pri
index eecf8cd..b3fa063 100644
--- a/src/declarative/qml/qml.pri
+++ b/src/declarative/qml/qml.pri
@@ -3,7 +3,7 @@ SOURCES += qml/qmlparser.cpp \
     qml/qmlvmemetaobject.cpp \
     qml/qmlengine.cpp \
     qml/qmlexpression.cpp \
-    qml/qmlbindablevalue.cpp \
+    qml/qmlbinding.cpp \
     qml/qmlmetaproperty.cpp \
     qml/qmlcomponent.cpp \
     qml/qmlcontext.cpp \
@@ -33,8 +33,8 @@ HEADERS += qml/qmlparser_p.h \
     qml/qmlinstruction_p.h \
     qml/qmlvmemetaobject_p.h \
     qml/qml.h \
-    qml/qmlbindablevalue.h \
-    qml/qmlbindablevalue_p.h \
+    qml/qmlbinding.h \
+    qml/qmlbinding_p.h \
     qml/qmlmetaproperty.h \
     qml/qmlcomponent.h \
     qml/qmlcomponent_p.h \
diff --git a/src/declarative/qml/qmlbindablevalue.cpp b/src/declarative/qml/qmlbinding.cpp
index 6dda5e3..6a8a027 100644
--- a/src/declarative/qml/qmlbindablevalue.cpp
+++ b/src/declarative/qml/qmlbinding.cpp
@@ -40,8 +40,8 @@
 ****************************************************************************/
 
 #include <qml.h>
-#include "qmlbindablevalue.h"
-#include "qmlbindablevalue_p.h"
+#include "qmlbinding.h"
+#include "qmlbinding_p.h"
 #include <qmlcontext.h>
 #include <qmlinfo.h>
 #include <QVariant>
@@ -54,46 +54,46 @@ QT_BEGIN_NAMESPACE
 
 DEFINE_BOOL_CONFIG_OPTION(scriptWarnings, QML_SCRIPT_WARNINGS);
 
-QmlBindableValuePrivate::QmlBindableValuePrivate()
+QmlBindingPrivate::QmlBindingPrivate()
 : inited(false), updating(false), enabled(true), mePtr(0)
 {
 }
 
-QML_DEFINE_NOCREATE_TYPE(QmlBindableValue);
-QmlBindableValue::QmlBindableValue(void *data, QmlRefCount *rc, QObject *obj, QmlContext *ctxt, QObject *parent)
-: QmlPropertyValueSource(*new QmlBindableValuePrivate, parent), QmlExpression(ctxt, data, rc, obj)
+QML_DEFINE_NOCREATE_TYPE(QmlBinding);
+QmlBinding::QmlBinding(void *data, QmlRefCount *rc, QObject *obj, QmlContext *ctxt, QObject *parent)
+: QmlPropertyValueSource(*new QmlBindingPrivate, parent), QmlExpression(ctxt, data, rc, obj)
 {
 }
 
-QmlBindableValue::QmlBindableValue(const QString &str, QObject *obj, QmlContext *ctxt, QObject *parent)
-: QmlPropertyValueSource(*new QmlBindableValuePrivate, parent), QmlExpression(ctxt, str, obj)
+QmlBinding::QmlBinding(const QString &str, QObject *obj, QmlContext *ctxt, QObject *parent)
+: QmlPropertyValueSource(*new QmlBindingPrivate, parent), QmlExpression(ctxt, str, obj)
 {
 }
 
-QmlBindableValue::~QmlBindableValue()
+QmlBinding::~QmlBinding()
 {
-    Q_D(QmlBindableValue);
+    Q_D(QmlBinding);
     if(d->mePtr)
         *(d->mePtr) = 0;
 }
 
-void QmlBindableValue::setTarget(const QmlMetaProperty &prop)
+void QmlBinding::setTarget(const QmlMetaProperty &prop)
 {
-    Q_D(QmlBindableValue);
+    Q_D(QmlBinding);
     d->property = prop;
 
     update();
 }
 
-QmlMetaProperty QmlBindableValue::property() const 
+QmlMetaProperty QmlBinding::property() const 
 {
-   Q_D(const QmlBindableValue);
+   Q_D(const QmlBinding);
    return d->property; 
 }
 
-void QmlBindableValue::init()
+void QmlBinding::init()
 {
-    Q_D(QmlBindableValue);
+    Q_D(QmlBinding);
 
     if (d->inited)
         return;
@@ -101,24 +101,24 @@ void QmlBindableValue::init()
     update();
 }
 
-void QmlBindableValue::setExpression(const QString &expr)
+void QmlBinding::setExpression(const QString &expr)
 {
     QmlExpression::setExpression(expr);
     update();
 }
 
-void QmlBindableValue::forceUpdate()
+void QmlBinding::forceUpdate()
 {
-    Q_D(QmlBindableValue);
+    Q_D(QmlBinding);
     if (!d->inited)
         init();
     else
         update();
 }
 
-void QmlBindableValue::update()
+void QmlBinding::update()
 {
-    Q_D(QmlBindableValue);
+    Q_D(QmlBinding);
 
 #ifdef Q_ENABLE_PERFORMANCE_LOG
     QFxPerfTimer<QFxPerf::BindableValueUpdate> bu;
@@ -135,7 +135,7 @@ void QmlBindableValue::update()
             Q_ASSERT(idx != -1);
 
             void *a[1];
-            QmlBindableValue *t = this;
+            QmlBinding *t = this;
             a[0] = (void *)&t;
             QMetaObject::metacall(d->property.object(), 
                                   QMetaObject::WriteProperty,
@@ -164,21 +164,21 @@ void QmlBindableValue::update()
     }
 }
 
-void QmlBindableValue::valueChanged()
+void QmlBinding::valueChanged()
 {
     update();
 }
 
-void QmlBindableValue::setEnabled(bool e)
+void QmlBinding::setEnabled(bool e)
 {
-    Q_D(QmlBindableValue);
+    Q_D(QmlBinding);
     d->enabled = e;
     setTrackChange(e);
 }
 
-bool QmlBindableValue::enabled() const
+bool QmlBinding::enabled() const
 {
-    Q_D(const QmlBindableValue);
+    Q_D(const QmlBinding);
 
     return d->enabled;
 }
diff --git a/src/declarative/qml/qmlbindablevalue.h b/src/declarative/qml/qmlbinding.h
index 12da9f6..e208277 100644
--- a/src/declarative/qml/qmlbindablevalue.h
+++ b/src/declarative/qml/qmlbinding.h
@@ -39,8 +39,8 @@
 **
 ****************************************************************************/
 
-#ifndef QMLBINDABLEVALUE_H
-#define QMLBINDABLEVALUE_H
+#ifndef QMLBINDING_H
+#define QMLBINDING_H
 
 #include <QtCore/QObject>
 #include <QtDeclarative/qfxglobal.h>
@@ -56,15 +56,15 @@ QT_MODULE(Declarative)
 
 class QmlExpression;
 class QmlContext;
-class QmlBindableValuePrivate;
-class Q_DECLARATIVE_EXPORT QmlBindableValue : public QmlPropertyValueSource, 
-                                              public QmlExpression
+class QmlBindingPrivate;
+class Q_DECLARATIVE_EXPORT QmlBinding : public QmlPropertyValueSource, 
+                                        public QmlExpression
 {
 Q_OBJECT
 public:
-    QmlBindableValue(const QString &, QObject *, QmlContext *, QObject *parent=0);
-    QmlBindableValue(void *, QmlRefCount *, QObject *, QmlContext *, QObject *parent);
-    ~QmlBindableValue();
+    QmlBinding(const QString &, QObject *, QmlContext *, QObject *parent=0);
+    QmlBinding(void *, QmlRefCount *, QObject *, QmlContext *, QObject *parent);
+    ~QmlBinding();
 
     virtual void setTarget(const QmlMetaProperty &);
     QmlMetaProperty property() const;
@@ -86,13 +86,13 @@ protected:
     virtual void valueChanged();
 
 private:
-    Q_DECLARE_PRIVATE(QmlBindableValue)
+    Q_DECLARE_PRIVATE(QmlBinding)
 };
 
 QT_END_NAMESPACE
 
-QML_DECLARE_TYPE(QmlBindableValue)
+QML_DECLARE_TYPE(QmlBinding)
 
 QT_END_HEADER
 
-#endif // QMLBINDABLEVALUE_H
+#endif // QMLBINDING_H
diff --git a/src/declarative/qml/qmlbindablevalue_p.h b/src/declarative/qml/qmlbinding_p.h
index a37b2c0..470a62a 100644
--- a/src/declarative/qml/qmlbindablevalue_p.h
+++ b/src/declarative/qml/qmlbinding_p.h
@@ -39,8 +39,8 @@
 **
 ****************************************************************************/
 
-#ifndef QMLBINDABLEVALUE_P_H
-#define QMLBINDABLEVALUE_P_H
+#ifndef QMLBINDING_P_H
+#define QMLBINDING_P_H
 
 //
 //  W A R N I N G
@@ -54,16 +54,16 @@
 //
 
 #include <private/qobject_p.h>
-#include <QtDeclarative/qmlbindablevalue.h>
+#include <QtDeclarative/qmlbinding.h>
 #include <QtDeclarative/qmlmetaproperty.h>
 
 QT_BEGIN_NAMESPACE
 
-class QmlBindableValuePrivate : public QObjectPrivate
+class QmlBindingPrivate : public QObjectPrivate
 {
-    Q_DECLARE_PUBLIC(QmlBindableValue)
+    Q_DECLARE_PUBLIC(QmlBinding)
 public:
-    QmlBindableValuePrivate();
+    QmlBindingPrivate();
 
     bool inited:1;
     bool updating:1;
@@ -71,9 +71,9 @@ public:
 
     QmlMetaProperty property;
 
-    QmlBindableValue **mePtr;
+    QmlBinding **mePtr;
 };
 
 QT_END_NAMESPACE
 
-#endif // QMLBINDABLEVALUE_P_H
+#endif // QMLBINDING_P_H
diff --git a/src/declarative/qml/qmlcomponent.cpp b/src/declarative/qml/qmlcomponent.cpp
index c7d45fd..4e39d7f 100644
--- a/src/declarative/qml/qmlcomponent.cpp
+++ b/src/declarative/qml/qmlcomponent.cpp
@@ -51,7 +51,7 @@
 #include <QStringList>
 #include <qmlengine.h>
 #include <QFileInfo>
-#include <qmlbindablevalue.h>
+#include "qmlbinding.h"
 #include <QtCore/qdebug.h>
 #include <QApplication>
 
@@ -578,7 +578,7 @@ void QmlComponent::completeCreate()
             QFxPerfTimer<QFxPerf::BindInit> bi;
 #endif
             for (int ii = 0; ii < d->bindValues.count(); ++ii) {
-                QmlEnginePrivate::SimpleList<QmlBindableValue> bv = 
+                QmlEnginePrivate::SimpleList<QmlBinding> bv = 
                     d->bindValues.at(ii);
                 for (int jj = 0; jj < bv.count; ++jj) {
                     if(bv.at(jj)) 
diff --git a/src/declarative/qml/qmlcomponent_p.h b/src/declarative/qml/qmlcomponent_p.h
index 25af342..a7a3230 100644
--- a/src/declarative/qml/qmlcomponent_p.h
+++ b/src/declarative/qml/qmlcomponent_p.h
@@ -88,7 +88,7 @@ public:
     int count;
     QmlCompiledData *cc;
 
-    QList<QmlEnginePrivate::SimpleList<QmlBindableValue> > bindValues;
+    QList<QmlEnginePrivate::SimpleList<QmlBinding> > bindValues;
     QList<QmlEnginePrivate::SimpleList<QmlParserStatus> > parserStatus;
 
     bool completePending;
diff --git a/src/declarative/qml/qmlengine.cpp b/src/declarative/qml/qmlengine.cpp
index 429e3b0..8b21290 100644
--- a/src/declarative/qml/qmlengine.cpp
+++ b/src/declarative/qml/qmlengine.cpp
@@ -72,7 +72,7 @@
 #include <QtCore/qdir.h>
 #include <qmlcomponent.h>
 #include "private/qmlmetaproperty_p.h"
-#include <private/qmlbindablevalue_p.h>
+#include <private/qmlbinding_p.h>
 #include <private/qmlvme_p.h>
 #include <private/qmlenginedebug_p.h>
 
@@ -118,13 +118,13 @@ QmlEnginePrivate::~QmlEnginePrivate()
         clear(parserStatus[ii]);
 }
 
-void QmlEnginePrivate::clear(SimpleList<QmlBindableValue> &bvs)
+void QmlEnginePrivate::clear(SimpleList<QmlBinding> &bvs)
 {
     for (int ii = 0; ii < bvs.count; ++ii) {
-        QmlBindableValue *bv = bvs.at(ii);
+        QmlBinding *bv = bvs.at(ii);
         if(bv) {
-            QmlBindableValuePrivate *p = 
-                static_cast<QmlBindableValuePrivate *>(QObjectPrivate::get(bv));
+            QmlBindingPrivate *p = 
+                static_cast<QmlBindingPrivate *>(QObjectPrivate::get(bv));
             p->mePtr = 0;
         }
     }
diff --git a/src/declarative/qml/qmlengine_p.h b/src/declarative/qml/qmlengine_p.h
index 4bef85a..47d2397 100644
--- a/src/declarative/qml/qmlengine_p.h
+++ b/src/declarative/qml/qmlengine_p.h
@@ -151,10 +151,10 @@ public:
         }
     };
 
-    static void clear(SimpleList<QmlBindableValue> &);
+    static void clear(SimpleList<QmlBinding> &);
     static void clear(SimpleList<QmlParserStatus> &);
 
-    QList<SimpleList<QmlBindableValue> > bindValues;
+    QList<SimpleList<QmlBinding> > bindValues;
     QList<SimpleList<QmlParserStatus> > parserStatus;
 
     QmlComponent *rootComponent;
diff --git a/src/declarative/qml/qmlmetaproperty.cpp b/src/declarative/qml/qmlmetaproperty.cpp
index dea3467..daa4242 100644
--- a/src/declarative/qml/qmlmetaproperty.cpp
+++ b/src/declarative/qml/qmlmetaproperty.cpp
@@ -44,7 +44,7 @@
 #include <qml.h>
 #include <private/qfxperf_p.h>
 #include <QStringList>
-#include <qmlbindablevalue.h>
+#include "qmlbinding.h"
 #include <qmlcontext.h>
 #include "qmlboundsignal_p.h"
 #include <math.h>
@@ -260,7 +260,7 @@ QmlMetaProperty::QmlMetaProperty(const QmlMetaProperty &other)
 
   \value Unknown The category is unknown.  This will never be returned from propertyCategory()
   \value InvalidProperty The property is invalid.
-  \value Bindable The property is a QmlBindableValue.
+  \value Bindable The property is a QmlBinding.
   \value List The property is a QList pointer
   \value QmlList The property is a QmlList pointer
   \value Object The property is a QObject derived type pointer
@@ -294,7 +294,7 @@ QmlMetaPropertyPrivate::propertyCategory() const
         int type = propertyType();
         if (type == QmlMetaProperty::Invalid)
             category = QmlMetaProperty::InvalidProperty;
-        else if (type == qMetaTypeId<QmlBindableValue *>())
+        else if (type == qMetaTypeId<QmlBinding *>())
             category = QmlMetaProperty::Bindable;
         else if (QmlMetaType::isList(type))
             category = QmlMetaProperty::List;
@@ -323,7 +323,7 @@ QmlMetaProperty::propertyCategory(const QMetaProperty &prop)
         else
             type = prop.type();
 
-        if (type == qMetaTypeId<QmlBindableValue *>())
+        if (type == qMetaTypeId<QmlBinding *>())
             return Bindable;
         else if (QmlMetaType::isList(type))
             return List;
@@ -510,7 +510,7 @@ QMetaProperty QmlMetaProperty::property() const
     Returns the binding associated with this property, or 0 if no binding 
     exists.
 */
-QmlBindableValue *QmlMetaProperty::binding() const
+QmlBinding *QmlMetaProperty::binding() const
 {
     if (!isProperty() || type() & Attached)
         return 0;
@@ -519,8 +519,8 @@ QmlBindableValue *QmlMetaProperty::binding() const
     for (QObjectList::ConstIterator iter = children.begin();
             iter != children.end(); ++iter) {
         QObject *child = *iter;
-        if (child->metaObject() == &QmlBindableValue::staticMetaObject) {
-            QmlBindableValue *v = static_cast<QmlBindableValue *>(child);
+        if (child->metaObject() == &QmlBinding::staticMetaObject) {
+            QmlBinding *v = static_cast<QmlBinding *>(child);
             if (v->property() == *this)
                 return v;
         }
@@ -535,7 +535,7 @@ QmlBindableValue *QmlMetaProperty::binding() const
     \a binding will be enabled, and the returned binding (if any) will be
     disabled.
 */
-QmlBindableValue *QmlMetaProperty::setBinding(QmlBindableValue *binding) const
+QmlBinding *QmlMetaProperty::setBinding(QmlBinding *binding) const
 {
     if (!isProperty() || type() & Attached)
         return 0;
@@ -544,8 +544,8 @@ QmlBindableValue *QmlMetaProperty::setBinding(QmlBindableValue *binding) const
     for (QObjectList::ConstIterator iter = children.begin();
             iter != children.end(); ++iter) {
         QObject *child = *iter;
-        if (child->metaObject() == &QmlBindableValue::staticMetaObject) {
-            QmlBindableValue *v = static_cast<QmlBindableValue *>(child);
+        if (child->metaObject() == &QmlBinding::staticMetaObject) {
+            QmlBinding *v = static_cast<QmlBinding *>(child);
             if (v->property() == *this && v->enabled()) {
 
                 v->setEnabled(false);
diff --git a/src/declarative/qml/qmlmetaproperty.h b/src/declarative/qml/qmlmetaproperty.h
index 688c4fd..fdcf9be 100644
--- a/src/declarative/qml/qmlmetaproperty.h
+++ b/src/declarative/qml/qmlmetaproperty.h
@@ -52,7 +52,7 @@ QT_BEGIN_NAMESPACE
 QT_MODULE(Declarative)
 
 class QObject;
-class QmlBindableValue;
+class QmlBinding;
 class QStringList;
 class QVariant;
 struct QMetaObject;
@@ -121,8 +121,8 @@ public:
 
     QMetaProperty property() const;
 
-    QmlBindableValue *binding() const;
-    QmlBindableValue *setBinding(QmlBindableValue *) const;
+    QmlBinding *binding() const;
+    QmlBinding *setBinding(QmlBinding *) const;
 
     static QmlMetaProperty createProperty(QObject *, const QString &);
 
diff --git a/src/declarative/qml/qmlparser.cpp b/src/declarative/qml/qmlparser.cpp
index 8eb58c8..9eed3f1 100644
--- a/src/declarative/qml/qmlparser.cpp
+++ b/src/declarative/qml/qmlparser.cpp
@@ -47,7 +47,6 @@
 #include <QSizeF>
 #include <QRectF>
 #include <private/qmlvme_p.h>
-#include <qmlbindablevalue.h>
 #include <private/qfxperf_p.h>
 #include <qml.h>
 #include "private/qmlcomponent_p.h"
diff --git a/src/declarative/qml/qmlvme.cpp b/src/declarative/qml/qmlvme.cpp
index f468cd0..58b8689 100644
--- a/src/declarative/qml/qmlvme.cpp
+++ b/src/declarative/qml/qmlvme.cpp
@@ -57,13 +57,13 @@
 #include <qmlengine.h>
 #include <qmlcontext.h>
 #include <qmlcomponent.h>
-#include <qmlbindablevalue.h>
+#include <qmlbinding.h>
 #include <private/qmlengine_p.h>
 #include <private/qmlcomponent_p.h>
 #include "private/qmlvmemetaobject_p.h"
 #include <QtCore/qdebug.h>
 #include <QtCore/qvarlengtharray.h>
-#include <private/qmlbindablevalue_p.h>
+#include <private/qmlbinding_p.h>
 
 QT_BEGIN_NAMESPACE
 
@@ -137,7 +137,7 @@ QObject *QmlVME::run(QStack<QObject *> &stack, QmlContext *ctxt, QmlCompiledData
     const QList<float> &floatData = comp->floatData;
 
 
-    QmlEnginePrivate::SimpleList<QmlBindableValue> bindValues;
+    QmlEnginePrivate::SimpleList<QmlBinding> bindValues;
     QmlEnginePrivate::SimpleList<QmlParserStatus> parserStatus;
 
     QStack<ListInstance> qliststack;
@@ -153,7 +153,7 @@ QObject *QmlVME::run(QStack<QObject *> &stack, QmlContext *ctxt, QmlCompiledData
         case QmlInstruction::Init:
             {
                 if (instr.init.bindingsSize) 
-                    bindValues = QmlEnginePrivate::SimpleList<QmlBindableValue>(instr.init.bindingsSize);
+                    bindValues = QmlEnginePrivate::SimpleList<QmlBinding>(instr.init.bindingsSize);
                 if (instr.init.parserStatusSize)
                     parserStatus = QmlEnginePrivate::SimpleList<QmlParserStatus>(instr.init.parserStatusSize);
             }
@@ -540,10 +540,10 @@ QObject *QmlVME::run(QStack<QObject *> &stack, QmlContext *ctxt, QmlCompiledData
                 QmlMetaProperty mp(target, instr.assignBinding.property,
                                    (QmlMetaProperty::PropertyCategory)instr.assignBinding.category);
 
-                QmlBindableValue *bind = new QmlBindableValue((void *)datas.at(instr.assignBinding.value).constData(), comp, context, ctxt, 0);
+                QmlBinding *bind = new QmlBinding((void *)datas.at(instr.assignBinding.value).constData(), comp, context, ctxt, 0);
                 bindValues.append(bind);
-                QmlBindableValuePrivate *p = 
-                    static_cast<QmlBindableValuePrivate *>(QObjectPrivate::get(bind));
+                QmlBindingPrivate *p = 
+                    static_cast<QmlBindingPrivate *>(QObjectPrivate::get(bind));
                 p->mePtr = &bindValues.values[bindValues.count - 1];
                 QFx_setParent_noEvent(bind, target);
 
@@ -560,10 +560,10 @@ QObject *QmlVME::run(QStack<QObject *> &stack, QmlContext *ctxt, QmlCompiledData
                 QmlMetaProperty mp(target, instr.assignBinding.property, 
                                    (QmlMetaProperty::PropertyCategory)instr.assignBinding.category);
 
-                QmlBindableValue *bind = new QmlBindableValue(primitives.at(instr.assignBinding.value), context, ctxt);
+                QmlBinding *bind = new QmlBinding(primitives.at(instr.assignBinding.value), context, ctxt);
                 bindValues.append(bind);
-                QmlBindableValuePrivate *p = 
-                    static_cast<QmlBindableValuePrivate *>(QObjectPrivate::get(bind));
+                QmlBindingPrivate *p = 
+                    static_cast<QmlBindingPrivate *>(QObjectPrivate::get(bind));
                 p->mePtr = &bindValues.values[bindValues.count - 1];
                 QFx_setParent_noEvent(bind, target);
 
diff --git a/src/declarative/util/qfxperf.cpp b/src/declarative/util/qfxperf.cpp
index db56b37..f768827 100644
--- a/src/declarative/util/qfxperf.cpp
+++ b/src/declarative/util/qfxperf.cpp
@@ -51,7 +51,7 @@ Q_DEFINE_PERFORMANCE_LOG(QFxPerf, "QFx") {
     Q_DEFINE_PERFORMANCE_METRIC(BindValue, "BindValue execution")
     Q_DEFINE_PERFORMANCE_METRIC(BindValueSSE, "BindValue execution SSE")
     Q_DEFINE_PERFORMANCE_METRIC(BindValueQt, "BindValue execution QtScript")
-    Q_DEFINE_PERFORMANCE_METRIC(BindableValueUpdate, "QmlBindableValue::update")
+    Q_DEFINE_PERFORMANCE_METRIC(BindableValueUpdate, "QmlBinding::update")
     Q_DEFINE_PERFORMANCE_METRIC(PixmapLoad, "Pixmap loading")
     Q_DEFINE_PERFORMANCE_METRIC(FontDatabase, "Font database creation")
     Q_DEFINE_PERFORMANCE_METRIC(QFxPathViewPathCache, "FX Items:    QFxPathView: Path cache")
diff --git a/src/declarative/util/qfxview.cpp b/src/declarative/util/qfxview.cpp
index d83de28..96d9e8e 100644
--- a/src/declarative/util/qfxview.cpp
+++ b/src/declarative/util/qfxview.cpp
@@ -51,7 +51,6 @@
 #include "qboxlayout.h"
 #include "qbasictimer.h"
 
-#include "qmlbindablevalue.h"
 #include "qml.h"
 #include "qfxitem.h"
 #include "private/qperformancelog_p.h"
diff --git a/src/declarative/util/qmlbind.cpp b/src/declarative/util/qmlbind.cpp
index bb342bc..7493b12 100644
--- a/src/declarative/util/qmlbind.cpp
+++ b/src/declarative/util/qmlbind.cpp
@@ -39,7 +39,6 @@
 **
 ****************************************************************************/
 
-#include <qmlbindablevalue.h>
 #include <QtDeclarative/qmlengine.h>
 #include <QtDeclarative/qmlcontext.h>
 #include <private/qobject_p.h>
diff --git a/src/declarative/util/qmllistmodel.cpp b/src/declarative/util/qmllistmodel.cpp
index 61d32f4..a969100 100644
--- a/src/declarative/util/qmllistmodel.cpp
+++ b/src/declarative/util/qmllistmodel.cpp
@@ -46,7 +46,6 @@
 #include <private/qmlparser_p.h>
 #include "qmlopenmetaobject.h"
 #include <qmlcontext.h>
-#include <qmlbindablevalue.h>
 #include "qmllistmodel.h"
 
 Q_DECLARE_METATYPE(QListModelInterface *)
diff --git a/src/declarative/util/qmlscript.cpp b/src/declarative/util/qmlscript.cpp
index 8d03804..7199341 100644
--- a/src/declarative/util/qmlscript.cpp
+++ b/src/declarative/util/qmlscript.cpp
@@ -39,7 +39,6 @@
 **
 ****************************************************************************/
 
-#include <qmlbindablevalue.h>
 #include <QtDeclarative/qmlengine.h>
 #include <QtDeclarative/qmlcontext.h>
 #include <private/qobject_p.h>
diff --git a/src/declarative/util/qmlsetproperties.cpp b/src/declarative/util/qmlsetproperties.cpp
index 6464e33..ffd1e6a 100644
--- a/src/declarative/util/qmlsetproperties.cpp
+++ b/src/declarative/util/qmlsetproperties.cpp
@@ -47,7 +47,7 @@
 #include <private/qmlcustomparser_p.h>
 #include <private/qmlparser_p.h>
 #include <QtDeclarative/qmlexpression.h>
-#include <QtDeclarative/qmlbindablevalue.h>
+#include <QtDeclarative/qmlbinding.h>
 
 QT_BEGIN_NAMESPACE
 
@@ -334,7 +334,7 @@ QmlSetProperties::ActionList QmlSetProperties::actions()
             if (d->isExplicit) {
                 a.toValue = d->expressions.at(ii).second->value();
             } else {
-                a.toBinding = new QmlBindableValue(d->expressions.at(ii).second->expression(), object(), qmlContext(this));
+                a.toBinding = new QmlBinding(d->expressions.at(ii).second->expression(), object(), qmlContext(this));
                 a.toBinding->setTarget(prop);
             }
 
diff --git a/src/declarative/util/qmlstate.cpp b/src/declarative/util/qmlstate.cpp
index e3cff38..73ea9c2 100644
--- a/src/declarative/util/qmlstate.cpp
+++ b/src/declarative/util/qmlstate.cpp
@@ -42,7 +42,7 @@
 #include "qmltransition.h"
 #include "qmlstategroup.h"
 #include "qmlstate_p.h"
-#include "qmlbindablevalue.h"
+#include "qmlbinding.h"
 #include "qmlstateoperations.h"
 #include "qmlanimation.h"
 #include "qmlanimation_p.h"
@@ -175,13 +175,13 @@ bool QmlState::isWhenKnown() const
     This should be set to an expression that evaluates to true when you want the state to
     be applied.
 */
-QmlBindableValue *QmlState::when() const
+QmlBinding *QmlState::when() const
 {
     Q_D(const QmlState);
     return d->when;
 }
 
-void QmlState::setWhen(QmlBindableValue *when) 
+void QmlState::setWhen(QmlBinding *when) 
 {
     Q_D(QmlState);
     d->when = when;
diff --git a/src/declarative/util/qmlstate.h b/src/declarative/util/qmlstate.h
index 7532430..90649a1 100644
--- a/src/declarative/util/qmlstate.h
+++ b/src/declarative/util/qmlstate.h
@@ -54,7 +54,7 @@ QT_BEGIN_NAMESPACE
 QT_MODULE(Declarative)
 
 class ActionEvent;
-class QmlBindableValue;
+class QmlBinding;
 class Action
 {
 public:
@@ -68,8 +68,8 @@ public:
     QVariant fromValue;
     QVariant toValue;
 
-    QmlBindableValue *fromBinding;
-    QmlBindableValue *toBinding;
+    QmlBinding *fromBinding;
+    QmlBinding *toBinding;
     ActionEvent *event;
 
     QObject *specifiedObject;
@@ -111,7 +111,7 @@ class Q_DECLARATIVE_EXPORT QmlState : public QObject
     Q_OBJECT
 
     Q_PROPERTY(QString name READ name WRITE setName)
-    Q_PROPERTY(QmlBindableValue *when READ when WRITE setWhen)
+    Q_PROPERTY(QmlBinding *when READ when WRITE setWhen)
     Q_PROPERTY(QString extends READ extends WRITE setExtends)
     Q_PROPERTY(QmlList<QmlStateOperation *>* operations READ operations)
     Q_CLASSINFO("DefaultProperty", "operations")
@@ -123,11 +123,11 @@ public:
     QString name() const;
     void setName(const QString &);
 
-    /*'when' is a QmlBindableValue to limit state changes oscillation 
+    /*'when' is a QmlBinding to limit state changes oscillation 
      due to the unpredictable order of evaluation of bound expressions*/
     bool isWhenKnown() const;
-    QmlBindableValue *when() const;
-    void setWhen(QmlBindableValue *);
+    QmlBinding *when() const;
+    void setWhen(QmlBinding *);
 
     QString extends() const;
     void setExtends(const QString &);
diff --git a/src/declarative/util/qmlstate_p.h b/src/declarative/util/qmlstate_p.h
index 414ec08..73e2377 100644
--- a/src/declarative/util/qmlstate_p.h
+++ b/src/declarative/util/qmlstate_p.h
@@ -80,7 +80,7 @@ public:
 
     QmlMetaProperty property;
     QVariant value;
-    QmlBindableValue *binding;
+    QmlBinding *binding;
     QObject *specifiedObject;
     QString specifiedProperty;
 };
@@ -96,7 +96,7 @@ public:
     typedef QList<SimpleAction> SimpleActionList;
 
     QString name;
-    QmlBindableValue *when;
+    QmlBinding *when;
     QmlConcreteList<QmlStateOperation *> operations;
 
     QmlTransitionManager transitionManager;
diff --git a/src/declarative/util/qmlstategroup.cpp b/src/declarative/util/qmlstategroup.cpp
index 2b1cf7d..946569c 100644
--- a/src/declarative/util/qmlstategroup.cpp
+++ b/src/declarative/util/qmlstategroup.cpp
@@ -40,9 +40,9 @@
 ****************************************************************************/
 
 #include "private/qobject_p.h"
-#include "qmlbindablevalue.h"
 #include "qmlstategroup.h"
 #include "qmltransition.h"
+#include <QtDeclarative/qmlbinding.h>
 #include <QtCore/qdebug.h>
 
 QT_BEGIN_NAMESPACE
diff --git a/src/declarative/util/qmlstateoperations.cpp b/src/declarative/util/qmlstateoperations.cpp
index 5bb2cb6..8d6abe6 100644
--- a/src/declarative/util/qmlstateoperations.cpp
+++ b/src/declarative/util/qmlstateoperations.cpp
@@ -42,7 +42,7 @@
 #include <private/qobject_p.h>
 #include <qml.h>
 #include <QtDeclarative/qmlcontext.h>
-#include "qmlbindablevalue.h"
+#include <QtDeclarative/qmlexpression.h>
 #include "qmlstateoperations.h"
 #include <QtCore/qdebug.h>
 #include <QtDeclarative/qmlinfo.h>
diff --git a/src/declarative/util/qmltransition.cpp b/src/declarative/util/qmltransition.cpp
index d793c7d..dffa6b5 100644
--- a/src/declarative/util/qmltransition.cpp
+++ b/src/declarative/util/qmltransition.cpp
@@ -42,7 +42,6 @@
 #include "qmlstate.h"
 #include "qmlstategroup.h"
 #include "qmlstate_p.h"
-#include "qmlbindablevalue.h"
 #include "qmlstateoperations.h"
 #include "qmlanimation.h"
 #include "qmlanimation_p.h"
diff --git a/src/declarative/util/qmltransitionmanager.cpp b/src/declarative/util/qmltransitionmanager.cpp
index ba4e160..6f1a8e3 100644
--- a/src/declarative/util/qmltransitionmanager.cpp
+++ b/src/declarative/util/qmltransitionmanager.cpp
@@ -39,7 +39,7 @@
 **
 ****************************************************************************/
 
-#include <QtDeclarative/qmlbindablevalue.h>
+#include <QtDeclarative/qmlbinding.h>
 #include <private/qmltransitionmanager_p.h>
 #include <private/qmlstate_p.h>