From ca35755ac07cc1a19a4e4f25bc0fbf9264cfd542 Mon Sep 17 00:00:00 2001 From: Adenilson Cavalcanti Da Silva Date: Wed, 9 Dec 2009 16:34:43 +0000 Subject: [PATCH] Following the same function convention call in the remaining classes. TODO: check which classes it makes sense to actually allow the user to set the easing curve. svn path=/trunk/KDE/kdelibs/; revision=1060689 --- animations/geometry.cpp | 4 ++-- animations/pulser.cpp | 4 ++-- animations/rotation.cpp | 4 ++-- animations/rotationstacked.cpp | 4 ++-- animations/zoom.cpp | 4 ++-- 5 files changed, 10 insertions(+), 10 deletions(-) diff --git a/animations/geometry.cpp b/animations/geometry.cpp index 19ae991fe..61b2bc6d6 100644 --- a/animations/geometry.cpp +++ b/animations/geometry.cpp @@ -78,8 +78,8 @@ void GeometryAnimation::updateCurrentTime(int currentTime) { QGraphicsWidget *w = widgetToAnimate(); if (w) { - qreal delta = easingCurve().valueForProgress( - currentTime / qreal(duration())); + qreal delta = Animation::easingCurve().valueForProgress( + currentTime / qreal(duration())); QRectF newGeo = m_startGeometry; newGeo.adjust((-m_startGeometry.x() + m_targetGeometry.x()) * delta, diff --git a/animations/pulser.cpp b/animations/pulser.cpp index 099c55898..f48a0d7df 100644 --- a/animations/pulser.cpp +++ b/animations/pulser.cpp @@ -98,8 +98,8 @@ void PulseAnimation::updateCurrentTime(int currentTime) { QGraphicsWidget *w = under; if (w) { - qreal delta = easingCurve().valueForProgress( - currentTime / qreal(duration())); + qreal delta = Animation::easingCurve().valueForProgress( + currentTime / qreal(duration())); delta = (1 - endScale) * delta; w->setScale(1 - delta); } diff --git a/animations/rotation.cpp b/animations/rotation.cpp index dd50f58c3..d0dc18639 100644 --- a/animations/rotation.cpp +++ b/animations/rotation.cpp @@ -162,8 +162,8 @@ void RotationAnimation::updateCurrentTime(int currentTime) { QGraphicsWidget *w = widgetToAnimate(); if (w) { - qreal delta = easingCurve().valueForProgress( - currentTime / qreal(duration())); + qreal delta = Animation::easingCurve().valueForProgress( + currentTime / qreal(duration())); delta = angle() * delta; m_rotation->setAngle(delta); } diff --git a/animations/rotationstacked.cpp b/animations/rotationstacked.cpp index 987dd9d98..03873e367 100644 --- a/animations/rotationstacked.cpp +++ b/animations/rotationstacked.cpp @@ -150,13 +150,13 @@ void RotationStackedAnimation::updateCurrentTime(int currentTime) if(w) { qreal delta; if (currentTime <= duration()/2) { - delta = easingCurve().valueForProgress( + delta = Animation::easingCurve().valueForProgress( (currentTime * 2) / qreal(duration())); sLayout->setCurrentWidgetIndex(0); delta = frontEndAngle * delta; frontRotation->setAngle(delta); } else { - delta = easingCurve().valueForProgress( + delta = Animation::easingCurve().valueForProgress( (currentTime/2) / qreal(duration())); sLayout->setCurrentWidgetIndex(1); delta = backEndAngle * delta; diff --git a/animations/zoom.cpp b/animations/zoom.cpp index 142924311..1dca255a5 100644 --- a/animations/zoom.cpp +++ b/animations/zoom.cpp @@ -64,8 +64,8 @@ void ZoomAnimation::updateCurrentTime(int currentTime) { QGraphicsWidget *w = widgetToAnimate(); if (w) { - qreal delta = easingCurve().valueForProgress( - currentTime / qreal(duration())); + qreal delta = Animation::easingCurve().valueForProgress( + currentTime / qreal(duration())); delta = (1 - m_zoom) * delta; w->setScale( 1 - delta); }