diff --git a/animator.cpp b/animator.cpp index 7469e6672..939d604fb 100644 --- a/animator.cpp +++ b/animator.cpp @@ -54,7 +54,7 @@ int Animator::animationFramesPerSecond(Plasma::Phase::ElementAnimation animation return 0; } -int Animator::duration(Plasma::Phase::Animation) const +int Animator::animationDuration(Plasma::Phase::Animation) const { return 200; } diff --git a/animator.h b/animator.h index 171b974b7..5a69f492e 100644 --- a/animator.h +++ b/animator.h @@ -47,7 +47,7 @@ public: virtual int animationFramesPerSecond(Plasma::Phase::Animation) const; virtual int animationFramesPerSecond(Plasma::Phase::Movement) const; virtual int animationFramesPerSecond(Plasma::Phase::ElementAnimation) const; - virtual int duration(Plasma::Phase::Animation) const; + virtual int animationDuration(Plasma::Phase::Animation) const; virtual int duration(Plasma::Phase::Movement) const; virtual int duration(Plasma::Phase::ElementAnimation) const; virtual Phase::CurveShape curve(Plasma::Phase::Animation) const; diff --git a/phase.cpp b/phase.cpp index faf85d19a..37031583a 100644 --- a/phase.cpp +++ b/phase.cpp @@ -278,7 +278,7 @@ void Phase::animateItem(QGraphicsItem* item, Animation animation) //TODO: variance in times based on the value of animation state->frames = frames / 3; state->currentFrame = 0; - state->interval = d->animator->duration(animation) / state->frames; + state->interval = d->animator->animationDuration(animation) / state->frames; state->interval = (state->interval / MIN_TICK_RATE) * MIN_TICK_RATE; state->currentInterval = state->interval; state->qobj = dynamic_cast(item);