summaryrefslogtreecommitdiffstats
path: root/src/declarative/util/qdeclarativestate_p_p.h
diff options
context:
space:
mode:
authorAaron Kennedy <aaron.kennedy@nokia.com>2010-02-25 10:01:25 (GMT)
committerAaron Kennedy <aaron.kennedy@nokia.com>2010-02-25 10:02:54 (GMT)
commitf5bb807d6938fbd39ea1f99ed45c817d538e4287 (patch)
treeb3e1705e4703c5d7da5ffca3010d062644a62ae3 /src/declarative/util/qdeclarativestate_p_p.h
parent0e4dd15a90c119cea4ada833d88b51e336f53ee7 (diff)
downloadQt-f5bb807d6938fbd39ea1f99ed45c817d538e4287.zip
Qt-f5bb807d6938fbd39ea1f99ed45c817d538e4287.tar.gz
Qt-f5bb807d6938fbd39ea1f99ed45c817d538e4287.tar.bz2
Rename QDeclarativeMetaProperty -> QDeclarativeProperty
There's nothing meta about our properties.
Diffstat (limited to 'src/declarative/util/qdeclarativestate_p_p.h')
-rw-r--r--src/declarative/util/qdeclarativestate_p_p.h8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/declarative/util/qdeclarativestate_p_p.h b/src/declarative/util/qdeclarativestate_p_p.h
index 6b32f04..6f52219 100644
--- a/src/declarative/util/qdeclarativestate_p_p.h
+++ b/src/declarative/util/qdeclarativestate_p_p.h
@@ -58,7 +58,7 @@
#include "qdeclarativeanimation_p_p.h"
#include "qdeclarativetransitionmanager_p_p.h"
-#include <qdeclarativemetaproperty_p.h>
+#include <qdeclarativeproperty_p.h>
#include <qdeclarativeguard_p.h>
#include <private/qobject_p.h>
@@ -77,7 +77,7 @@ public:
event = a.event;
if (state == StartState) {
value = a.fromValue;
- binding = QDeclarativeMetaPropertyPrivate::binding(property);
+ binding = QDeclarativePropertyPrivate::binding(property);
reverseEvent = true;
} else {
value = a.toValue;
@@ -86,7 +86,7 @@ public:
}
}
- QDeclarativeMetaProperty property;
+ QDeclarativeProperty property;
QVariant value;
QDeclarativeAbstractBinding *binding;
QObject *specifiedObject;
@@ -139,7 +139,7 @@ public:
QDeclarativeTransitionManager transitionManager;
SimpleActionList revertList;
- QList<QDeclarativeMetaProperty> reverting;
+ QList<QDeclarativeProperty> reverting;
QString extends;
mutable bool inState;
QDeclarativeStateGroup *group;