summaryrefslogtreecommitdiffstats
path: root/src/declarative/util/qdeclarativeanimation.cpp
diff options
context:
space:
mode:
authorAaron Kennedy <aaron.kennedy@nokia.com>2010-02-25 06:29:26 (GMT)
committerAaron Kennedy <aaron.kennedy@nokia.com>2010-02-25 06:31:37 (GMT)
commitc8823023db4a280f3d12c983451a05f8da3780dd (patch)
tree8b7925f3076df489123365f7116535b505ef2438 /src/declarative/util/qdeclarativeanimation.cpp
parent6721e5270b33e5e88c68ec426d482b9b633d8fd6 (diff)
downloadQt-c8823023db4a280f3d12c983451a05f8da3780dd.zip
Qt-c8823023db4a280f3d12c983451a05f8da3780dd.tar.gz
Qt-c8823023db4a280f3d12c983451a05f8da3780dd.tar.bz2
Make more private QDeclarativeMetaProperty methods private
Diffstat (limited to 'src/declarative/util/qdeclarativeanimation.cpp')
-rw-r--r--src/declarative/util/qdeclarativeanimation.cpp7
1 files changed, 4 insertions, 3 deletions
diff --git a/src/declarative/util/qdeclarativeanimation.cpp b/src/declarative/util/qdeclarativeanimation.cpp
index 9e777a0..a327ccb 100644
--- a/src/declarative/util/qdeclarativeanimation.cpp
+++ b/src/declarative/util/qdeclarativeanimation.cpp
@@ -52,6 +52,7 @@
#include <qdeclarativestringconverters_p.h>
#include <qdeclarativeglobal_p.h>
#include <qdeclarativemetatype_p.h>
+#include <qdeclarativemetaproperty_p.h>
#include <qvariant.h>
#include <qcolor.h>
@@ -924,7 +925,7 @@ void QDeclarativePropertyAction::transition(QDeclarativeStateActions &actions,
{
for (int ii = 0; ii < actions.count(); ++ii) {
const QDeclarativeAction &action = actions.at(ii);
- action.property.write(action.toValue, QDeclarativeMetaProperty::BypassInterceptor | QDeclarativeMetaProperty::DontRemoveBinding);
+ QDeclarativeMetaPropertyPrivate::write(action.property, action.toValue, QDeclarativeMetaPropertyPrivate::BypassInterceptor | QDeclarativeMetaPropertyPrivate::DontRemoveBinding);
}
}
};
@@ -2230,7 +2231,7 @@ struct PropertyUpdater : public QDeclarativeTimeLineValue
QDeclarativeAction &action = actions[ii];
if (v == 1.)
- action.property.write(action.toValue, QDeclarativeMetaProperty::BypassInterceptor | QDeclarativeMetaProperty::DontRemoveBinding);
+ QDeclarativeMetaPropertyPrivate::write(action.property, action.toValue, QDeclarativeMetaPropertyPrivate::BypassInterceptor | QDeclarativeMetaPropertyPrivate::DontRemoveBinding);
else {
if (!fromSourced && !fromDefined) {
action.fromValue = action.property.read();
@@ -2245,7 +2246,7 @@ struct PropertyUpdater : public QDeclarativeTimeLineValue
}
}
if (interpolator)
- action.property.write(interpolator(action.fromValue.constData(), action.toValue.constData(), v), QDeclarativeMetaProperty::BypassInterceptor | QDeclarativeMetaProperty::DontRemoveBinding);
+ QDeclarativeMetaPropertyPrivate::write(action.property, interpolator(action.fromValue.constData(), action.toValue.constData(), v), QDeclarativeMetaPropertyPrivate::BypassInterceptor | QDeclarativeMetaPropertyPrivate::DontRemoveBinding);
}
if (deleted)
return;