From ecb58c987f360719cbd3a17966972ea2b679f4b5 Mon Sep 17 00:00:00 2001
From: Vlad Zahorodnii <vlad.zahorodnii@kde.org>
Date: Fri, 17 Feb 2023 16:49:28 +0200
Subject: [PATCH] scripting: Drop Window.x11DesktopIds property

---
 src/deleted.cpp | 13 -------------
 src/deleted.h   |  2 --
 src/effects.cpp | 12 +++++++++++-
 src/window.cpp  | 14 --------------
 src/window.h    | 10 ----------
 5 files changed, 11 insertions(+), 40 deletions(-)

diff --git a/src/deleted.cpp b/src/deleted.cpp
index b3f318efbb..6c0486218a 100644
--- a/src/deleted.cpp
+++ b/src/deleted.cpp
@@ -185,17 +185,4 @@ QString Deleted::windowRole() const
     return m_windowRole;
 }
 
-QVector<uint> Deleted::x11DesktopIds() const
-{
-    const auto desks = desktops();
-    QVector<uint> x11Ids;
-    x11Ids.reserve(desks.count());
-    std::transform(desks.constBegin(), desks.constEnd(),
-                   std::back_inserter(x11Ids),
-                   [](const VirtualDesktop *vd) {
-                       return vd->x11DesktopNumber();
-                   });
-    return x11Ids;
-}
-
 } // namespace
diff --git a/src/deleted.h b/src/deleted.h
index 9329a2f680..aceea4a766 100644
--- a/src/deleted.h
+++ b/src/deleted.h
@@ -116,8 +116,6 @@ public:
         return m_wasPopupWindow;
     }
 
-    QVector<uint> x11DesktopIds() const;
-
     /**
      * Whether this Deleted represents the outline.
      */
diff --git a/src/effects.cpp b/src/effects.cpp
index f66874feed..40c44aea83 100644
--- a/src/effects.cpp
+++ b/src/effects.cpp
@@ -2112,7 +2112,6 @@ MANAGED_HELPER(bool, isFullScreen, isFullScreen, false)
 MANAGED_HELPER(bool, keepAbove, keepAbove, false)
 MANAGED_HELPER(bool, keepBelow, keepBelow, false)
 MANAGED_HELPER(QString, caption, caption, QString());
-MANAGED_HELPER(QVector<uint>, desktops, x11DesktopIds, QVector<uint>());
 MANAGED_HELPER(bool, isMovable, isMovable, false)
 MANAGED_HELPER(bool, isMovableAcrossScreens, isMovableAcrossScreens, false)
 MANAGED_HELPER(bool, isUserMove, isInteractiveMove, false)
@@ -2127,6 +2126,17 @@ MANAGED_HELPER(bool, isUnresponsive, unresponsive, false)
 
 #undef MANAGED_HELPER
 
+QVector<uint> EffectWindowImpl::desktops() const
+{
+    const auto desks = m_window->desktops();
+    QVector<uint> ids;
+    ids.reserve(desks.count());
+    std::transform(desks.constBegin(), desks.constEnd(), std::back_inserter(ids), [](const VirtualDesktop *vd) {
+        return vd->x11DesktopNumber();
+    });
+    return ids;
+}
+
 QString EffectWindowImpl::windowClass() const
 {
     return m_window->resourceName() + QLatin1Char(' ') + m_window->resourceClass();
diff --git a/src/window.cpp b/src/window.cpp
index 35a0b2c03f..7485f88a93 100644
--- a/src/window.cpp
+++ b/src/window.cpp
@@ -1116,7 +1116,6 @@ void Window::setDesktops(QVector<VirtualDesktop *> desktops)
     if (wasOnCurrentDesktop != isOnCurrentDesktop()) {
         Q_EMIT desktopPresenceChanged(this, was_desk);
     }
-    Q_EMIT x11DesktopIdsChanged();
 }
 
 void Window::doSetDesktop()
@@ -1176,19 +1175,6 @@ QVector<VirtualDesktop *> Window::desktops() const
     return m_desktops;
 }
 
-QVector<uint> Window::x11DesktopIds() const
-{
-    const auto desks = desktops();
-    QVector<uint> x11Ids;
-    x11Ids.reserve(desks.count());
-    std::transform(desks.constBegin(), desks.constEnd(),
-                   std::back_inserter(x11Ids),
-                   [](const VirtualDesktop *vd) {
-                       return vd->x11DesktopNumber();
-                   });
-    return x11Ids;
-}
-
 QStringList Window::desktopIds() const
 {
     const auto desks = desktops();
diff --git a/src/window.h b/src/window.h
index 96eafac767..f9a96849ac 100644
--- a/src/window.h
+++ b/src/window.h
@@ -312,7 +312,6 @@ class KWIN_EXPORT Window : public QObject
 
     /**
      * The desktop this Window is on. If the Window is on all desktops the property has value -1.
-     * This is a legacy property, use x11DesktopIds instead
      *
      * @deprecated Use the desktops property instead.
      */
@@ -333,13 +332,6 @@ class KWIN_EXPORT Window : public QObject
      */
     Q_PROPERTY(QStringList activities READ activities WRITE setOnActivities NOTIFY activitiesChanged)
 
-    /**
-     * The x11 ids for all desktops this client is in. On X11 this list will always have a length of 1
-     *
-     * @deprecated prefer using apis that use VirtualDesktop objects
-     */
-    Q_PROPERTY(QVector<uint> x11DesktopIds READ x11DesktopIds NOTIFY x11DesktopIdsChanged)
-
     /**
      * Indicates that the window should not be included on a taskbar.
      */
@@ -987,7 +979,6 @@ public:
      */
     void setDesktops(QVector<VirtualDesktop *> desktops);
 
-    QVector<uint> x11DesktopIds() const;
     QStringList desktopIds() const;
 
     void setMinimized(bool set);
@@ -1513,7 +1504,6 @@ Q_SIGNALS:
     void desktopPresenceChanged(KWin::Window *, int); // to be forwarded by Workspace
     void desktopChanged();
     void activitiesChanged(KWin::Window *window);
-    void x11DesktopIdsChanged();
     void minimizedChanged();
     void clientMinimized(KWin::Window *window, bool animate);
     void clientUnminimized(KWin::Window *window, bool animate);