diff options
| author | Thierry Bastian <thierry.bastian@nokia.com> | 2009-04-20 12:44:29 (GMT) |
|---|---|---|
| committer | Thierry Bastian <thierry.bastian@nokia.com> | 2009-04-20 13:28:38 (GMT) |
| commit | 2e679706b28ade66cb55ace1e9bfae42dd5044ea (patch) | |
| tree | 010add57eb4d9d3e60d0fd98c672c7fc94355c2b /examples/animation | |
| parent | 5b985f0a33946e77b133ee761613858b1057bcdd (diff) | |
| download | Qt-2e679706b28ade66cb55ace1e9bfae42dd5044ea.zip Qt-2e679706b28ade66cb55ace1e9bfae42dd5044ea.tar.gz Qt-2e679706b28ade66cb55ace1e9bfae42dd5044ea.tar.bz2 | |
iterationCount becomes loopCount again
Diffstat (limited to 'examples/animation')
| -rw-r--r-- | examples/animation/easing/window.cpp | 2 | ||||
| -rw-r--r-- | examples/animation/research/memberfunctions/qvalueanimation.cpp | 4 | ||||
| -rw-r--r-- | examples/animation/sub-attaq/custompropertyanimation.cpp | 5 |
3 files changed, 5 insertions, 6 deletions
diff --git a/examples/animation/easing/window.cpp b/examples/animation/easing/window.cpp index c6ea360..bb45770 100644 --- a/examples/animation/easing/window.cpp +++ b/examples/animation/easing/window.cpp @@ -88,7 +88,7 @@ void Window::startAnimation() m_anim->setStartValue(QPointF(0, 0)); m_anim->setEndValue(QPointF(100, 100)); m_anim->setDuration(2000); - m_anim->setIterationCount(-1); // forever + m_anim->setLoopCount(-1); // forever m_anim->start(); } diff --git a/examples/animation/research/memberfunctions/qvalueanimation.cpp b/examples/animation/research/memberfunctions/qvalueanimation.cpp index 2fe9be9..58652ba 100644 --- a/examples/animation/research/memberfunctions/qvalueanimation.cpp +++ b/examples/animation/research/memberfunctions/qvalueanimation.cpp @@ -21,8 +21,8 @@ void QValueAnimationPrivate::initDefaultStartValue() { Q_Q(QValueAnimation); if (animProp && !q->startValue().isValid() - && ((currentTime == 0 && (currentIteration || currentIteration == 0)) - || (currentTime == duration && currentIteration == (iterationCount - 1)))) { + && (currentTime == 0 + || (currentTime == duration && currentLoop == (loopCount - 1)))) { setDefaultStartValue(animProp->read()); } } diff --git a/examples/animation/sub-attaq/custompropertyanimation.cpp b/examples/animation/sub-attaq/custompropertyanimation.cpp index 45997af..1637ed2 100644 --- a/examples/animation/sub-attaq/custompropertyanimation.cpp +++ b/examples/animation/sub-attaq/custompropertyanimation.cpp @@ -55,9 +55,8 @@ void CustomPropertyAnimationPrivate::initDefaultStartValue() QVariant def = animProp->read(); if (def.isValid()) convertValues(def.userType()); - if (animProp && !defaultStartValue.isValid() - && ((currentTime == 0 && (currentIteration || currentIteration == 0)) - || (currentTime == duration && currentIteration == (iterationCount - 1)))) { + if (animProp && !defaultStartValue.isValid() && currentTime == 0 + || (currentTime == duration && currentLoop == (loopCount - 1))) { setDefaultStartValue(def); } } |