From kde-commits  Tue Jul 31 21:37:19 2018
From: David Edmundson <null () kde ! org>
Date: Tue, 31 Jul 2018 21:37:19 +0000
To: kde-commits
Subject: [kwin/scripting2] scripting: qint64->int
Message-Id: <E1fkcKV-0001yG-5y () code ! kde ! org>
X-MARC-Message: https://marc.info/?l=kde-commits&m=153307435611165

Git commit ab781e7936c04e2afb7e1f4b1fde79a3b40556a7 by David Edmundson.
Committed on 31/07/2018 at 21:36.
Pushed by davidedmundson into branch 'scripting2'.

qint64->int

M  +10   -8    scripting/scriptedeffect.cpp
M  +7    -7    scripting/scriptedeffect.h

https://commits.kde.org/kwin/ab781e7936c04e2afb7e1f4b1fde79a3b40556a7

diff --git a/scripting/scriptedeffect.cpp b/scripting/scriptedeffect.cpp
index 6e0803f14..6204e03fd 100644
--- a/scripting/scriptedeffect.cpp
+++ b/scripting/scriptedeffect.cpp
@@ -270,7 +270,7 @@ void ScriptedEffect::animationEnded(KWin::EffectWindow =
*w, Attribute a, uint met
     emit animationEnded(w, 0);
 }
 =

-quint64 ScriptedEffect::animate(KWin::EffectWindow* w, KWin::AnimationEffe=
ct::Attribute a, int ms, const QJSValue &to, const QJSValue &from, uint met=
aData, QEasingCurve::Type curve, int delay)
+int ScriptedEffect::animate(KWin::EffectWindow* w, KWin::AnimationEffect::=
Attribute a, int ms, const QJSValue &to, const QJSValue &from, uint metaDat=
a, QEasingCurve::Type curve, int delay)
 {
     QEasingCurve qec;
     if (curve < QEasingCurve::Custom)
@@ -280,7 +280,7 @@ quint64 ScriptedEffect::animate(KWin::EffectWindow* w, =
KWin::AnimationEffect::At
     return AnimationEffect::animate(w, a, metaData, ms, fpx2FromScriptValu=
e(to), qec, delay, fpx2FromScriptValue(from));
 }
 =

-quint64 ScriptedEffect::set(KWin::EffectWindow* w, KWin::AnimationEffect::=
Attribute a, int ms, const QJSValue &to, const QJSValue &from, uint metaDat=
a, QEasingCurve::Type curve, int delay)
+int ScriptedEffect::set(KWin::EffectWindow* w, KWin::AnimationEffect::Attr=
ibute a, int ms, const QJSValue &to, const QJSValue &from, uint metaData, Q=
EasingCurve::Type curve, int delay)
 {
     QEasingCurve qec;
     if (curve < QEasingCurve::Custom)
@@ -290,15 +290,17 @@ quint64 ScriptedEffect::set(KWin::EffectWindow* w, KW=
in::AnimationEffect::Attrib
     return AnimationEffect::set(w, a, metaData, ms, fpx2FromScriptValue(to=
), qec, delay, fpx2FromScriptValue(from));
 }
 =

-bool ScriptedEffect::retarget(quint64 animationId, const QJSValue &newTarg=
et, int newRemainingTime)
+bool ScriptedEffect::retarget(int animationId, const QJSValue &newTarget, =
int newRemainingTime)
 {
+    qDebug() << "retarget " << animationId << fpx2FromScriptValue(newTarge=
t).toString();
     return AnimationEffect::retarget(animationId, fpx2FromScriptValue(newT=
arget), newRemainingTime);
 }
 =

-bool ScriptedEffect::retarget(QList<quint64> animationIds, const QJSValue =
&newTarget, int newRemainingTime)
+bool ScriptedEffect::retarget(QList<int> animationIds, const QJSValue &new=
Target, int newRemainingTime)
 {
+    qDebug() << "list retarget" << animationIds.count();
     bool ok =3D true;
-    for(quint64 animationId: animationIds) {
+    for(int animationId: animationIds) {
         ok |=3D retarget(animationId, newTarget, newRemainingTime);
     }
     return true;
@@ -430,15 +432,15 @@ QJSValue ScriptedEffect::startAnimation(const QJSValu=
e &object, bool settingPers
     return array;
 }
 =

-bool ScriptedEffect::cancel(quint64 animationId)
+bool ScriptedEffect::cancel(int animationId)
 {
     return AnimationEffect::cancel(animationId);
 }
 =

-bool ScriptedEffect::cancel(QList<quint64> animationIds)
+bool ScriptedEffect::cancel(QList<int> animationIds)
 {
     bool ok =3D true;
-    for(quint64 animationId: animationIds) {
+    for(int animationId: animationIds) {
         ok |=3D cancel(animationId);
     }
     return true;
diff --git a/scripting/scriptedeffect.h b/scripting/scriptedeffect.h
index 7bfc869b7..2d1b679b9 100644
--- a/scripting/scriptedeffect.h
+++ b/scripting/scriptedeffect.h
@@ -110,17 +110,17 @@ public:
         return m_screenEdgeCallbacks;
     }
 public Q_SLOTS:
-    quint64 animate(KWin::EffectWindow *w, Attribute a, int ms, const QJSV=
alue &to, const QJSValue &from =3D QJSValue(), uint metaData =3D 0, QEasing=
Curve::Type curve =3D QEasingCurve::Linear, int delay =3D 0);
+    int animate(KWin::EffectWindow *w, Attribute a, int ms, const QJSValue=
 &to, const QJSValue &from =3D QJSValue(), uint metaData =3D 0, QEasingCurv=
e::Type curve =3D QEasingCurve::Linear, int delay =3D 0);
     QJSValue animate(const QJSValue &object);
 =

-    quint64 set(KWin::EffectWindow *w, Attribute a, int ms, const QJSValue=
 &to, const QJSValue &from =3D QJSValue(), uint metaData =3D 0, QEasingCurv=
e::Type curve =3D QEasingCurve::Linear, int delay =3D 0);
+    int set(KWin::EffectWindow *w, Attribute a, int ms, const QJSValue &to=
, const QJSValue &from =3D QJSValue(), uint metaData =3D 0, QEasingCurve::T=
ype curve =3D QEasingCurve::Linear, int delay =3D 0);
     QJSValue set(const QJSValue &object);
 =

-    bool retarget(quint64 animationId, const QJSValue &newTarget, int newR=
emainingTime =3D -1);
-    bool retarget(QList<quint64> animationIds, const QJSValue &newTarget, =
int newRemainingTime =3D -1);
+    bool retarget(int animationId, const QJSValue &newTarget, int newRemai=
ningTime =3D -1);
+    bool retarget(QList<int> animationIds, const QJSValue &newTarget, int =
newRemainingTime =3D -1);
 =

-    bool cancel(quint64 animationId);
-    bool cancel(QList<quint64> animationIds);
+    bool cancel(int animationId);
+    bool cancel(QList<int> animationIds);
 =

     bool borderActivated(ElectricBorder border) override;
 =

@@ -129,7 +129,7 @@ Q_SIGNALS:
      * Signal emitted whenever the effect's config changed.
      **/
     void configChanged();
-    void animationEnded(KWin::EffectWindow *w, quint64 animationId);
+    void animationEnded(KWin::EffectWindow *w, int animationId);
 =

 protected:
     ScriptedEffect();