composite.h -> compositor.h

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"

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"

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"

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"

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"

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"

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"

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"

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"

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"

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"

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

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"

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"

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"

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"

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"

src/backends/x11/windowed/x11_windowed_output.cpp

@@ -13,7 +13,7 @@
 
 #include <config-kwin.h>
 
-#include "composite.h"
+#include "compositor.h"
 #include "core/graphicsbuffer.h"
 #include "core/outputlayer.h"
 #include "core/renderbackend.h"

src/compositor.cpp

@@ -6,7 +6,7 @@
 
     SPDX-License-Identifier: GPL-2.0-or-later
 */
-#include "composite.h"
+#include "compositor.h"
 
 #include <config-kwin.h>
 
@@ -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"

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"

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"

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"

src/decorations/settings.cpp

@@ -9,7 +9,7 @@
 #include <config-kwin.h>
 
 #include "appmenu.h"
-#include "composite.h"
+#include "compositor.h"
 #include "decorationbridge.h"
 #include "settings.h"
 #include "virtualdesktops.h"

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"

src/events.cpp

@@ -49,7 +49,7 @@
 #include <xcb/sync.h>
 #include <xcb/xcb_icccm.h>
 
-#include "composite.h"
+#include "compositor.h"
 #include "x11eventfilter.h"
 
 #ifndef XCB_GE_GENERIC

src/layers.cpp

@@ -64,7 +64,7 @@
 
 */
 
-#include "composite.h"
+#include "compositor.h"
 #include "effects.h"
 #include "focuschain.h"
 #include "group.h"

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"

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"

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"

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"

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 <logging.h>
 

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"

src/plugins/screencast/regionscreencastsource.cpp

@@ -9,7 +9,7 @@
 
 #include "libkwineffects/gltexture.h"
 #include "libkwineffects/glutils.h"
-#include <composite.h>
+#include <compositor.h>
 #include <core/output.h>
 #include <drm_fourcc.h>
 #include <scene/workspacescene.h>

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"

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"

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"

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"

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"

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"

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"
 

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"
 

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"

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"

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"

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"

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"

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"

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"

src/useractions.cpp

@@ -25,7 +25,7 @@
 
 #include <config-kwin.h>
 
-#include "composite.h"
+#include "compositor.h"
 #include "core/output.h"
 #include "cursor.h"
 #include "effects.h"

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"

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"

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"

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"