diff options
author | Gabriel de Dietrich <gabriel.dedietrich@digia.com> | 2013-10-03 17:04:40 +0200 |
---|---|---|
committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-10-03 17:48:34 +0200 |
commit | 4ce2c0310c55c78b783b79c1f3fa2e0aa40fe6a2 (patch) | |
tree | 87377c239ce939b9ccb11680e326ca90ca9d44c0 /src/quick/items/qquickitemanimation.cpp | |
parent | df0347a9ed8be8e1d3d771c3d2abcfebec9ed87d (diff) |
Remane private QQuickAction into QQuickStateAction
This avoid symbol conflicts when statically linking with Qt Quick
Controls, that has its own QQuickAction class and which may become
public some day. (QQuickPropertyAction might be a more apt name, but
it's already taken).
Change-Id: Ia9514d63d38295603a89d8ec5a88815a651380f7
Reviewed-by: Frederik Gladhorn <frederik.gladhorn@digia.com>
Reviewed-by: Jens Bache-Wiig <jens.bache-wiig@digia.com>
Diffstat (limited to 'src/quick/items/qquickitemanimation.cpp')
-rw-r--r-- | src/quick/items/qquickitemanimation.cpp | 30 |
1 files changed, 15 insertions, 15 deletions
diff --git a/src/quick/items/qquickitemanimation.cpp b/src/quick/items/qquickitemanimation.cpp index ae1233463e..534ad0e2f4 100644 --- a/src/quick/items/qquickitemanimation.cpp +++ b/src/quick/items/qquickitemanimation.cpp @@ -221,7 +221,7 @@ QAbstractAnimationJob* QQuickParentAnimation::transition(QQuickStateActions &act virtual void doAction() { for (int ii = 0; ii < actions.count(); ++ii) { - const QQuickAction &action = actions.at(ii); + const QQuickStateAction &action = actions.at(ii); if (reverse) action.event->reverse(); else @@ -236,7 +236,7 @@ QAbstractAnimationJob* QQuickParentAnimation::transition(QQuickStateActions &act bool hasExplicit = false; if (d->target && d->newParent) { data->reverse = false; - QQuickAction myAction; + QQuickStateAction myAction; QQuickParentChange *pc = new QQuickParentChange; pc->setObject(d->target); pc->setParent(d->newParent); @@ -246,7 +246,7 @@ QAbstractAnimationJob* QQuickParentAnimation::transition(QQuickStateActions &act hasExplicit = true; if (d->via) { viaData->reverse = false; - QQuickAction myVAction; + QQuickStateAction myVAction; QQuickParentChange *vpc = new QQuickParentChange; vpc->setObject(d->target); vpc->setParent(d->via); @@ -260,12 +260,12 @@ QAbstractAnimationJob* QQuickParentAnimation::transition(QQuickStateActions &act if (!hasExplicit) for (int i = 0; i < actions.size(); ++i) { - QQuickAction &action = actions[i]; - if (action.event && action.event->type() == QQuickActionEvent::ParentChange + QQuickStateAction &action = actions[i]; + if (action.event && action.event->type() == QQuickStateActionEvent::ParentChange && (!d->target || static_cast<QQuickParentChange*>(action.event)->object() == d->target)) { QQuickParentChange *pc = static_cast<QQuickParentChange*>(action.event); - QQuickAction myAction = action; + QQuickStateAction myAction = action; data->reverse = action.reverseEvent; //### this logic differs from PropertyAnimation @@ -285,18 +285,18 @@ QAbstractAnimationJob* QQuickParentAnimation::transition(QQuickStateActions &act if (d->via) { viaData->reverse = false; - QQuickAction myAction; + QQuickStateAction myAction; QQuickParentChange *vpc = new QQuickParentChange; vpc->setObject(pc->object()); vpc->setParent(d->via); myAction.event = vpc; viaData->pc << vpc; viaData->actions << myAction; - QQuickAction dummyAction; - QQuickAction &xAction = pc->xIsSet() && i < actions.size()-1 ? actions[++i] : dummyAction; - QQuickAction &yAction = pc->yIsSet() && i < actions.size()-1 ? actions[++i] : dummyAction; - QQuickAction &sAction = pc->scaleIsSet() && i < actions.size()-1 ? actions[++i] : dummyAction; - QQuickAction &rAction = pc->rotationIsSet() && i < actions.size()-1 ? actions[++i] : dummyAction; + QQuickStateAction dummyAction; + QQuickStateAction &xAction = pc->xIsSet() && i < actions.size()-1 ? actions[++i] : dummyAction; + QQuickStateAction &yAction = pc->yIsSet() && i < actions.size()-1 ? actions[++i] : dummyAction; + QQuickStateAction &sAction = pc->scaleIsSet() && i < actions.size()-1 ? actions[++i] : dummyAction; + QQuickStateAction &rAction = pc->rotationIsSet() && i < actions.size()-1 ? actions[++i] : dummyAction; QQuickItem *target = pc->object(); QQuickItem *targetParent = action.reverseEvent ? pc->originalParent() : pc->parent(); @@ -535,8 +535,8 @@ QAbstractAnimationJob* QQuickAnchorAnimation::transition(QQuickStateActions &act data->fromDefined = false; for (int ii = 0; ii < actions.count(); ++ii) { - QQuickAction &action = actions[ii]; - if (action.event && action.event->type() == QQuickActionEvent::AnchorChanges + QQuickStateAction &action = actions[ii]; + if (action.event && action.event->type() == QQuickStateActionEvent::AnchorChanges && (d->targets.isEmpty() || d->targets.contains(static_cast<QQuickAnchorChanges*>(action.event)->object()))) { data->actions << static_cast<QQuickAnchorChanges*>(action.event)->additionalActions(); } @@ -868,7 +868,7 @@ QAbstractAnimationJob* QQuickPathAnimation::transition(QQuickStateActions &actio int origModifiedSize = modified.count(); for (int i = 0; i < actions.count(); ++i) { - QQuickAction &action = actions[i]; + QQuickStateAction &action = actions[i]; if (action.event) continue; if (action.specifiedObject == target && action.property.name() == QLatin1String("x")) { |