From e63783df9f12d916ff45c24b882785b9cedafc18 Mon Sep 17 00:00:00 2001
From: Vlad Zahorodnii <vlad.zahorodnii@kde.org>
Date: Fri, 22 Oct 2021 10:41:45 +0300
Subject: [PATCH] Drop legacy virtual desktop api

The plasma window management protocol is intended to be used by
plasmashell. Since kwin and plasmashell have the same release cycle, we
know that the legacy virtual desktop stuff is unused so it can be
dropped to simplify code.
---
 src/wayland/CMakeLists.txt                    |  5 ----
 .../plasmawindowmanagement_interface.cpp      | 26 +++----------------
 .../plasmawindowmanagement_interface.h        | 20 --------------
 3 files changed, 3 insertions(+), 48 deletions(-)

diff --git a/src/wayland/CMakeLists.txt b/src/wayland/CMakeLists.txt
index 934b6d5a69..6b280d0e97 100644
--- a/src/wayland/CMakeLists.txt
+++ b/src/wayland/CMakeLists.txt
@@ -293,12 +293,7 @@ ecm_generate_export_header(KWaylandServer
         KWaylandServer/kwaylandserver_export.h
     GROUP_BASE_NAME KF
     VERSION ${PROJECT_VERSION}
-    DEPRECATED_BASE_VERSION 0
-    DEPRECATION_VERSIONS 5.5 5.28 5.50 5.52 5.69
 )
-# TODO: add support for EXCLUDE_DEPRECATED_BEFORE_AND_AT to all KWayland libs
-# needs fixing of undeprecated API being still implemented using own deprecated API
-
 
 target_include_directories(KWaylandServer INTERFACE "$<INSTALL_INTERFACE:${KDE_INSTALL_INCLUDEDIR}>")
 
diff --git a/src/wayland/plasmawindowmanagement_interface.cpp b/src/wayland/plasmawindowmanagement_interface.cpp
index b4e34e3a64..6587951cb8 100644
--- a/src/wayland/plasmawindowmanagement_interface.cpp
+++ b/src/wayland/plasmawindowmanagement_interface.cpp
@@ -62,7 +62,6 @@ public:
     void setPid(quint32 pid);
     void setThemedIconName(const QString &iconName);
     void setIcon(const QIcon &icon);
-    void setVirtualDesktop(quint32 desktop);
     void unmap();
     void setState(org_kde_plasma_window_management_state flag, bool set);
     void setParentWindow(PlasmaWindowInterface *parent);
@@ -88,7 +87,6 @@ public:
     QString m_appServiceName;
     QString m_appObjectPath;
     QIcon m_icon;
-    quint32 m_virtualDesktop = 0;
     quint32 m_state = 0;
     QString uuid;
 
@@ -339,8 +337,6 @@ void PlasmaWindowInterfacePrivate::org_kde_plasma_window_destroy(Resource *resou
 
 void PlasmaWindowInterfacePrivate::org_kde_plasma_window_bind_resource(Resource *resource)
 {
-    send_virtual_desktop_changed(resource->handle, m_virtualDesktop);
-
     for (const auto &desk : plasmaVirtualDesktops) {
         send_virtual_desktop_entered(resource->handle, desk);
     }
@@ -497,19 +493,6 @@ void PlasmaWindowInterfacePrivate::setTitle(const QString &title)
     }
 }
 
-void PlasmaWindowInterfacePrivate::setVirtualDesktop(quint32 desktop)
-{
-    if (m_virtualDesktop == desktop) {
-        return;
-    }
-    m_virtualDesktop = desktop;
-    const auto clientResources = resourceMap();
-
-    for (auto resource : clientResources) {
-        send_virtual_desktop_changed(resource->handle, m_virtualDesktop);
-    }
-}
-
 void PlasmaWindowInterfacePrivate::unmap()
 {
     if (unmapped) {
@@ -638,7 +621,9 @@ void PlasmaWindowInterfacePrivate::org_kde_plasma_window_request_resize(Resource
 void PlasmaWindowInterfacePrivate::org_kde_plasma_window_set_virtual_desktop(Resource *resource, uint32_t number)
 {
     Q_UNUSED(resource)
-    Q_EMIT q->virtualDesktopRequested(number);
+    Q_UNUSED(number)
+
+    // This method is intentionally left blank.
 }
 
 void PlasmaWindowInterfacePrivate::org_kde_plasma_window_set_state(Resource *resource, uint32_t flags, uint32_t state)
@@ -765,11 +750,6 @@ void PlasmaWindowInterface::setTitle(const QString &title)
     d->setTitle(title);
 }
 
-void PlasmaWindowInterface::setVirtualDesktop(quint32 desktop)
-{
-    d->setVirtualDesktop(desktop);
-}
-
 void PlasmaWindowInterface::unmap()
 {
     d->unmap();
diff --git a/src/wayland/plasmawindowmanagement_interface.h b/src/wayland/plasmawindowmanagement_interface.h
index 7b21aa6101..d6fa19e3a3 100644
--- a/src/wayland/plasmawindowmanagement_interface.h
+++ b/src/wayland/plasmawindowmanagement_interface.h
@@ -111,16 +111,6 @@ public:
     void setTitle(const QString &title);
     void setAppId(const QString &appId);
     void setPid(quint32 pid);
-#if KWAYLANDSERVER_ENABLE_DEPRECATED_SINCE(5, 52)
-    /**
-     * @deprecated Since 5.52, use addPlasmaVirtualDesktop and removePlasmaVirtualDesktop
-     */
-    KWAYLANDSERVER_DEPRECATED_VERSION(5,
-                                      52,
-                                      "Use PlasmaWindowManagementInterface::addPlasmaVirtualDesktop(const QString&) and "
-                                      "PlasmaWindowManagementInterface::removePlasmaVirtualDesktop(const QString&)")
-    void setVirtualDesktop(quint32 desktop);
-#endif
     void setActive(bool set);
     void setMinimized(bool set);
     void setMaximized(bool set);
@@ -239,16 +229,6 @@ Q_SIGNALS:
     void closeRequested();
     void moveRequested();
     void resizeRequested();
-#if KWAYLANDSERVER_ENABLE_DEPRECATED_SINCE(5, 52)
-    /**
-     * @deprecated Since 5.52, use enterPlasmaVirtualDesktopRequested and leavePlasmaVirtualDesktopRequested instead
-     */
-    KWAYLANDSERVER_DEPRECATED_VERSION(5,
-                                      52,
-                                      "Use PlasmaWindowManagementInterface::enterPlasmaVirtualDesktopRequested(const QString&) and "
-                                      "PlasmaWindowManagementInterface::leavePlasmaVirtualDesktopRequested(const QString&)")
-    void virtualDesktopRequested(quint32 desktop);
-#endif
     void activeRequested(bool set);
     void minimizedRequested(bool set);
     void maximizedRequested(bool set);