Move scene related bits into src/scene/ directory

We've got quite a few scene related files, move them in a directory to
group related code together.

autotests/integration/buffer_size_change_test.cpp

@@ -9,7 +9,7 @@
 #include "generic_scene_opengl_test.h"
 
 #include "composite.h"
-#include "scene.h"
+#include "scene/scene.h"
 #include "wayland_server.h"
 #include "window.h"
 

autotests/integration/effects/maximize_animation_test.cpp

@@ -13,7 +13,7 @@
 #include "core/outputbackend.h"
 #include "effectloader.h"
 #include "effects.h"
-#include "scene.h"
+#include "scene/scene.h"
 #include "wayland_server.h"
 #include "window.h"
 #include "workspace.h"

autotests/integration/generic_scene_opengl_test.cpp

@@ -12,7 +12,7 @@
 #include "core/renderbackend.h"
 #include "cursor.h"
 #include "effectloader.h"
-#include "scene.h"
+#include "scene/scene.h"
 #include "wayland_server.h"
 #include "window.h"
 

autotests/integration/xwaylandserver_crash_test.cpp

@@ -10,7 +10,7 @@
 #include "core/output.h"
 #include "core/outputbackend.h"
 #include "main.h"
-#include "scene.h"
+#include "scene/scene.h"
 #include "unmanaged.h"
 #include "wayland_server.h"
 #include "workspace.h"

autotests/integration/xwaylandserver_restart_test.cpp

@@ -9,7 +9,7 @@
 #include "composite.h"
 #include "core/outputbackend.h"
 #include "main.h"
-#include "scene.h"
+#include "scene/scene.h"
 #include "wayland_server.h"
 #include "workspace.h"
 #include "x11window.h"

src/CMakeLists.txt

@@ -62,7 +62,6 @@ target_sources(kwin PRIVATE
     cursorsource.cpp
     dbusinterface.cpp
     debug_console.cpp
-    decorationitem.cpp
     decorations/decoratedclient.cpp
     decorations/decorationbridge.cpp
     decorations/decorationpalette.cpp
@@ -70,7 +69,6 @@ target_sources(kwin PRIVATE
     decorations/settings.cpp
     deleted.cpp
     dmabuftexture.cpp
-    dndiconitem.cpp
     dpmsinputeventfilter.cpp
     effectloader.cpp
     effects.cpp
@@ -90,7 +88,6 @@ target_sources(kwin PRIVATE
     inputpanelv1integration.cpp
     inputpanelv1window.cpp
     internalwindow.cpp
-    item.cpp
     keyboard_input.cpp
     keyboard_layout.cpp
     keyboard_layout_switching.cpp
@@ -120,7 +117,18 @@ target_sources(kwin PRIVATE
     rootinfo_filter.cpp
     rulebooksettings.cpp
     rules.cpp
-    scene.cpp
+    scene/decorationitem.cpp
+    scene/dndiconitem.cpp
+    scene/item.cpp
+    scene/scene.cpp
+    scene/scene_opengl.cpp
+    scene/scene_qpainter.cpp
+    scene/shadowitem.cpp
+    scene/surfaceitem.cpp
+    scene/surfaceitem_internal.cpp
+    scene/surfaceitem_wayland.cpp
+    scene/surfaceitem_x11.cpp
+    scene/windowitem.cpp
     screenedge.cpp
     scripting/dbuscall.cpp
     scripting/desktopbackgrounditem.cpp
@@ -136,12 +144,7 @@ target_sources(kwin PRIVATE
     scripting/windowthumbnailitem.cpp
     scripting/workspace_wrapper.cpp
     shadow.cpp
-    shadowitem.cpp
     sm.cpp
-    surfaceitem.cpp
-    surfaceitem_internal.cpp
-    surfaceitem_wayland.cpp
-    surfaceitem_x11.cpp
     syncalarmx11filter.cpp
     tablet_input.cpp
     tabletmodemanager.cpp
@@ -161,7 +164,6 @@ target_sources(kwin PRIVATE
     waylandwindow.cpp
     window.cpp
     window_property_notify_x11_filter.cpp
-    windowitem.cpp
     workspace.cpp
     x11eventfilter.cpp
     x11syncmanager.cpp
@@ -260,7 +262,6 @@ target_sources(kwin PRIVATE
 )
 
 add_subdirectory(backends)
-add_subdirectory(scenes)
 add_subdirectory(utils)
 add_subdirectory(wayland)
 add_subdirectory(xwayland)

src/Messages.sh

@@ -1,3 +1,3 @@
 #! /usr/bin/env bash
 $EXTRACTRC *.kcfg *.ui >> rc.cpp
-$XGETTEXT *.h *.cpp plugins/nightcolor/*.cpp helpers/killer/*.cpp scenes/opengl/*.cpp tabbox/*.cpp scripting/*.cpp plugins/krunner-integration/*.cpp -o $podir/kwin.pot
+$XGETTEXT *.h *.cpp plugins/nightcolor/*.cpp helpers/killer/*.cpp scene/*.cpp tabbox/*.cpp scripting/*.cpp plugins/krunner-integration/*.cpp -o $podir/kwin.pot

src/backends/drm/drm_egl_backend.cpp

@@ -29,7 +29,7 @@
 #include "kwineglutils_p.h"
 #include "linux_dmabuf.h"
 #include "options.h"
-#include "surfaceitem_wayland.h"
+#include "scene/surfaceitem_wayland.h"
 #include "wayland/clientconnection.h"
 #include "wayland/linuxdmabufv1clientbuffer.h"
 #include "wayland/surface_interface.h"

src/backends/drm/drm_egl_layer.cpp

@@ -16,7 +16,7 @@
 #include "drm_output.h"
 #include "drm_pipeline.h"
 #include "egl_dmabuf.h"
-#include "surfaceitem_wayland.h"
+#include "scene/surfaceitem_wayland.h"
 #include "wayland/linuxdmabufv1clientbuffer.h"
 #include "wayland/surface_interface.h"
 

src/backends/drm/drm_egl_layer_surface.cpp

@@ -20,7 +20,7 @@
 #include "drm_shadow_buffer.h"
 #include "egl_dmabuf.h"
 #include "kwineglutils_p.h"
-#include "surfaceitem_wayland.h"
+#include "scene/surfaceitem_wayland.h"
 #include "wayland/linuxdmabufv1clientbuffer.h"
 #include "wayland/surface_interface.h"
 

src/backends/drm/drm_virtual_egl_layer.cpp

@@ -20,7 +20,7 @@
 #include "drm_virtual_output.h"
 #include "egl_dmabuf.h"
 #include "kwineglutils_p.h"
-#include "surfaceitem_wayland.h"
+#include "scene/surfaceitem_wayland.h"
 #include "wayland/linuxdmabufv1clientbuffer.h"
 #include "wayland/surface_interface.h"
 

src/backends/x11/standalone/x11_standalone_egl_backend.cpp

@@ -11,9 +11,9 @@
 #include "core/renderloop_p.h"
 #include "kwinglplatform.h"
 #include "options.h"
-#include "scene.h"
+#include "scene/scene.h"
+#include "scene/surfaceitem_x11.h"
 #include "softwarevsyncmonitor.h"
-#include "surfaceitem_x11.h"
 #include "workspace.h"
 #include "x11_standalone_backend.h"
 #include "x11_standalone_logging.h"

src/backends/x11/standalone/x11_standalone_glx_backend.cpp

@@ -28,8 +28,8 @@
 #include "core/overlaywindow.h"
 #include "core/renderloop_p.h"
 #include "options.h"
-#include "scene.h"
+#include "scene/scene.h"
-#include "surfaceitem_x11.h"
+#include "scene/surfaceitem_x11.h"
 #include "utils/xcbutils.h"
 #include "workspace.h"
 // kwin libs

src/backends/x11/standalone/x11_standalone_overlaywindow.cpp

@@ -11,7 +11,7 @@
 
 #include "composite.h"
 #include "kwinglobals.h"
-#include "scene.h"
+#include "scene/scene.h"
 #include "utils/common.h"
 #include "utils/xcbutils.h"
 #include "workspace.h"

src/composite.cpp

@@ -26,11 +26,10 @@
 #include "internalwindow.h"
 #include "openglbackend.h"
 #include "qpainterbackend.h"
-#include "scene.h"
+#include "scene/scene_opengl.h"
-#include "scenes/opengl/scene_opengl.h"
+#include "scene/scene_qpainter.h"
-#include "scenes/qpainter/scene_qpainter.h"
+#include "scene/surfaceitem_x11.h"
 #include "shadow.h"
-#include "surfaceitem_x11.h"
 #include "unmanaged.h"
 #include "useractions.h"
 #include "utils/common.h"

src/core/renderloop.cpp

@@ -6,8 +6,8 @@
 
 #include "renderloop.h"
 #include "renderloop_p.h"
-#include "surfaceitem.h"
+#include "scene/surfaceitem.h"
-#include "surfaceitem_wayland.h"
+#include "scene/surfaceitem_wayland.h"
 #include "utils/common.h"
 #include "wayland/surface_interface.h"
 

src/cursor.cpp

@@ -15,7 +15,7 @@
 #include "input.h"
 #include "keyboard_input.h"
 #include "main.h"
-#include "scene.h"
+#include "scene/scene.h"
 #include "utils/common.h"
 #include "utils/xcbutils.h"
 // KDE

src/debug_console.cpp

@@ -13,7 +13,7 @@
 #include "internalwindow.h"
 #include "keyboard_input.h"
 #include "main.h"
-#include "scene.h"
+#include "scene/scene.h"
 #include "unmanaged.h"
 #include "utils/filedescriptor.h"
 #include "utils/subsurfacemonitor.h"

src/effects.cpp

@@ -42,12 +42,12 @@
 #include "inputmethod.h"
 #include "inputpanelv1window.h"
 #include "kwinglutils.h"
+#include "scene/windowitem.h"
 #include "utils/xcbutils.h"
 #include "virtualdesktops.h"
 #include "wayland_server.h"
 #include "waylandwindow.h"
 #include "window_property_notify_x11_filter.h"
-#include "windowitem.h"
 #include "workspace.h"
 
 #include <KDecoration2/Decoration>

src/effects.h

@@ -14,7 +14,7 @@
 #include "kwineffects.h"
 
 #include "kwinoffscreenquickview.h"
-#include "scene.h"
+#include "scene/scene.h"
 
 #include <QFont>
 #include <QHash>

src/internalwindow.cpp

@@ -10,8 +10,8 @@
 #include "internalwindow.h"
 #include "decorations/decorationbridge.h"
 #include "deleted.h"
-#include "surfaceitem.h"
+#include "scene/surfaceitem.h"
-#include "windowitem.h"
+#include "scene/windowitem.h"
 #include "workspace.h"
 
 #include <KDecoration2/Decoration>

src/platformsupport/scenes/opengl/basiceglsurfacetexture_internal.cpp

@@ -6,7 +6,7 @@
 
 #include "basiceglsurfacetexture_internal.h"
 #include "kwingltexture.h"
-#include "surfaceitem_internal.h"
+#include "scene/surfaceitem_internal.h"
 #include "utils/common.h"
 
 #include <QOpenGLFramebufferObject>

src/platformsupport/scenes/opengl/basiceglsurfacetexture_wayland.cpp

@@ -8,7 +8,7 @@
 #include "egl_dmabuf.h"
 #include "kwineglext.h"
 #include "kwingltexture.h"
-#include "surfaceitem_wayland.h"
+#include "scene/surfaceitem_wayland.h"
 #include "utils/common.h"
 #include "wayland/drmclientbuffer.h"
 #include "wayland/linuxdmabufv1clientbuffer.h"

src/platformsupport/scenes/opengl/openglbackend.cpp

@@ -11,7 +11,7 @@
 #include <kwineffects.h>
 #include <kwinglutils_funcs.h>
 
-#include "surfaceitem.h"
+#include "scene/surfaceitem.h"
 #include "utils/common.h"
 #include "workspace.h"
 

src/platformsupport/scenes/opengl/openglsurfacetexture.h

@@ -6,7 +6,7 @@
 
 #pragma once
 
-#include "surfaceitem.h"
+#include "scene/surfaceitem.h"
 
 namespace KWin
 {

src/platformsupport/scenes/qpainter/qpaintersurfacetexture.h

@@ -6,7 +6,7 @@
 
 #pragma once
 
-#include "surfaceitem.h"
+#include "scene/surfaceitem.h"
 
 #include <QImage>
 

src/platformsupport/scenes/qpainter/qpaintersurfacetexture_internal.cpp

@@ -5,7 +5,7 @@
 */
 
 #include "qpaintersurfacetexture_internal.h"
-#include "surfaceitem_internal.h"
+#include "scene/surfaceitem_internal.h"
 
 namespace KWin
 {

src/platformsupport/scenes/qpainter/qpaintersurfacetexture_wayland.cpp

@@ -5,7 +5,7 @@
 */
 
 #include "qpaintersurfacetexture_wayland.h"
-#include "surfaceitem_wayland.h"
+#include "scene/surfaceitem_wayland.h"
 #include "utils/common.h"
 #include "wayland/shmclientbuffer.h"
 #include "wayland/surface_interface.h"

src/plugins/screencast/outputscreencastsource.cpp

@@ -12,7 +12,7 @@
 #include "core/renderloop.h"
 #include "kwingltexture.h"
 #include "kwinglutils.h"
-#include "scene.h"
+#include "scene/scene.h"
 
 namespace KWin
 {

src/plugins/screencast/regionscreencastsource.cpp

@@ -11,7 +11,7 @@
 #include <core/output.h>
 #include <kwingltexture.h>
 #include <kwinglutils.h>
-#include <scene.h>
+#include <scene/scene.h>
 #include <workspace.h>
 
 #include <QPainter>

src/plugins/screencast/screencastmanager.cpp

@@ -15,7 +15,7 @@
 #include "kwingltexture.h"
 #include "outputscreencastsource.h"
 #include "regionscreencastsource.h"
-#include "scene.h"
+#include "scene/scene.h"
 #include "screencaststream.h"
 #include "wayland/display.h"
 #include "wayland/output_interface.h"

src/plugins/screencast/screencaststream.cpp

@@ -20,7 +20,7 @@
 #include "kwinscreencast_logging.h"
 #include "main.h"
 #include "pipewirecore.h"
-#include "scene.h"
+#include "scene/scene.h"
 #include "screencastsource.h"
 #include "utils/common.h"
 

src/plugins/screencast/windowscreencastsource.cpp

@@ -15,9 +15,9 @@
 #include "kwineffects.h"
 #include "kwingltexture.h"
 #include "kwinglutils.h"
-#include "scene.h"
+#include "scene/scene.h"
+#include "scene/windowitem.h"
 #include "window.h"
-#include "windowitem.h"
 
 namespace KWin
 {

src/scene/decorationitem.cpp

@@ -5,12 +5,12 @@
     SPDX-License-Identifier: GPL-2.0-or-later
 */
 
-#include "decorationitem.h"
+#include "scene/decorationitem.h"
 #include "composite.h"
 #include "core/output.h"
 #include "decorations/decoratedclient.h"
 #include "deleted.h"
-#include "scene.h"
+#include "scene/scene.h"
 #include "utils/common.h"
 #include "window.h"
 

src/scene/decorationitem.h

@@ -6,7 +6,7 @@
 
 #pragma once
 
-#include "item.h"
+#include "scene/item.h"
 
 namespace KDecoration2
 {

src/scene/dndiconitem.cpp

@@ -4,8 +4,8 @@
     SPDX-License-Identifier: GPL-2.0-or-later
 */
 
-#include "dndiconitem.h"
+#include "scene/dndiconitem.h"
-#include "surfaceitem_wayland.h"
+#include "scene/surfaceitem_wayland.h"
 #include "wayland/datadevice_interface.h"
 #include "wayland/surface_interface.h"
 

src/scene/dndiconitem.h

@@ -6,7 +6,7 @@
 
 #pragma once
 
-#include "item.h"
+#include "scene/item.h"
 
 namespace KWaylandServer
 {

src/scene/item.cpp

@@ -4,12 +4,12 @@
     SPDX-License-Identifier: GPL-2.0-or-later
 */
 
-#include "item.h"
+#include "scene/item.h"
 #include "composite.h"
 #include "core/output.h"
 #include "core/renderloop.h"
 #include "main.h"
-#include "scene.h"
+#include "scene/scene.h"
 #include "utils/common.h"
 #include "workspace.h"
 

src/scene/scene.cpp

@@ -52,24 +52,24 @@
 
 */
 
-#include "scene.h"
+#include "scene/scene.h"
 #include "composite.h"
 #include "core/output.h"
 #include "core/renderlayer.h"
 #include "core/renderloop.h"
 #include "deleted.h"
-#include "dndiconitem.h"
 #include "effects.h"
 #include "internalwindow.h"
+#include "scene/dndiconitem.h"
+#include "scene/shadowitem.h"
+#include "scene/surfaceitem.h"
+#include "scene/windowitem.h"
 #include "shadow.h"
-#include "shadowitem.h"
-#include "surfaceitem.h"
 #include "unmanaged.h"
 #include "wayland/seat_interface.h"
 #include "wayland/surface_interface.h"
 #include "wayland_server.h"
 #include "waylandwindow.h"
-#include "windowitem.h"
 #include "workspace.h"
 #include "x11window.h"
 

src/scene/scene_opengl.cpp

@@ -22,11 +22,11 @@
 #include "decorations/decoratedclient.h"
 #include "effects.h"
 #include "main.h"
-#include "shadowitem.h"
+#include "scene/shadowitem.h"
-#include "surfaceitem.h"
+#include "scene/surfaceitem.h"
+#include "scene/windowitem.h"
 #include "utils/common.h"
 #include "window.h"
-#include "windowitem.h"
 
 #include <cmath>
 #include <cstddef>

src/scene/scene_opengl.h

@@ -13,8 +13,8 @@
 
 #include "openglbackend.h"
 
-#include "decorationitem.h"
+#include "scene/decorationitem.h"
-#include "scene.h"
+#include "scene/scene.h"
 #include "shadow.h"
 
 #include "kwinglutils.h"

src/scene/scene_qpainter.cpp

@@ -12,9 +12,9 @@
 #include "core/output.h"
 #include "decorations/decoratedclient.h"
 #include "effects.h"
-#include "surfaceitem.h"
+#include "scene/surfaceitem.h"
+#include "scene/windowitem.h"
 #include "window.h"
-#include "windowitem.h"
 
 #include <kwinoffscreenquickview.h>
 // Qt

src/scene/scene_qpainter.h

@@ -11,8 +11,8 @@
 
 #include "qpainterbackend.h"
 
-#include "decorationitem.h"
+#include "scene/decorationitem.h"
-#include "scene.h"
+#include "scene/scene.h"
 #include "shadow.h"
 
 namespace KWin

src/scene/shadowitem.cpp

@@ -4,7 +4,7 @@
     SPDX-License-Identifier: GPL-2.0-or-later
 */
 
-#include "shadowitem.h"
+#include "scene/shadowitem.h"
 #include "deleted.h"
 #include "shadow.h"
 

src/scene/shadowitem.h

@@ -6,7 +6,7 @@
 
 #pragma once
 
-#include "item.h"
+#include "scene/item.h"
 
 namespace KWin
 {

src/scene/surfaceitem.cpp

@@ -4,7 +4,7 @@
     SPDX-License-Identifier: GPL-2.0-or-later
 */
 
-#include "surfaceitem.h"
+#include "scene/surfaceitem.h"
 
 namespace KWin
 {

src/scene/surfaceitem.h

@@ -7,7 +7,7 @@
 #pragma once
 
 #include "core/output.h"
-#include "item.h"
+#include "scene/item.h"
 
 namespace KWin
 {

src/scene/surfaceitem_internal.cpp

@@ -4,11 +4,11 @@
     SPDX-License-Identifier: GPL-2.0-or-later
 */
 
-#include "surfaceitem_internal.h"
+#include "scene/surfaceitem_internal.h"
 #include "composite.h"
 #include "deleted.h"
 #include "internalwindow.h"
-#include "scene.h"
+#include "scene/scene.h"
 
 #include <QOpenGLFramebufferObject>
 

src/scene/surfaceitem_internal.h

@@ -6,7 +6,7 @@
 
 #pragma once
 
-#include "surfaceitem.h"
+#include "scene/surfaceitem.h"
 
 class QOpenGLFramebufferObject;
 

src/scene/surfaceitem_wayland.cpp

@@ -4,10 +4,10 @@
     SPDX-License-Identifier: GPL-2.0-or-later
 */
 
-#include "surfaceitem_wayland.h"
+#include "scene/surfaceitem_wayland.h"
 #include "composite.h"
 #include "deleted.h"
-#include "scene.h"
+#include "scene/scene.h"
 #include "wayland/clientbuffer.h"
 #include "wayland/subcompositor_interface.h"
 #include "wayland/surface_interface.h"

src/scene/surfaceitem_wayland.h

@@ -6,7 +6,7 @@
 
 #pragma once
 
-#include "surfaceitem.h"
+#include "scene/surfaceitem.h"
 
 namespace KWaylandServer
 {

src/scene/surfaceitem_x11.cpp

@@ -4,10 +4,10 @@
     SPDX-License-Identifier: GPL-2.0-or-later
 */
 
-#include "surfaceitem_x11.h"
+#include "scene/surfaceitem_x11.h"
 #include "composite.h"
 #include "deleted.h"
-#include "scene.h"
+#include "scene/scene.h"
 #include "x11syncmanager.h"
 
 namespace KWin

src/scene/surfaceitem_x11.h

@@ -6,7 +6,7 @@
 
 #pragma once
 
-#include "surfaceitem.h"
+#include "scene/surfaceitem.h"
 
 #include <xcb/damage.h>
 #include <xcb/xfixes.h>

src/scene/windowitem.cpp

@@ -4,14 +4,14 @@
     SPDX-License-Identifier: GPL-2.0-or-later
 */
 
-#include "windowitem.h"
+#include "scene/windowitem.h"
-#include "decorationitem.h"
 #include "deleted.h"
 #include "internalwindow.h"
-#include "shadowitem.h"
+#include "scene/decorationitem.h"
-#include "surfaceitem_internal.h"
+#include "scene/shadowitem.h"
-#include "surfaceitem_wayland.h"
+#include "scene/surfaceitem_internal.h"
-#include "surfaceitem_x11.h"
+#include "scene/surfaceitem_wayland.h"
+#include "scene/surfaceitem_x11.h"
 #include "wayland_server.h"
 #include "window.h"
 #include "workspace.h"

src/scene/windowitem.h

@@ -6,7 +6,7 @@
 
 #pragma once
 
-#include "item.h"
+#include "scene/item.h"
 
 namespace KDecoration2
 {

src/scenes/CMakeLists.txt

@@ -1,2 +0,0 @@
-add_subdirectory(opengl)
-add_subdirectory(qpainter)

src/scenes/opengl/CMakeLists.txt

@@ -1,3 +0,0 @@
-target_sources(kwin PRIVATE
-    scene_opengl.cpp
-)

src/scenes/qpainter/CMakeLists.txt

@@ -1,3 +0,0 @@
-target_sources(kwin PRIVATE
-    scene_qpainter.cpp
-)

src/scripting/windowthumbnailitem.cpp

@@ -10,11 +10,11 @@
 #include "composite.h"
 #include "core/renderbackend.h"
 #include "effects.h"
-#include "scene.h"
+#include "scene/scene.h"
+#include "scene/windowitem.h"
 #include "scripting_logging.h"
 #include "virtualdesktops.h"
 #include "window.h"
-#include "windowitem.h"
 #include "workspace.h"
 
 #include <kwingltexture.h>

src/shadow.cpp

@@ -12,7 +12,7 @@
 #include "atoms.h"
 #include "composite.h"
 #include "internalwindow.h"
-#include "scene.h"
+#include "scene/scene.h"
 #include "wayland/shadow_interface.h"
 #include "wayland/shmclientbuffer.h"
 #include "wayland/surface_interface.h"

src/unmanaged.cpp

@@ -11,10 +11,10 @@
 
 #include "deleted.h"
 #include "effects.h"
-#include "surfaceitem_x11.h"
+#include "scene/surfaceitem_x11.h"
+#include "scene/windowitem.h"
 #include "utils/common.h"
 #include "wayland/surface_interface.h"
-#include "windowitem.h"
 #include "workspace.h"
 
 #include <QDebug>

src/wayland_server.cpp

@@ -19,7 +19,7 @@
 #include "keyboard_input.h"
 #include "layershellv1integration.h"
 #include "main.h"
-#include "scene.h"
+#include "scene/scene.h"
 #include "unmanaged.h"
 #include "utils/serviceutils.h"
 #include "virtualdesktops.h"

src/waylandwindow.cpp

@@ -7,12 +7,12 @@
 */
 
 #include "waylandwindow.h"
+#include "scene/windowitem.h"
 #include "wayland/clientbuffer.h"
 #include "wayland/clientconnection.h"
 #include "wayland/display.h"
 #include "wayland/surface_interface.h"
 #include "wayland_server.h"
-#include "windowitem.h"
 #include "workspace.h"
 
 #include <QFileInfo>

src/window.cpp

@@ -31,17 +31,17 @@
 #if KWIN_BUILD_TABBOX
 #include "tabbox.h"
 #endif
+#include "scene/shadowitem.h"
+#include "scene/surfaceitem_x11.h"
+#include "scene/windowitem.h"
 #include "screenedge.h"
 #include "shadow.h"
-#include "shadowitem.h"
-#include "surfaceitem_x11.h"
 #include "useractions.h"
 #include "virtualdesktops.h"
 #include "wayland/output_interface.h"
 #include "wayland/plasmawindowmanagement_interface.h"
 #include "wayland/surface_interface.h"
 #include "wayland_server.h"
-#include "windowitem.h"
 #include "workspace.h"
 
 #include <KDecoration2/DecoratedClient>

src/x11syncmanager.cpp

@@ -11,7 +11,7 @@
 #include "core/outputbackend.h"
 #include "core/renderbackend.h"
 #include "main.h"
-#include "scene.h"
+#include "scene/scene.h"
 #include "utils/common.h"
 
 #include "kwinglplatform.h"

src/x11window.cpp

@@ -26,12 +26,12 @@
 #include "group.h"
 #include "netinfo.h"
 #include "placement.h"
+#include "scene/surfaceitem_x11.h"
+#include "scene/windowitem.h"
 #include "screenedge.h"
 #include "shadow.h"
-#include "surfaceitem_x11.h"
 #include "virtualdesktops.h"
 #include "wayland_server.h"
-#include "windowitem.h"
 #include "workspace.h"
 #include <KDecoration2/DecoratedClient>
 #include <KDecoration2/Decoration>

src/x11window.h

@@ -11,7 +11,7 @@
 #pragma once
 
 // kwin
-#include "decorationitem.h"
+#include "scene/decorationitem.h"
 #include "utils/xcbutils.h"
 #include "window.h"
 // Qt