effects: Drop legacy EffectsHandler::desktopChanged overloads

autotests/integration/effects/scripts/effectsHandler.js

@@ -11,6 +11,6 @@ effects.windowMinimized.connect(function(window) {
 effects.windowUnminimized.connect(function(window) {
     sendTestResponse("windowUnminimized - " + window.caption);
 });
-effects['desktopChanged(int,int)'].connect(function(old, current) {
+effects.desktopChanged.connect(function(old, current) {
     sendTestResponse("desktopChanged - " + old + " " + current);
 });

autotests/integration/effects/scripts/fullScreenEffectTest.js

@@ -1,4 +1,4 @@
-effects['desktopChanged(int,int)'].connect(function(old, current) {
+effects.desktopChanged.connect(function(old, current) {
     var stackingOrder = effects.stackingOrder;
     for (var i=0; i<stackingOrder.length; i++) {
         var w = stackingOrder[i];

autotests/integration/effects/scripts/fullScreenEffectTestGlobal.js

@@ -1,4 +1,4 @@
-effects['desktopChanged(int,int)'].connect(function(old, current) {
+effects.desktopChanged.connect(function(old, current) {
     var stackingOrder = effects.stackingOrder;
     for (var i=0; i<stackingOrder.length; i++) {
         var w = stackingOrder[i];

autotests/integration/effects/scripts/fullScreenEffectTestMulti.js

@@ -1,4 +1,4 @@
-effects['desktopChanged(int,int)'].connect(function(old, current) {
+effects.desktopChanged.connect(function(old, current) {
     var stackingOrder = effects.stackingOrder;
     for (var i=0; i<stackingOrder.length; i++) {
         var w = stackingOrder[i];

src/effects.cpp

@@ -150,8 +150,6 @@ EffectsHandlerImpl::EffectsHandlerImpl(Compositor *compositor, WorkspaceScene *s
         const int newDesktop = VirtualDesktopManager::self()->current();
         if (old != 0 && newDesktop != old) {
             Q_EMIT desktopChanged(old, newDesktop, window ? window->effectWindow() : nullptr);
-            // TODO: remove in 4.10
-            Q_EMIT desktopChanged(old, newDesktop);
         }
     });
     connect(ws, &Workspace::currentDesktopChanging, this, [this](uint currentDesktop, QPointF offset, KWin::Window *window) {

src/effects/dialogparent/package/contents/code/main.js

@@ -137,7 +137,7 @@ var dialogParentEffect = {
         effects.windowMinimized.connect(dialogParentEffect.cancelAnimationInstant);
         effects.windowUnminimized.connect(dialogParentEffect.restartAnimation);
         effects.windowModalityChanged.connect(dialogParentEffect.modalDialogChanged)
-        effects['desktopChanged(int,int)'].connect(dialogParentEffect.desktopChanged);
+        effects.desktopChanged.connect(dialogParentEffect.desktopChanged);
         effects.desktopPresenceChanged.connect(dialogParentEffect.cancelAnimationInstant);
         effects.desktopPresenceChanged.connect(dialogParentEffect.restartAnimation);
         effects.activeFullScreenEffectChanged.connect(

src/effects/dimscreen/package/contents/code/main.js

@@ -220,7 +220,7 @@ var dimScreenEffect = {
         effects.windowUnminimized.connect(dimScreenEffect.restartAnimation);
         effects.activeFullScreenEffectChanged.connect(
             dimScreenEffect.slotActiveFullScreenEffectChanged);
-        effects['desktopChanged(int,int)'].connect(dimScreenEffect.slotDesktopChanged);
+        effects.desktopChanged.connect(dimScreenEffect.slotDesktopChanged);
     }
 };
 

src/effects/fadedesktop/package/contents/code/main.js

@@ -117,8 +117,7 @@ var fadeDesktopEffect = {
         effect.configChanged.connect(fadeDesktopEffect.loadConfig);
         effect.isActiveFullScreenEffectChanged.connect(
             fadeDesktopEffect.slotIsActiveFullScreenEffectChanged);
-        effects['desktopChanged(int,int,KWin::EffectWindow*)'].connect(
-            fadeDesktopEffect.slotDesktopChanged);
+        effects.desktopChanged.connect(fadeDesktopEffect.slotDesktopChanged);
     }
 };
 

src/effects/frozenapp/package/contents/code/main.js

@@ -105,7 +105,7 @@ var frozenAppEffect = {
         effects.windowMinimized.connect(frozenAppEffect.cancelAnimation);
         effects.windowUnminimized.connect(frozenAppEffect.restartAnimation);
         effects.windowUnresponsiveChanged.connect(frozenAppEffect.unresponsiveChanged);
-        effects['desktopChanged(int,int)'].connect(frozenAppEffect.desktopChanged);
+        effects.desktopChanged.connect(frozenAppEffect.desktopChanged);
         effects.desktopPresenceChanged.connect(frozenAppEffect.cancelAnimation);
         effects.desktopPresenceChanged.connect(frozenAppEffect.restartAnimation);
 

src/effects/slide/slide.cpp

@@ -25,9 +25,9 @@ SlideEffect::SlideEffect()
     initConfig<SlideConfig>();
     reconfigure(ReconfigureAll);
 
-    connect(effects, QOverload<int, int, EffectWindow *>::of(&EffectsHandler::desktopChanged),
+    connect(effects, &EffectsHandler::desktopChanged,
             this, &SlideEffect::desktopChanged);
-    connect(effects, QOverload<uint, QPointF, EffectWindow *>::of(&EffectsHandler::desktopChanging),
+    connect(effects, &EffectsHandler::desktopChanging,
             this, &SlideEffect::desktopChanging);
     connect(effects, QOverload<>::of(&EffectsHandler::desktopChangingCancelled),
             this, &SlideEffect::desktopChangingCancelled);

src/effects/slidingpopups/slidingpopups.cpp

@@ -62,7 +62,7 @@ SlidingPopupsEffect::SlidingPopupsEffect()
     connect(effects, &EffectsHandler::xcbConnectionChanged, this, [this]() {
         m_atom = effects->announceSupportProperty(QByteArrayLiteral("_KDE_SLIDE"), this);
     });
-    connect(effects, qOverload<int, int, EffectWindow *>(&EffectsHandler::desktopChanged),
+    connect(effects, &EffectsHandler::desktopChanged,
             this, &SlidingPopupsEffect::stopAnimations);
     connect(effects, &EffectsHandler::activeFullScreenEffectChanged,
             this, &SlidingPopupsEffect::stopAnimations);

src/effects/translucency/package/contents/code/main.js

@@ -216,7 +216,7 @@ var translucencyEffect = {
         effects.windowStartUserMovedResized.connect(translucencyEffect.moveResize.start);
         effects.windowFinishUserMovedResized.connect(translucencyEffect.moveResize.finish);
         effects.windowActivated.connect(translucencyEffect.inactive.activated);
-        effects['desktopChanged(int,int)'].connect(translucencyEffect.desktopChanged);
+        effects.desktopChanged.connect(translucencyEffect.desktopChanged);
         translucencyEffect.loadConfig();
     }
 };

src/libkwineffects/kwineffects.cpp

@@ -667,7 +667,6 @@ EffectsHandler::EffectsHandler(CompositingType type)
         return;
     }
     KWin::effects = this;
-    connect(this, QOverload<int, int>::of(&EffectsHandler::desktopChanged), this, &EffectsHandler::desktopChangedLegacy);
 }
 
 EffectsHandler::~EffectsHandler()

src/libkwineffects/kwineffects.h

@@ -1473,15 +1473,6 @@ Q_SIGNALS:
     void desktopChanging(uint currentDesktop, QPointF offset, KWin::EffectWindow *with);
     void desktopChangingCancelled();
 
-    /**
-     * @since 4.7
-     * @deprecated
-     */
-    void KWIN_DEPRECATED desktopChanged(int oldDesktop, int newDesktop);
-    /**
-     * @internal
-     */
-    void desktopChangedLegacy(int oldDesktop, int newDesktop);
     /**
      * Signal emitted when a window moved to another desktop
      * NOTICE that this does NOT imply that the desktop has changed

src/scripting/scriptedeffect.cpp

@@ -245,13 +245,6 @@ bool ScriptedEffect::init(const QString &effectName, const QString &pathToScript
     QQmlEngine::setObjectOwnership(this, QQmlEngine::CppOwnership);
     globalObject.setProperty(QStringLiteral("effect"), selfObject);
 
-    // desktopChanged is overloaded, which is problematic. Old code exposed the signal also
-    // with parameters. QJSEngine does not so we have to fake it.
-    effectsObject.setProperty(QStringLiteral("desktopChanged(int,int)"),
-                              effectsObject.property(QStringLiteral("desktopChangedLegacy")));
-    effectsObject.setProperty(QStringLiteral("desktopChanged(int,int,KWin::EffectWindow*)"),
-                              effectsObject.property(QStringLiteral("desktopChanged")));
-
     globalObject.setProperty(QStringLiteral("Effect"),
                              m_engine->newQMetaObject(&ScriptedEffect::staticMetaObject));
     globalObject.setProperty(QStringLiteral("KWin"),