Rename QmlBindableValue to QmlBinding

1 files changed, 10 insertions, 10 deletions

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);