summaryrefslogtreecommitdiffstats
path: root/src/declarative/util
diff options
context:
space:
mode:
Diffstat (limited to 'src/declarative/util')
-rw-r--r--src/declarative/util/qfxperf.cpp2
-rw-r--r--src/declarative/util/qfxview.cpp1
-rw-r--r--src/declarative/util/qmlbind.cpp1
-rw-r--r--src/declarative/util/qmllistmodel.cpp1
-rw-r--r--src/declarative/util/qmlscript.cpp1
-rw-r--r--src/declarative/util/qmlsetproperties.cpp4
-rw-r--r--src/declarative/util/qmlstate.cpp6
-rw-r--r--src/declarative/util/qmlstate.h14
-rw-r--r--src/declarative/util/qmlstate_p.h4
-rw-r--r--src/declarative/util/qmlstategroup.cpp2
-rw-r--r--src/declarative/util/qmlstateoperations.cpp2
-rw-r--r--src/declarative/util/qmltransition.cpp1
-rw-r--r--src/declarative/util/qmltransitionmanager.cpp2
13 files changed, 18 insertions, 23 deletions
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 8edd871..0c167c0 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>
generated by cgit v0.12 at 2025-01-23 17:45:21 (GMT)