From c5748b371937a876998178fae888c35314965ff5 Mon Sep 17 00:00:00 2001
From: "Aaron J. Seigo" <aseigo@kde.org>
Date: Thu, 29 Apr 2010 23:40:30 +0000
Subject: [PATCH] make the JS anims an easing curve anim

svn path=/trunk/KDE/kdelibs/; revision=1120782
---
 animations/javascriptanimation.cpp | 4 ++--
 animations/javascriptanimation_p.h | 8 ++++----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/animations/javascriptanimation.cpp b/animations/javascriptanimation.cpp
index e9d69a647..c21b7e3bb 100644
--- a/animations/javascriptanimation.cpp
+++ b/animations/javascriptanimation.cpp
@@ -34,7 +34,7 @@ namespace Plasma
 {
 
 JavascriptAnimation::JavascriptAnimation(const QString &name, QObject *parent)
-    : Animation(parent),
+    : EasingAnimation(parent),
 #ifdef PLASMA_JSANIM_FPS
       m_fps(0),
 #endif
@@ -98,7 +98,7 @@ void JavascriptAnimation::updateState(QAbstractAnimation::State newState, QAbstr
     }
 }
 
-void JavascriptAnimation::updateCurrentTime(int currentTime)
+void JavascriptAnimation::updateEffectiveTime(int currentTime)
 {
     if (m_method.isFunction()) {
 #ifdef PLASMA_JSANIM_FPS
diff --git a/animations/javascriptanimation_p.h b/animations/javascriptanimation_p.h
index 0795a6fd3..fbb6c3695 100644
--- a/animations/javascriptanimation_p.h
+++ b/animations/javascriptanimation_p.h
@@ -22,9 +22,9 @@
 
 #include <QScriptValue>
 
-#include "animation.h"
-#include "plasma_export.h"
 #include "animator.h"
+#include "easinganimation_p.h"
+#include "plasma_export.h"
 
 class QString;
 class QScriptEngine;
@@ -34,7 +34,7 @@ class QScriptEngine;
 namespace Plasma
 {
 
-class JavascriptAnimation: public Animation
+class JavascriptAnimation: public EasingAnimation
 {
     Q_OBJECT
 
@@ -49,7 +49,7 @@ public:
 
 protected:
     void updateState(QAbstractAnimation::State newState, QAbstractAnimation::State oldState);
-    void updateCurrentTime(int currentTime);
+    void updateEffectiveTime(int currentTime);
 
 private:
 #ifdef PLASMA_JSANIM_FPS