diff --git a/animator.cpp b/animator.cpp index b9ec3b144..4612e7a80 100644 --- a/animator.cpp +++ b/animator.cpp @@ -36,19 +36,19 @@ Animator::~Animator() { } -int Animator::animationFramesPerSecond(Plasma::Phase::Animation animation) const +int Animator::animationFPS(Plasma::Phase::Animation animation) const { Q_UNUSED(animation) return 0; } -int Animator::movementAnimationFramesPerSecond(Plasma::Phase::Movement movement) const +int Animator::movementAnimationFPS(Plasma::Phase::Movement movement) const { Q_UNUSED(movement) return 20; } -int Animator::elementAnimationFramesPerSecond(Plasma::Phase::ElementAnimation animation) const +int Animator::elementAnimationFPS(Plasma::Phase::ElementAnimation animation) const { Q_UNUSED(animation) return 0; diff --git a/animator.h b/animator.h index 1d58f4a75..f343f6b9b 100644 --- a/animator.h +++ b/animator.h @@ -44,9 +44,9 @@ public: ~Animator(); // Parameter definitions - virtual int animationFramesPerSecond(Plasma::Phase::Animation) const; - virtual int movementAnimationFramesPerSecond(Plasma::Phase::Movement) const; - virtual int elementAnimationFramesPerSecond(Plasma::Phase::ElementAnimation) const; + virtual int animationFPS(Plasma::Phase::Animation) const; + virtual int movementAnimationFPS(Plasma::Phase::Movement) const; + virtual int elementAnimationFPS(Plasma::Phase::ElementAnimation) const; virtual int animationDuration(Plasma::Phase::Animation) const; virtual int movementAnimationDuration(Plasma::Phase::Movement) const; virtual int elementAnimationDuration(Plasma::Phase::ElementAnimation) const; diff --git a/phase.cpp b/phase.cpp index 159db7b41..37e4d8077 100644 --- a/phase.cpp +++ b/phase.cpp @@ -263,7 +263,7 @@ void Phase::animateItem(QGraphicsItem* item, Animation animation) d->animatedItems.erase(it); } - int frames = d->animator->animationFramesPerSecond(animation); + int frames = d->animator->animationFPS(animation); if (frames < 1) { // evidently this animator doesn't have an implementation @@ -307,7 +307,7 @@ void Phase::moveItem(QGraphicsItem* item, Movement movement, const QPoint &desti d->movingItems.erase(it); } - int frames = d->animator->movementAnimationFramesPerSecond(movement); + int frames = d->animator->movementAnimationFPS(movement); if (frames <= 1) { // evidently this animator doesn't have an implementation // for this Animation @@ -397,7 +397,7 @@ int Phase::animateElement(QGraphicsItem *item, ElementAnimation animation) state->curve = d->animator->elementAnimationCurve(animation); state->animation = animation; //TODO: variance in times based on the value of animation - state->frames = d->animator->elementAnimationFramesPerSecond(animation) / 5; + state->frames = d->animator->elementAnimationFPS(animation) / 5; state->currentFrame = 0; state->interval = d->animator->elementAnimationDuration(animation) / state->frames; state->interval = (state->interval / MIN_TICK_RATE) * MIN_TICK_RATE;