Remove virtualdesktops.h include in toplevel.h

toplevel.h is included in many places. Changing virtualdesktops.h may
trigger rebuild of all kwin.

With this change, only cpp files that use virtualdesktops.h will need to
be recompiled.

autotests/integration/effects/desktop_switching_animation_test.cpp

@@ -15,6 +15,7 @@
 #include "effects.h"
 #include "platform.h"
 #include "scene.h"
+#include "virtualdesktops.h"
 #include "wayland_server.h"
 #include "workspace.h"
 

autotests/integration/idle_inhibition_test.cpp

@@ -9,6 +9,7 @@
 #include "kwin_wayland_test.h"
 #include "abstract_client.h"
 #include "platform.h"
+#include "virtualdesktops.h"
 #include "wayland_server.h"
 #include "workspace.h"
 

autotests/integration/xdgshellclient_test.cpp

@@ -17,6 +17,7 @@
 #include "deleted.h"
 #include "platform.h"
 #include "screens.h"
+#include "virtualdesktops.h"
 #include "wayland_server.h"
 #include "workspace.h"
 

src/abstract_client.cpp

@@ -25,6 +25,7 @@
 #endif
 #include "screenedge.h"
 #include "useractions.h"
+#include "virtualdesktops.h"
 #include "workspace.h"
 
 #include "wayland_server.h"
@@ -549,6 +550,11 @@ void AbstractClient::setOnAllDesktops(bool b)
         setDesktop(VirtualDesktopManager::self()->current());
 }
 
+int AbstractClient::desktop() const
+{
+    return m_desktops.isEmpty() ? (int)NET::OnAllDesktops : m_desktops.last()->x11DesktopNumber();
+}
+
 QVector<uint> AbstractClient::x11DesktopIds() const
 {
     const auto desks = desktops();

src/abstract_client.h

@@ -477,9 +477,7 @@ public:
      */
     void setDesktops(QVector<VirtualDesktop *> desktops);
 
-    int desktop() const override {
-        return m_desktops.isEmpty() ? (int)NET::OnAllDesktops : m_desktops.last()->x11DesktopNumber();
-    }
+    int desktop() const override;
     QVector<VirtualDesktop *> desktops() const override {
         return m_desktops;
     }

src/activation.cpp

@@ -23,6 +23,7 @@
 #ifdef KWIN_BUILD_ACTIVITIES
 #include "activities.h"
 #endif
+#include "virtualdesktops.h"
 
 #include <kstartupinfo.h>
 #include <kstringhandler.h>

src/deleted.cpp

@@ -14,6 +14,7 @@
 #include "group.h"
 #include "netinfo.h"
 #include "shadow.h"
+#include "virtualdesktops.h"
 
 #include <QDebug>
 

src/input.cpp

@@ -33,6 +33,7 @@
 #include "screenedge.h"
 #include "screens.h"
 #include "unmanaged.h"
+#include "virtualdesktops.h"
 #include "wayland_server.h"
 #include "workspace.h"
 #include "xwl/xwayland_interface.h"

src/layers.cpp

@@ -80,6 +80,7 @@
 #include "screenedge.h"
 #include "wayland_server.h"
 #include "internal_client.h"
+#include "virtualdesktops.h"
 
 #include <QDebug>
 #include <QQueue>
@@ -502,7 +503,7 @@ static Layer computeLayer(const Toplevel *toplevel)
  * Returns a stacking order based upon \a list that fulfills certain contained.
  */
 QList<Toplevel *> Workspace::constrainedStackingOrder()
-{ 
+{
     // Sort the windows based on their layers while preserving their relative order in the
     // unconstrained stacking order.
     std::array<QList<Toplevel *>, NumLayers> windows;

src/placement.cpp

@@ -18,6 +18,7 @@
 #include "options.h"
 #include "rules.h"
 #include "screens.h"
+#include "virtualdesktops.h"
 #endif
 
 #include <QTextStream>

src/plugins/krunner-integration/windowsrunnerinterface.cpp

@@ -11,6 +11,7 @@
 #include "windowsrunnerinterface.h"
 
 #include "abstract_client.h"
+#include "virtualdesktops.h"
 #include "workspace.h"
 
 #include "krunner1adaptor.h"

src/scripting/thumbnailitem.cpp

@@ -13,6 +13,7 @@
 #include "scene.h"
 #include "screens.h"
 #include "scripting_logging.h"
+#include "virtualdesktops.h"
 #include "workspace.h"
 
 #include <kwingltexture.h>

src/sm.cpp

@@ -15,6 +15,7 @@
 #include <pwd.h>
 #include <kconfig.h>
 
+#include "virtualdesktops.h"
 #include "workspace.h"
 #include "x11client.h"
 #include <QDebug>

src/toplevel.cpp

@@ -21,6 +21,7 @@
 #include "shadow.h"
 #include "shadowitem.h"
 #include "surfaceitem_x11.h"
+#include "virtualdesktops.h"
 #include "windowitem.h"
 #include "workspace.h"
 
@@ -690,5 +691,19 @@ QMargins Toplevel::frameMargins() const
     return QMargins();
 }
 
+bool Toplevel::isOnDesktop(int d) const
+{
+    return (kwinApp()->operationMode() == Application::OperationModeWaylandOnly ||
+            kwinApp()->operationMode() == Application::OperationModeXwayland
+            ? desktops().contains(VirtualDesktopManager::self()->desktopForX11Id(d))
+            : desktop() == d
+           ) || isOnAllDesktops();
+}
+
+bool Toplevel::isOnCurrentDesktop() const
+{
+    return isOnDesktop(VirtualDesktopManager::self()->current());
+}
+
 } // namespace
 

src/toplevel.h

@@ -12,7 +12,6 @@
 
 // kwin
 #include "utils.h"
-#include "virtualdesktops.h"
 #include "xcbutils.h"
 // KDE
 #include <NETWM>
@@ -43,6 +42,7 @@ class Deleted;
 class EffectWindowImpl;
 class Shadow;
 class SurfaceItem;
+class VirtualDesktop;
 class WindowItem;
 
 /**
@@ -940,25 +940,11 @@ inline bool Toplevel::isOnAllActivities() const
     return activities().isEmpty();
 }
 
-inline bool Toplevel::isOnDesktop(int d) const
-{
-    return (kwinApp()->operationMode() == Application::OperationModeWaylandOnly ||
-            kwinApp()->operationMode() == Application::OperationModeXwayland
-            ? desktops().contains(VirtualDesktopManager::self()->desktopForX11Id(d))
-            : desktop() == d
-           ) || isOnAllDesktops();
-}
-
 inline bool Toplevel::isOnActivity(const QString &activity) const
 {
     return activities().isEmpty() || activities().contains(activity);
 }
 
-inline bool Toplevel::isOnCurrentDesktop() const
-{
-    return isOnDesktop(VirtualDesktopManager::self()->current());
-}
-
 inline QByteArray Toplevel::resourceName() const
 {
     return resource_name; // it is always lowercase

src/wayland_server.cpp

@@ -24,6 +24,7 @@
 #include "unmanaged.h"
 #include "waylandoutput.h"
 #include "waylandoutputdevice.h"
+#include "virtualdesktops.h"
 
 // Client
 #include <KWayland/Client/connection_thread.h>

src/x11client.cpp

@@ -23,11 +23,12 @@
 #include "geometrytip.h"
 #include "group.h"
 #include "netinfo.h"
+#include "screenedge.h"
 #include "screens.h"
 #include "shadow.h"
 #include "surfaceitem_x11.h"
+#include "virtualdesktops.h"
 #include "workspace.h"
-#include "screenedge.h"
 #include "decorations/decorationbridge.h"
 #include "decorations/decoratedclient.h"
 #include <KDecoration2/Decoration>

src/xdgshellclient.cpp

@@ -16,6 +16,7 @@
 #include "screenedge.h"
 #include "screens.h"
 #include "subsurfacemonitor.h"
+#include "virtualdesktops.h"
 #include "wayland_server.h"
 #include "workspace.h"
 #if KWIN_BUILD_ACTIVITIES