From cbd94fc43425e9b70d0f9c1b0d200ed3adc025ea Mon Sep 17 00:00:00 2001 From: "Aaron J. Seigo" Date: Mon, 26 Apr 2010 21:00:21 +0000 Subject: [PATCH] buld svn path=/trunk/KDE/kdelibs/; revision=1119246 --- animations/animationscriptengine.cpp | 2 +- animations/animationscriptengine_p.h | 4 ++-- animations/javascriptanimation.cpp | 10 +++++----- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/animations/animationscriptengine.cpp b/animations/animationscriptengine.cpp index d1f64ee81..fe6faf5b2 100644 --- a/animations/animationscriptengine.cpp +++ b/animations/animationscriptengine.cpp @@ -22,7 +22,7 @@ * - cleanup debug messages */ -#include "engine.h" +#include "animationscriptengine_p.h" namespace Plasma { diff --git a/animations/animationscriptengine_p.h b/animations/animationscriptengine_p.h index 48fb761b0..b9d1844e1 100644 --- a/animations/animationscriptengine_p.h +++ b/animations/animationscriptengine_p.h @@ -33,8 +33,8 @@ namespace Plasma namespace AnimationScriptEngine { -static QScriptEngine* globalEngine(); -static QScriptValue animation(const QString &anim); +QScriptEngine* globalEngine(); +QScriptValue animation(const QString &anim); } diff --git a/animations/javascriptanimation.cpp b/animations/javascriptanimation.cpp index c9459b9ad..e81def715 100644 --- a/animations/javascriptanimation.cpp +++ b/animations/javascriptanimation.cpp @@ -20,7 +20,7 @@ #include "javascriptanimation_p.h" #include -#include "animationscriptengine.h" +#include "animationscriptengine_p.h" /* TODO: * - support passing more parameters to the js animation object * - support more properties: angle, direction, etc @@ -52,9 +52,9 @@ void JavascriptAnimation::updateState(QAbstractAnimation::State newState, QAbstr //Define the class and create an instance if (!m_instance) { m_instance = new QScriptValue; - *m_instance = AnimationEngine::animation(m_name).construct(QScriptValueList() - << engine->newQObject(targetWidget()) - << duration()); + QScriptValueList args; + args << engine->newQObject(targetWidget()) << duration(); + *m_instance = AnimationScriptEngine::animation(m_name).construct(args); qDebug( )<< "trying for" << m_name << m_instance->isFunction(); } @@ -98,4 +98,4 @@ void JavascriptAnimation::updateCurrentTime(int currentTime) } //namespace Plasma -#include <../jsanim_p.moc> +#include