From 14ab38b5968eacb5a2149476fb151a24e58566bb Mon Sep 17 00:00:00 2001 From: Vlad Zahorodnii Date: Thu, 31 Aug 2023 15:23:42 +0300 Subject: [PATCH] composite.h -> compositor.h --- autotests/integration/dont_crash_cancel_animation.cpp | 2 +- .../integration/dont_crash_reinitialize_compositor.cpp | 2 +- autotests/integration/effects/maximize_animation_test.cpp | 2 +- autotests/integration/effects/translucency_test.cpp | 2 +- autotests/integration/generic_scene_opengl_test.cpp | 2 +- autotests/integration/kwin_wayland_test.cpp | 2 +- autotests/integration/lockscreen.cpp | 2 +- autotests/integration/screencasting_test.cpp | 2 +- autotests/integration/x11_window_test.cpp | 2 +- autotests/integration/xwaylandserver_crash_test.cpp | 2 +- autotests/integration/xwaylandserver_restart_test.cpp | 2 +- src/CMakeLists.txt | 2 +- src/backends/virtual/virtual_output.cpp | 2 +- src/backends/wayland/wayland_output.cpp | 2 +- src/backends/x11/standalone/x11_standalone_egl_backend.cpp | 2 +- src/backends/x11/standalone/x11_standalone_glx_backend.cpp | 2 +- .../x11/standalone/x11_standalone_overlaywindow.cpp | 2 +- src/backends/x11/windowed/x11_windowed_output.cpp | 2 +- src/{composite.cpp => compositor.cpp} | 6 +++--- src/{composite.h => compositor.h} | 0 src/cursor.cpp | 2 +- src/dbusinterface.cpp | 2 +- src/debug_console.cpp | 2 +- src/decorations/settings.cpp | 2 +- src/effects.cpp | 2 +- src/events.cpp | 2 +- src/layers.cpp | 2 +- src/main.cpp | 2 +- src/main_wayland.cpp | 2 +- src/outline.cpp | 2 +- src/platformsupport/scenes/opengl/abstract_egl_backend.cpp | 2 +- src/plugins/qpa/window.cpp | 4 ++-- src/plugins/screencast/outputscreencastsource.cpp | 2 +- src/plugins/screencast/regionscreencastsource.cpp | 2 +- src/plugins/screencast/screencastmanager.cpp | 2 +- src/plugins/screencast/screencaststream.cpp | 2 +- src/plugins/screencast/windowscreencastsource.cpp | 2 +- src/scene/cursordelegate_opengl.cpp | 2 +- src/scene/cursordelegate_qpainter.cpp | 2 +- src/scene/decorationitem.cpp | 2 +- src/scene/shadowitem.cpp | 2 +- src/scene/surfaceitem_internal.cpp | 2 +- src/scene/surfaceitem_wayland.cpp | 2 +- src/scene/surfaceitem_x11.cpp | 2 +- src/scene/workspacescene.cpp | 2 +- src/scene/workspacescene_opengl.cpp | 2 +- src/scripting/windowthumbnailitem.cpp | 2 +- src/tabbox/switcheritem.cpp | 2 +- src/tabbox/tabbox.cpp | 2 +- src/useractions.cpp | 2 +- src/window.cpp | 2 +- src/workspace.cpp | 2 +- src/x11syncmanager.cpp | 2 +- src/x11window.cpp | 2 +- 54 files changed, 56 insertions(+), 56 deletions(-) rename src/{composite.cpp => compositor.cpp} (99%) rename src/{composite.h => compositor.h} (100%) diff --git a/autotests/integration/dont_crash_cancel_animation.cpp b/autotests/integration/dont_crash_cancel_animation.cpp index 4a3859fc84..65fe229531 100644 --- a/autotests/integration/dont_crash_cancel_animation.cpp +++ b/autotests/integration/dont_crash_cancel_animation.cpp @@ -8,7 +8,7 @@ */ #include "kwin_wayland_test.h" -#include "composite.h" +#include "compositor.h" #include "effectloader.h" #include "effects.h" #include "scripting/scriptedeffect.h" diff --git a/autotests/integration/dont_crash_reinitialize_compositor.cpp b/autotests/integration/dont_crash_reinitialize_compositor.cpp index d56bd4d18d..12f55d3374 100644 --- a/autotests/integration/dont_crash_reinitialize_compositor.cpp +++ b/autotests/integration/dont_crash_reinitialize_compositor.cpp @@ -9,7 +9,7 @@ #include "kwin_wayland_test.h" -#include "composite.h" +#include "compositor.h" #include "core/output.h" #include "effectloader.h" #include "effects.h" diff --git a/autotests/integration/effects/maximize_animation_test.cpp b/autotests/integration/effects/maximize_animation_test.cpp index b6feabd6d6..97819ba9c3 100644 --- a/autotests/integration/effects/maximize_animation_test.cpp +++ b/autotests/integration/effects/maximize_animation_test.cpp @@ -9,7 +9,7 @@ #include "kwin_wayland_test.h" -#include "composite.h" +#include "compositor.h" #include "effectloader.h" #include "effects.h" #include "scene/workspacescene.h" diff --git a/autotests/integration/effects/translucency_test.cpp b/autotests/integration/effects/translucency_test.cpp index eb32a28972..273449a05b 100644 --- a/autotests/integration/effects/translucency_test.cpp +++ b/autotests/integration/effects/translucency_test.cpp @@ -8,7 +8,7 @@ */ #include "kwin_wayland_test.h" -#include "composite.h" +#include "compositor.h" #include "effectloader.h" #include "effects.h" #include "pointer_input.h" diff --git a/autotests/integration/generic_scene_opengl_test.cpp b/autotests/integration/generic_scene_opengl_test.cpp index 846e9a243a..0be62632ce 100644 --- a/autotests/integration/generic_scene_opengl_test.cpp +++ b/autotests/integration/generic_scene_opengl_test.cpp @@ -7,7 +7,7 @@ SPDX-License-Identifier: GPL-2.0-or-later */ #include "generic_scene_opengl_test.h" -#include "composite.h" +#include "compositor.h" #include "core/renderbackend.h" #include "cursor.h" #include "effectloader.h" diff --git a/autotests/integration/kwin_wayland_test.cpp b/autotests/integration/kwin_wayland_test.cpp index b151e0a614..c439cc258f 100644 --- a/autotests/integration/kwin_wayland_test.cpp +++ b/autotests/integration/kwin_wayland_test.cpp @@ -9,7 +9,7 @@ #include "kwin_wayland_test.h" #include "backends/virtual/virtual_backend.h" -#include "composite.h" +#include "compositor.h" #include "core/session.h" #include "effects.h" #include "inputmethod.h" diff --git a/autotests/integration/lockscreen.cpp b/autotests/integration/lockscreen.cpp index 7652c94463..db890d30d1 100644 --- a/autotests/integration/lockscreen.cpp +++ b/autotests/integration/lockscreen.cpp @@ -8,7 +8,7 @@ */ #include "kwin_wayland_test.h" -#include "composite.h" +#include "compositor.h" #include "core/output.h" #include "core/renderbackend.h" #include "libkwineffects/kwineffects.h" diff --git a/autotests/integration/screencasting_test.cpp b/autotests/integration/screencasting_test.cpp index c721687d56..1a26c66afc 100644 --- a/autotests/integration/screencasting_test.cpp +++ b/autotests/integration/screencasting_test.cpp @@ -6,7 +6,7 @@ SPDX-License-Identifier: GPL-2.0-or-later */ -#include "composite.h" +#include "compositor.h" #include "core/output.h" #include "generic_scene_opengl_test.h" #include "libkwineffects/glplatform.h" diff --git a/autotests/integration/x11_window_test.cpp b/autotests/integration/x11_window_test.cpp index f87735e0c2..17dfd20d60 100644 --- a/autotests/integration/x11_window_test.cpp +++ b/autotests/integration/x11_window_test.cpp @@ -9,7 +9,7 @@ #include "kwin_wayland_test.h" #include "atoms.h" -#include "composite.h" +#include "compositor.h" #include "cursor.h" #include "effectloader.h" #include "effects.h" diff --git a/autotests/integration/xwaylandserver_crash_test.cpp b/autotests/integration/xwaylandserver_crash_test.cpp index 2d72ce0eec..8b88a16d94 100644 --- a/autotests/integration/xwaylandserver_crash_test.cpp +++ b/autotests/integration/xwaylandserver_crash_test.cpp @@ -6,7 +6,7 @@ #include "kwin_wayland_test.h" -#include "composite.h" +#include "compositor.h" #include "core/output.h" #include "main.h" #include "scene/workspacescene.h" diff --git a/autotests/integration/xwaylandserver_restart_test.cpp b/autotests/integration/xwaylandserver_restart_test.cpp index 5cbd148620..d8d0926bbe 100644 --- a/autotests/integration/xwaylandserver_restart_test.cpp +++ b/autotests/integration/xwaylandserver_restart_test.cpp @@ -6,7 +6,7 @@ #include "kwin_wayland_test.h" -#include "composite.h" +#include "compositor.h" #include "main.h" #include "scene/workspacescene.h" #include "wayland_server.h" diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 996c1fe3e3..506a736266 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -42,7 +42,7 @@ target_sources(kwin PRIVATE client_machine.cpp colors/colordevice.cpp colors/colormanager.cpp - composite.cpp + compositor.cpp core/colorlut.cpp core/colorpipelinestage.cpp core/colortransformation.cpp diff --git a/src/backends/virtual/virtual_output.cpp b/src/backends/virtual/virtual_output.cpp index 50c81f1d0b..c95d7aae98 100644 --- a/src/backends/virtual/virtual_output.cpp +++ b/src/backends/virtual/virtual_output.cpp @@ -9,7 +9,7 @@ #include "virtual_output.h" #include "virtual_backend.h" -#include "composite.h" +#include "compositor.h" #include "core/outputlayer.h" #include "core/renderbackend.h" #include "core/renderloop_p.h" diff --git a/src/backends/wayland/wayland_output.cpp b/src/backends/wayland/wayland_output.cpp index 7e0e60d421..ae0bbe7317 100644 --- a/src/backends/wayland/wayland_output.cpp +++ b/src/backends/wayland/wayland_output.cpp @@ -7,7 +7,7 @@ SPDX-License-Identifier: GPL-2.0-or-later */ #include "wayland_output.h" -#include "composite.h" +#include "compositor.h" #include "core/outputlayer.h" #include "core/renderbackend.h" #include "core/renderloop_p.h" diff --git a/src/backends/x11/standalone/x11_standalone_egl_backend.cpp b/src/backends/x11/standalone/x11_standalone_egl_backend.cpp index 22d32e01d5..1bd5b8500f 100644 --- a/src/backends/x11/standalone/x11_standalone_egl_backend.cpp +++ b/src/backends/x11/standalone/x11_standalone_egl_backend.cpp @@ -6,7 +6,7 @@ */ #include "x11_standalone_egl_backend.h" -#include "composite.h" +#include "compositor.h" #include "core/outputbackend.h" #include "core/outputlayer.h" #include "core/overlaywindow.h" diff --git a/src/backends/x11/standalone/x11_standalone_glx_backend.cpp b/src/backends/x11/standalone/x11_standalone_glx_backend.cpp index 36609d6ad9..612d8d572b 100644 --- a/src/backends/x11/standalone/x11_standalone_glx_backend.cpp +++ b/src/backends/x11/standalone/x11_standalone_glx_backend.cpp @@ -24,7 +24,7 @@ #include "x11_standalone_overlaywindow.h" #include "x11_standalone_sgivideosyncvsyncmonitor.h" // kwin -#include "composite.h" +#include "compositor.h" #include "core/outputbackend.h" #include "core/overlaywindow.h" #include "core/renderloop_p.h" diff --git a/src/backends/x11/standalone/x11_standalone_overlaywindow.cpp b/src/backends/x11/standalone/x11_standalone_overlaywindow.cpp index 7b90ba2972..b2ffef3a72 100644 --- a/src/backends/x11/standalone/x11_standalone_overlaywindow.cpp +++ b/src/backends/x11/standalone/x11_standalone_overlaywindow.cpp @@ -9,7 +9,7 @@ #include "x11_standalone_overlaywindow.h" -#include "composite.h" +#include "compositor.h" #include "libkwineffects/kwinglobals.h" #include "scene/workspacescene.h" #include "utils/common.h" diff --git a/src/backends/x11/windowed/x11_windowed_output.cpp b/src/backends/x11/windowed/x11_windowed_output.cpp index 3ac89a4786..7cbdfccd80 100644 --- a/src/backends/x11/windowed/x11_windowed_output.cpp +++ b/src/backends/x11/windowed/x11_windowed_output.cpp @@ -13,7 +13,7 @@ #include -#include "composite.h" +#include "compositor.h" #include "core/graphicsbuffer.h" #include "core/outputlayer.h" #include "core/renderbackend.h" diff --git a/src/composite.cpp b/src/compositor.cpp similarity index 99% rename from src/composite.cpp rename to src/compositor.cpp index d69f90381c..026b9ac664 100644 --- a/src/composite.cpp +++ b/src/compositor.cpp @@ -6,7 +6,7 @@ SPDX-License-Identifier: GPL-2.0-or-later */ -#include "composite.h" +#include "compositor.h" #include @@ -1196,6 +1196,6 @@ void X11Compositor::createOpenGLSafePoint(OpenGLSafePoint safePoint) } // included for CompositorSelectionOwner -#include "composite.moc" +#include "compositor.moc" -#include "moc_composite.cpp" +#include "moc_compositor.cpp" diff --git a/src/composite.h b/src/compositor.h similarity index 100% rename from src/composite.h rename to src/compositor.h diff --git a/src/cursor.cpp b/src/cursor.cpp index ca6b015752..0141e4fd9f 100644 --- a/src/cursor.cpp +++ b/src/cursor.cpp @@ -9,7 +9,7 @@ #include "cursor.h" // kwin -#include "composite.h" +#include "compositor.h" #include "core/output.h" #include "cursorsource.h" #include "input.h" diff --git a/src/dbusinterface.cpp b/src/dbusinterface.cpp index 7adeb3ad12..13fe555787 100644 --- a/src/dbusinterface.cpp +++ b/src/dbusinterface.cpp @@ -15,7 +15,7 @@ // kwin #include "atoms.h" -#include "composite.h" +#include "compositor.h" #include "core/output.h" #include "core/renderbackend.h" #include "debug_console.h" diff --git a/src/debug_console.cpp b/src/debug_console.cpp index d5f4b65ac4..8d6b1a3067 100644 --- a/src/debug_console.cpp +++ b/src/debug_console.cpp @@ -7,7 +7,7 @@ SPDX-License-Identifier: GPL-2.0-or-later */ #include "debug_console.h" -#include "composite.h" +#include "compositor.h" #include "core/graphicsbufferview.h" #include "core/inputdevice.h" #include "input_event.h" diff --git a/src/decorations/settings.cpp b/src/decorations/settings.cpp index 13e0c12490..d22ebb7846 100644 --- a/src/decorations/settings.cpp +++ b/src/decorations/settings.cpp @@ -9,7 +9,7 @@ #include #include "appmenu.h" -#include "composite.h" +#include "compositor.h" #include "decorationbridge.h" #include "settings.h" #include "virtualdesktops.h" diff --git a/src/effects.cpp b/src/effects.cpp index 13a0ee2e6f..11d29632cb 100644 --- a/src/effects.cpp +++ b/src/effects.cpp @@ -37,7 +37,7 @@ #if KWIN_BUILD_SCREENLOCKER #include "screenlockerwatcher.h" #endif -#include "composite.h" +#include "compositor.h" #include "decorations/decorationbridge.h" #include "inputmethod.h" #include "inputpanelv1window.h" diff --git a/src/events.cpp b/src/events.cpp index 5664d23d78..715457b7ea 100644 --- a/src/events.cpp +++ b/src/events.cpp @@ -49,7 +49,7 @@ #include #include -#include "composite.h" +#include "compositor.h" #include "x11eventfilter.h" #ifndef XCB_GE_GENERIC diff --git a/src/layers.cpp b/src/layers.cpp index c8f90d10e8..9a20dc46a4 100644 --- a/src/layers.cpp +++ b/src/layers.cpp @@ -64,7 +64,7 @@ */ -#include "composite.h" +#include "compositor.h" #include "effects.h" #include "focuschain.h" #include "group.h" diff --git a/src/main.cpp b/src/main.cpp index 72ec09f057..1963002a08 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -13,7 +13,7 @@ #include "atoms.h" #include "colors/colormanager.h" -#include "composite.h" +#include "compositor.h" #include "core/outputbackend.h" #include "core/session.h" #include "cursor.h" diff --git a/src/main_wayland.cpp b/src/main_wayland.cpp index 66bce725d6..029acb2d26 100644 --- a/src/main_wayland.cpp +++ b/src/main_wayland.cpp @@ -14,7 +14,7 @@ #include "backends/virtual/virtual_backend.h" #include "backends/wayland/wayland_backend.h" #include "backends/x11/windowed/x11_windowed_backend.h" -#include "composite.h" +#include "compositor.h" #include "core/outputbackend.h" #include "core/session.h" #include "effects.h" diff --git a/src/outline.cpp b/src/outline.cpp index fd989b1f24..816346d8b2 100644 --- a/src/outline.cpp +++ b/src/outline.cpp @@ -10,7 +10,7 @@ // own #include "outline.h" // KWin -#include "composite.h" +#include "compositor.h" #include "main.h" #include "scripting/scripting.h" #include "utils/common.h" diff --git a/src/platformsupport/scenes/opengl/abstract_egl_backend.cpp b/src/platformsupport/scenes/opengl/abstract_egl_backend.cpp index 09b574933d..39919b08bb 100644 --- a/src/platformsupport/scenes/opengl/abstract_egl_backend.cpp +++ b/src/platformsupport/scenes/opengl/abstract_egl_backend.cpp @@ -7,7 +7,7 @@ SPDX-License-Identifier: GPL-2.0-or-later */ #include "platformsupport/scenes/opengl/abstract_egl_backend.h" -#include "composite.h" +#include "compositor.h" #include "core/outputbackend.h" #include "options.h" #include "utils/common.h" diff --git a/src/plugins/qpa/window.cpp b/src/plugins/qpa/window.cpp index 44339cd18b..30573be165 100644 --- a/src/plugins/qpa/window.cpp +++ b/src/plugins/qpa/window.cpp @@ -11,12 +11,12 @@ // which Qt does include #include "utils/drm_format_helper.h" -#include "window.h" -#include "composite.h" +#include "compositor.h" #include "core/renderbackend.h" #include "core/shmgraphicsbufferallocator.h" #include "internalwindow.h" #include "swapchain.h" +#include "window.h" #include diff --git a/src/plugins/screencast/outputscreencastsource.cpp b/src/plugins/screencast/outputscreencastsource.cpp index 6c312546b3..def3a8a1c1 100644 --- a/src/plugins/screencast/outputscreencastsource.cpp +++ b/src/plugins/screencast/outputscreencastsource.cpp @@ -7,7 +7,7 @@ #include "outputscreencastsource.h" #include "screencastutils.h" -#include "composite.h" +#include "compositor.h" #include "core/output.h" #include "core/renderloop.h" #include "libkwineffects/gltexture.h" diff --git a/src/plugins/screencast/regionscreencastsource.cpp b/src/plugins/screencast/regionscreencastsource.cpp index 38fc577499..2937591dda 100644 --- a/src/plugins/screencast/regionscreencastsource.cpp +++ b/src/plugins/screencast/regionscreencastsource.cpp @@ -9,7 +9,7 @@ #include "libkwineffects/gltexture.h" #include "libkwineffects/glutils.h" -#include +#include #include #include #include diff --git a/src/plugins/screencast/screencastmanager.cpp b/src/plugins/screencast/screencastmanager.cpp index d243238bb3..8a23170d85 100644 --- a/src/plugins/screencast/screencastmanager.cpp +++ b/src/plugins/screencast/screencastmanager.cpp @@ -7,7 +7,7 @@ */ #include "screencastmanager.h" -#include "composite.h" +#include "compositor.h" #include "core/output.h" #include "core/outputbackend.h" #include "effects.h" diff --git a/src/plugins/screencast/screencaststream.cpp b/src/plugins/screencast/screencaststream.cpp index 457afbf290..afb180642a 100644 --- a/src/plugins/screencast/screencaststream.cpp +++ b/src/plugins/screencast/screencaststream.cpp @@ -7,7 +7,7 @@ */ #include "screencaststream.h" -#include "composite.h" +#include "compositor.h" #include "core/graphicsbufferallocator.h" #include "core/outputbackend.h" #include "core/renderbackend.h" diff --git a/src/plugins/screencast/windowscreencastsource.cpp b/src/plugins/screencast/windowscreencastsource.cpp index 3f874dbfa1..9760f7cf31 100644 --- a/src/plugins/screencast/windowscreencastsource.cpp +++ b/src/plugins/screencast/windowscreencastsource.cpp @@ -7,7 +7,7 @@ #include "windowscreencastsource.h" #include "screencastutils.h" -#include "composite.h" +#include "compositor.h" #include "core/output.h" #include "core/renderloop.h" #include "effects.h" diff --git a/src/scene/cursordelegate_opengl.cpp b/src/scene/cursordelegate_opengl.cpp index 9a163e030d..7cfb67afc1 100644 --- a/src/scene/cursordelegate_opengl.cpp +++ b/src/scene/cursordelegate_opengl.cpp @@ -5,7 +5,7 @@ */ #include "scene/cursordelegate_opengl.h" -#include "composite.h" +#include "compositor.h" #include "core/output.h" #include "core/renderlayer.h" #include "cursor.h" diff --git a/src/scene/cursordelegate_qpainter.cpp b/src/scene/cursordelegate_qpainter.cpp index 4f4f1cafb4..59466e15d1 100644 --- a/src/scene/cursordelegate_qpainter.cpp +++ b/src/scene/cursordelegate_qpainter.cpp @@ -5,7 +5,7 @@ */ #include "scene/cursordelegate_qpainter.h" -#include "composite.h" +#include "compositor.h" #include "core/output.h" #include "core/renderlayer.h" #include "cursor.h" diff --git a/src/scene/decorationitem.cpp b/src/scene/decorationitem.cpp index 412dc52143..730c0a34fc 100644 --- a/src/scene/decorationitem.cpp +++ b/src/scene/decorationitem.cpp @@ -6,7 +6,7 @@ */ #include "scene/decorationitem.h" -#include "composite.h" +#include "compositor.h" #include "core/output.h" #include "decorations/decoratedclient.h" #include "scene/workspacescene.h" diff --git a/src/scene/shadowitem.cpp b/src/scene/shadowitem.cpp index 0579149b5c..42757a5ac4 100644 --- a/src/scene/shadowitem.cpp +++ b/src/scene/shadowitem.cpp @@ -5,7 +5,7 @@ */ #include "scene/shadowitem.h" -#include "composite.h" +#include "compositor.h" #include "scene/workspacescene.h" #include "shadow.h" diff --git a/src/scene/surfaceitem_internal.cpp b/src/scene/surfaceitem_internal.cpp index c902609461..6100efcf6a 100644 --- a/src/scene/surfaceitem_internal.cpp +++ b/src/scene/surfaceitem_internal.cpp @@ -5,7 +5,7 @@ */ #include "scene/surfaceitem_internal.h" -#include "composite.h" +#include "compositor.h" #include "core/renderbackend.h" #include "internalwindow.h" diff --git a/src/scene/surfaceitem_wayland.cpp b/src/scene/surfaceitem_wayland.cpp index c6be06e951..96f1845b6b 100644 --- a/src/scene/surfaceitem_wayland.cpp +++ b/src/scene/surfaceitem_wayland.cpp @@ -5,7 +5,7 @@ */ #include "scene/surfaceitem_wayland.h" -#include "composite.h" +#include "compositor.h" #include "core/graphicsbuffer.h" #include "core/renderbackend.h" #include "wayland/subcompositor_interface.h" diff --git a/src/scene/surfaceitem_x11.cpp b/src/scene/surfaceitem_x11.cpp index 8c433a9187..91803c9f25 100644 --- a/src/scene/surfaceitem_x11.cpp +++ b/src/scene/surfaceitem_x11.cpp @@ -5,7 +5,7 @@ */ #include "scene/surfaceitem_x11.h" -#include "composite.h" +#include "compositor.h" #include "core/renderbackend.h" #include "x11syncmanager.h" #include "x11window.h" diff --git a/src/scene/workspacescene.cpp b/src/scene/workspacescene.cpp index af10227791..999412774d 100644 --- a/src/scene/workspacescene.cpp +++ b/src/scene/workspacescene.cpp @@ -53,7 +53,7 @@ */ #include "scene/workspacescene.h" -#include "composite.h" +#include "compositor.h" #include "core/output.h" #include "core/renderlayer.h" #include "core/renderloop.h" diff --git a/src/scene/workspacescene_opengl.cpp b/src/scene/workspacescene_opengl.cpp index 1d44144965..87732ccbe8 100644 --- a/src/scene/workspacescene_opengl.cpp +++ b/src/scene/workspacescene_opengl.cpp @@ -15,7 +15,7 @@ #include "libkwineffects/glplatform.h" -#include "composite.h" +#include "compositor.h" #include "core/output.h" #include "decorations/decoratedclient.h" #include "scene/itemrenderer_opengl.h" diff --git a/src/scripting/windowthumbnailitem.cpp b/src/scripting/windowthumbnailitem.cpp index 4405fa8d4d..08264cc748 100644 --- a/src/scripting/windowthumbnailitem.cpp +++ b/src/scripting/windowthumbnailitem.cpp @@ -7,7 +7,7 @@ */ #include "windowthumbnailitem.h" -#include "composite.h" +#include "compositor.h" #include "core/renderbackend.h" #include "effects.h" #include "libkwineffects/rendertarget.h" diff --git a/src/tabbox/switcheritem.cpp b/src/tabbox/switcheritem.cpp index a534b1a950..ead137673f 100644 --- a/src/tabbox/switcheritem.cpp +++ b/src/tabbox/switcheritem.cpp @@ -8,7 +8,7 @@ */ #include "switcheritem.h" // KWin -#include "composite.h" +#include "compositor.h" #include "core/output.h" #include "tabboxhandler.h" #include "workspace.h" diff --git a/src/tabbox/tabbox.cpp b/src/tabbox/tabbox.cpp index abe080904f..1980ee28c1 100644 --- a/src/tabbox/tabbox.cpp +++ b/src/tabbox/tabbox.cpp @@ -21,7 +21,7 @@ #if KWIN_BUILD_ACTIVITIES #include "activities.h" #endif -#include "composite.h" +#include "compositor.h" #include "effects.h" #include "focuschain.h" #include "input.h" diff --git a/src/useractions.cpp b/src/useractions.cpp index c170024fd9..387733d9ed 100644 --- a/src/useractions.cpp +++ b/src/useractions.cpp @@ -25,7 +25,7 @@ #include -#include "composite.h" +#include "compositor.h" #include "core/output.h" #include "cursor.h" #include "effects.h" diff --git a/src/window.cpp b/src/window.cpp index 3b25828387..e8fb3511b6 100644 --- a/src/window.cpp +++ b/src/window.cpp @@ -14,7 +14,7 @@ #endif #include "appmenu.h" #include "client_machine.h" -#include "composite.h" +#include "compositor.h" #include "core/output.h" #include "decorations/decoratedclient.h" #include "decorations/decorationpalette.h" diff --git a/src/workspace.cpp b/src/workspace.cpp index d63565191a..1cbd7a366f 100644 --- a/src/workspace.cpp +++ b/src/workspace.cpp @@ -20,7 +20,7 @@ #endif #include "appmenu.h" #include "atoms.h" -#include "composite.h" +#include "compositor.h" #include "core/outputbackend.h" #include "core/outputconfiguration.h" #include "cursor.h" diff --git a/src/x11syncmanager.cpp b/src/x11syncmanager.cpp index 0857d9f78a..24f72aa05f 100644 --- a/src/x11syncmanager.cpp +++ b/src/x11syncmanager.cpp @@ -7,7 +7,7 @@ SPDX-License-Identifier: GPL-2.0-or-later */ #include "x11syncmanager.h" -#include "composite.h" +#include "compositor.h" #include "core/outputbackend.h" #include "core/renderbackend.h" #include "main.h" diff --git a/src/x11window.cpp b/src/x11window.cpp index 8823c2b142..d58b2ec344 100644 --- a/src/x11window.cpp +++ b/src/x11window.cpp @@ -16,7 +16,7 @@ #endif #include "atoms.h" #include "client_machine.h" -#include "composite.h" +#include "compositor.h" #include "cursor.h" #include "decorations/decoratedclient.h" #include "decorations/decorationbridge.h"