From e88a4e34a3a6984737f17c2d00638cdab407419a Mon Sep 17 00:00:00 2001 From: Vlad Zahorodnii Date: Thu, 23 Mar 2023 13:39:20 +0200 Subject: [PATCH] Remove some include_directories() It seems we've settled on dir/dir/header.h includes, so let's use them consistently. --- CMakeLists.txt | 5 ----- autotests/CMakeLists.txt | 2 -- autotests/drm/drmTest.cpp | 10 +++++----- autotests/integration/activities_test.cpp | 2 +- autotests/integration/decoration_input_test.cpp | 2 +- autotests/integration/desktop_window_x11_test.cpp | 2 +- .../integration/dont_crash_aurorae_destroy_deco.cpp | 2 +- autotests/integration/dont_crash_empty_deco.cpp | 2 +- autotests/integration/dont_crash_no_border.cpp | 2 +- autotests/integration/input_stacking_order.cpp | 2 +- autotests/integration/lockscreen.cpp | 2 +- autotests/integration/plasmawindow_test.cpp | 2 +- autotests/integration/pointer_input.cpp | 2 +- autotests/integration/screenedge_client_show_test.cpp | 2 +- autotests/integration/shade_test.cpp | 2 +- autotests/integration/struts_test.cpp | 2 +- autotests/integration/tiles_test.cpp | 2 +- autotests/integration/transient_placement.cpp | 2 +- autotests/libkwineffects/kwinglplatformtest.cpp | 2 +- autotests/libkwineffects/timelinetest.cpp | 2 +- autotests/libkwineffects/windowquadlisttest.cpp | 2 +- autotests/tabbox/CMakeLists.txt | 1 - autotests/tabbox/test_tabbox_clientmodel.cpp | 2 +- autotests/tabbox/test_tabbox_handler.cpp | 2 +- autotests/test_window_paint_data.cpp | 2 +- autotests/testutils.h | 2 +- src/activities.h | 2 +- src/appmenu.h | 2 +- src/backends/drm/drm_dmabuf_feedback.cpp | 2 +- src/backends/drm/drm_egl_backend.cpp | 10 +++++----- src/backends/drm/drm_egl_backend.h | 4 ++-- src/backends/drm/drm_egl_layer.cpp | 2 +- src/backends/drm/drm_egl_layer_surface.cpp | 4 ++-- src/backends/drm/drm_egl_layer_surface.h | 2 +- src/backends/drm/drm_gbm_swapchain.cpp | 2 +- src/backends/drm/drm_gpu.cpp | 2 +- src/backends/drm/drm_output.cpp | 4 ++-- src/backends/drm/drm_qpainter_backend.h | 2 +- src/backends/drm/drm_virtual_egl_layer.cpp | 2 +- src/backends/drm/drm_virtual_output.cpp | 2 +- src/backends/libinput/connection.h | 2 +- src/backends/virtual/virtual_egl_backend.cpp | 10 +++++----- src/backends/virtual/virtual_egl_backend.h | 2 +- src/backends/virtual/virtual_output.cpp | 2 +- src/backends/virtual/virtual_qpainter_backend.cpp | 2 +- src/backends/virtual/virtual_qpainter_backend.h | 2 +- src/backends/wayland/wayland_backend.h | 2 +- src/backends/wayland/wayland_egl_backend.cpp | 8 ++++---- src/backends/wayland/wayland_egl_backend.h | 2 +- src/backends/wayland/wayland_output.cpp | 6 +++--- src/backends/wayland/wayland_qpainter_backend.h | 2 +- .../x11/standalone/x11_standalone_egl_backend.cpp | 4 ++-- .../x11/standalone/x11_standalone_egl_backend.h | 4 ++-- .../x11/standalone/x11_standalone_glx_backend.cpp | 8 ++++---- .../x11/standalone/x11_standalone_glx_backend.h | 8 ++++---- .../x11_standalone_omlsynccontrolvsyncmonitor.h | 2 +- .../x11/standalone/x11_standalone_overlaywindow.cpp | 2 +- .../x11_standalone_sgivideosyncvsyncmonitor.h | 2 +- .../standalone/x11_standalone_xinputintegration.cpp | 2 +- src/backends/x11/windowed/x11_windowed_egl_backend.cpp | 4 ++-- src/backends/x11/windowed/x11_windowed_egl_backend.h | 2 +- src/backends/x11/windowed/x11_windowed_output.cpp | 2 +- .../x11/windowed/x11_windowed_qpainter_backend.h | 2 +- src/colors/colordevice.h | 2 +- src/colors/colormanager.h | 2 +- src/composite.cpp | 8 ++++---- src/composite.h | 2 +- src/core/outputbackend.cpp | 4 ++-- src/core/outputbackend.h | 2 +- src/core/outputlayer.h | 2 +- src/core/renderbackend.h | 4 ++-- src/core/renderjournal.h | 2 +- src/core/renderloop.h | 2 +- src/core/session.h | 2 +- src/cursor.h | 2 +- src/cursordelegate_opengl.cpp | 8 ++++---- src/cursordelegate_qpainter.cpp | 4 ++-- src/debug_console.cpp | 4 ++-- src/decorations/decorationbridge.h | 2 +- src/dmabuftexture.cpp | 2 +- src/effectloader.cpp | 2 +- src/effects.cpp | 2 +- src/effects.h | 4 ++-- src/effects/backgroundcontrast/contrast.cpp | 4 ++-- src/effects/backgroundcontrast/contrast.h | 6 +++--- src/effects/backgroundcontrast/contrastshader.cpp | 4 ++-- src/effects/backgroundcontrast/contrastshader.h | 2 +- src/effects/blendchanges/blendchanges.cpp | 2 +- src/effects/blendchanges/blendchanges.h | 4 ++-- src/effects/blur/blur.cpp | 4 ++-- src/effects/blur/blur.h | 6 +++--- src/effects/blur/blurshader.cpp | 2 +- src/effects/blur/blurshader.h | 2 +- src/effects/colorpicker/colorpicker.cpp | 8 ++++---- src/effects/colorpicker/colorpicker.h | 2 +- src/effects/desktopgrid/desktopgrideffect.h | 2 +- src/effects/diminactive/diminactive.h | 2 +- src/effects/fallapart/fallapart.h | 2 +- src/effects/glide/glide.cpp | 4 ++-- src/effects/glide/glide.h | 2 +- src/effects/highlightwindow/highlightwindow.h | 2 +- src/effects/invert/invert.cpp | 4 ++-- src/effects/invert/invert.h | 2 +- src/effects/kscreen/kscreen.h | 2 +- src/effects/magiclamp/magiclamp.h | 2 +- src/effects/magnifier/magnifier.cpp | 4 ++-- src/effects/magnifier/magnifier.h | 2 +- src/effects/mouseclick/mouseclick.cpp | 2 +- src/effects/mouseclick/mouseclick.h | 4 ++-- src/effects/mousemark/mousemark.cpp | 4 ++-- src/effects/mousemark/mousemark.h | 4 ++-- src/effects/outputlocator/outputlocator.cpp | 2 +- src/effects/outputlocator/outputlocator.h | 2 +- src/effects/overview/overvieweffect.h | 2 +- src/effects/private/expoarea.h | 2 +- src/effects/screenedge/screenedgeeffect.cpp | 6 +++--- src/effects/screenedge/screenedgeeffect.h | 2 +- src/effects/screenshot/screenshot.cpp | 8 ++++---- src/effects/screenshot/screenshot.h | 2 +- src/effects/screenshot/screenshotdbusinterface2.h | 2 +- src/effects/screentransform/screentransform.cpp | 6 +++--- src/effects/screentransform/screentransform.h | 2 +- src/effects/sheet/sheet.cpp | 2 +- src/effects/sheet/sheet.h | 2 +- src/effects/showfps/showfpseffect.cpp | 2 +- src/effects/showfps/showfpseffect.h | 4 ++-- src/effects/showpaint/showpaint.cpp | 4 ++-- src/effects/showpaint/showpaint.h | 2 +- src/effects/slide/slide.h | 2 +- src/effects/slideback/slideback.h | 2 +- src/effects/slidingpopups/slidingpopups.h | 2 +- src/effects/snaphelper/snaphelper.cpp | 4 ++-- src/effects/snaphelper/snaphelper.h | 2 +- src/effects/startupfeedback/startupfeedback.cpp | 4 ++-- src/effects/startupfeedback/startupfeedback.h | 2 +- src/effects/thumbnailaside/thumbnailaside.cpp | 2 +- src/effects/thumbnailaside/thumbnailaside.h | 2 +- src/effects/tileseditor/tileseditoreffect.h | 2 +- src/effects/touchpoints/touchpoints.cpp | 4 ++-- src/effects/touchpoints/touchpoints.h | 2 +- src/effects/trackmouse/trackmouse.cpp | 4 ++-- src/effects/trackmouse/trackmouse.h | 2 +- src/effects/windowview/windowviewconfig.kcfgc | 2 +- src/effects/windowview/windowvieweffect.h | 2 +- src/effects/wobblywindows/wobblywindows.h | 2 +- src/effects/zoom/zoom.cpp | 6 +++--- src/effects/zoom/zoom.h | 2 +- src/events.cpp | 2 +- src/focuschain.h | 2 +- src/ftrace.h | 2 +- src/gestures.h | 2 +- src/globalshortcuts.cpp | 2 +- src/globalshortcuts.h | 2 +- src/input.h | 2 +- src/inputmethod.h | 2 +- src/kcms/desktop/desktopsmodel.h | 2 +- src/kcms/rules/CMakeLists.txt | 2 -- src/kcms/screenedges/CMakeLists.txt | 1 - src/kcms/screenedges/kwinscreenedge.h | 2 +- .../screenedges/kwinscreenedgeeffectsettings.kcfgc | 2 +- .../screenedges/kwinscreenedgescriptsettings.kcfgc | 2 +- src/kcms/screenedges/kwinscreenedgesettings.kcfgc | 2 +- .../kwintouchscreenedgeeffectsettings.kcfgc | 2 +- .../screenedges/kwintouchscreenscriptsettings.kcfgc | 2 +- src/kcms/screenedges/kwintouchscreensettings.kcfgc | 2 +- src/kcms/screenedges/main.h | 2 +- src/kcms/screenedges/touch.h | 2 +- src/kcms/tabbox/CMakeLists.txt | 4 ---- src/kcms/tabbox/kwintabboxconfigform.h | 2 +- src/kcms/tabbox/kwintabboxsettings.kcfgc | 2 +- src/kcms/tabbox/main.h | 2 +- src/kcms/virtualkeyboard/CMakeLists.txt | 1 - src/kcms/xwayland/CMakeLists.txt | 1 - src/layers.cpp | 2 +- src/libkwineffects/anidata.cpp | 2 +- src/libkwineffects/anidata_p.h | 2 +- src/libkwineffects/kwinanimationeffect.cpp | 6 +++--- src/libkwineffects/kwinanimationeffect.h | 2 +- src/libkwineffects/kwineffects.cpp | 2 +- src/libkwineffects/kwineffects.h | 2 +- src/libkwineffects/kwineglimagetexture.cpp | 2 +- src/libkwineffects/kwineglimagetexture.h | 2 +- src/libkwineffects/kwinglplatform.cpp | 4 ++-- src/libkwineffects/kwinglplatform.h | 2 +- src/libkwineffects/kwingltexture.cpp | 8 ++++---- src/libkwineffects/kwingltexture_p.h | 2 +- src/libkwineffects/kwinglutils.cpp | 10 +++++----- src/libkwineffects/kwinglutils.h | 4 ++-- src/libkwineffects/kwinglutils_funcs.cpp | 4 ++-- src/libkwineffects/kwinoffscreeneffect.cpp | 10 +++++----- src/libkwineffects/kwinoffscreeneffect.h | 2 +- src/libkwineffects/kwinoffscreenquickview.cpp | 4 ++-- src/libkwineffects/kwinoffscreenquickview.h | 2 +- src/libkwineffects/kwinquickeffect.cpp | 2 +- src/libkwineffects/kwinquickeffect.h | 4 ++-- src/libkwineffects/rendertarget.cpp | 4 ++-- src/libkwineffects/renderviewport.cpp | 4 ++-- src/main.cpp | 4 ++-- src/main.h | 2 +- src/options.cpp | 2 +- src/outline.h | 2 +- src/platformsupport/scenes/opengl/CMakeLists.txt | 1 - .../scenes/opengl/abstract_egl_backend.cpp | 10 +++++----- .../scenes/opengl/abstract_egl_backend.h | 2 +- .../scenes/opengl/basiceglsurfacetexture_internal.cpp | 4 ++-- .../scenes/opengl/basiceglsurfacetexture_wayland.cpp | 6 +++--- src/platformsupport/scenes/opengl/egl_dmabuf.cpp | 2 +- src/platformsupport/scenes/opengl/egl_dmabuf.h | 2 +- src/platformsupport/scenes/opengl/openglbackend.cpp | 6 +++--- .../scenes/opengl/openglsurfacetexture.cpp | 2 +- .../scenes/opengl/openglsurfacetexture_x11.cpp | 2 +- src/platformsupport/scenes/qpainter/CMakeLists.txt | 1 - .../scenes/qpainter/qpainterbackend.cpp | 2 +- src/platformsupport/vsyncconvenience/CMakeLists.txt | 2 -- .../vsyncconvenience/softwarevsyncmonitor.cpp | 2 +- .../vsyncconvenience/softwarevsyncmonitor.h | 2 +- src/platformsupport/vsyncconvenience/vsyncmonitor.cpp | 2 +- src/platformsupport/vsyncconvenience/vsyncmonitor.h | 2 +- src/pluginmanager.h | 2 +- src/plugins/colord-integration/colorddevice.cpp | 4 ++-- src/plugins/kdecorations/aurorae/src/aurorae.cpp | 4 ++-- src/plugins/nightcolor/nightcolormanager.cpp | 4 ++-- src/plugins/screencast/outputscreencastsource.cpp | 4 ++-- src/plugins/screencast/regionscreencastsource.cpp | 4 ++-- src/plugins/screencast/regionscreencastsource.h | 4 ++-- src/plugins/screencast/screencastmanager.cpp | 2 +- src/plugins/screencast/screencaststream.cpp | 10 +++++----- src/plugins/screencast/screencaststream.h | 2 +- src/plugins/screencast/screencastutils.h | 6 +++--- src/scene/imageitem.cpp | 2 +- src/scene/item.h | 4 ++-- src/scene/itemrenderer_opengl.h | 4 ++-- src/scene/workspacescene.h | 2 +- src/scene/workspacescene_opengl.cpp | 2 +- src/scene/workspacescene_opengl.h | 4 ++-- src/scene/workspacescene_qpainter.h | 2 +- src/screenedge.h | 2 +- src/screenlockerwatcher.h | 2 +- src/scripting/screenedgehandler.h | 2 +- src/scripting/scriptedeffect.cpp | 2 +- src/scripting/scriptedeffect.h | 2 +- src/scripting/scripting.cpp | 2 +- src/scripting/scripting.h | 2 +- src/scripting/windowthumbnailitem.cpp | 4 ++-- src/scripting/workspace_wrapper.h | 2 +- src/shadow.h | 2 +- src/sm.h | 2 +- src/tabbox/tabboxhandler.cpp | 2 +- src/tabletmodemanager.h | 2 +- src/tiles/tile.h | 2 +- src/useractions.cpp | 2 +- src/useractions.h | 2 +- src/utils/common.h | 2 +- src/utils/serviceutils.h | 2 +- src/utils/xcbutils.h | 2 +- src/virtualdesktops.h | 2 +- src/wayland_server.h | 2 +- src/window.cpp | 2 +- src/workspace.cpp | 4 ++-- src/x11syncmanager.cpp | 2 +- src/x11syncmanager.h | 2 +- src/xwayland/databridge.h | 2 +- src/xwayland/xwayland_interface.h | 2 +- tests/CMakeLists.txt | 2 -- 264 files changed, 371 insertions(+), 394 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 6af57b3c63..20976d4636 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -398,11 +398,6 @@ include_directories(BEFORE ${CMAKE_CURRENT_BINARY_DIR}/src/libkwineffects ${CMAKE_CURRENT_BINARY_DIR}/src/wayland ${CMAKE_CURRENT_BINARY_DIR}/src - ${CMAKE_CURRENT_SOURCE_DIR}/src/libkwineffects - ${CMAKE_CURRENT_SOURCE_DIR}/src/effects - ${CMAKE_CURRENT_SOURCE_DIR}/src/tabbox - ${CMAKE_CURRENT_SOURCE_DIR}/src/platformsupport - ${CMAKE_CURRENT_SOURCE_DIR}/src/colors ${CMAKE_CURRENT_SOURCE_DIR}/src ) diff --git a/autotests/CMakeLists.txt b/autotests/CMakeLists.txt index 567f8aaab3..1ccd552dc3 100644 --- a/autotests/CMakeLists.txt +++ b/autotests/CMakeLists.txt @@ -120,8 +120,6 @@ target_link_libraries(testXcbWindow add_test(NAME kwin-testXcbWindow COMMAND testXcbWindow) ecm_mark_as_test(testXcbWindow) -include_directories(${KWin_SOURCE_DIR}/src) - ######################################################## # Test OnScreenNotification ######################################################## diff --git a/autotests/drm/drmTest.cpp b/autotests/drm/drmTest.cpp index a8a58bb3e3..5e87ee4ece 100644 --- a/autotests/drm/drmTest.cpp +++ b/autotests/drm/drmTest.cpp @@ -12,18 +12,18 @@ #include "mock_drm.h" +#include "core/session.h" #include "drm_backend.h" +#include "drm_connector.h" +#include "drm_crtc.h" #include "drm_dumb_buffer.h" #include "drm_egl_backend.h" #include "drm_gpu.h" -#include "drm_connector.h" -#include "drm_crtc.h" -#include "drm_plane.h" #include "drm_output.h" #include "drm_pipeline.h" +#include "drm_plane.h" #include "drm_pointer.h" -#include "qpainterbackend.h" -#include "core/session.h" +#include "platformsupport/scenes/qpainter/qpainterbackend.h" #include diff --git a/autotests/integration/activities_test.cpp b/autotests/integration/activities_test.cpp index 6fa2c03620..4f61ff862c 100644 --- a/autotests/integration/activities_test.cpp +++ b/autotests/integration/activities_test.cpp @@ -11,12 +11,12 @@ #include "activities.h" #include "core/output.h" #include "core/outputbackend.h" +#include "libkwineffects/kwineffects.h" #include "pointer_input.h" #include "utils/xcbutils.h" #include "wayland_server.h" #include "workspace.h" #include "x11window.h" -#include #include #include diff --git a/autotests/integration/decoration_input_test.cpp b/autotests/integration/decoration_input_test.cpp index d0c7b6aa20..174548fd80 100644 --- a/autotests/integration/decoration_input_test.cpp +++ b/autotests/integration/decoration_input_test.cpp @@ -12,12 +12,12 @@ #include "core/outputbackend.h" #include "cursor.h" #include "internalwindow.h" +#include "libkwineffects/kwineffects.h" #include "pointer_input.h" #include "touch_input.h" #include "wayland_server.h" #include "window.h" #include "workspace.h" -#include #include "decorations/decoratedclient.h" #include "decorations/decorationbridge.h" diff --git a/autotests/integration/desktop_window_x11_test.cpp b/autotests/integration/desktop_window_x11_test.cpp index 9fe30dfea8..b77cc684f3 100644 --- a/autotests/integration/desktop_window_x11_test.cpp +++ b/autotests/integration/desktop_window_x11_test.cpp @@ -10,13 +10,13 @@ #include "core/output.h" #include "core/outputbackend.h" +#include "libkwineffects/kwineffects.h" #include "pointer_input.h" #include "utils/xcbutils.h" #include "wayland_server.h" #include "window.h" #include "workspace.h" #include "x11window.h" -#include #include #include diff --git a/autotests/integration/dont_crash_aurorae_destroy_deco.cpp b/autotests/integration/dont_crash_aurorae_destroy_deco.cpp index 33d806c50f..6d4a7883cf 100644 --- a/autotests/integration/dont_crash_aurorae_destroy_deco.cpp +++ b/autotests/integration/dont_crash_aurorae_destroy_deco.cpp @@ -12,11 +12,11 @@ #include "core/output.h" #include "core/outputbackend.h" #include "core/renderbackend.h" +#include "libkwineffects/kwineffects.h" #include "pointer_input.h" #include "wayland_server.h" #include "workspace.h" #include "x11window.h" -#include #include diff --git a/autotests/integration/dont_crash_empty_deco.cpp b/autotests/integration/dont_crash_empty_deco.cpp index b543195c58..c692993238 100644 --- a/autotests/integration/dont_crash_empty_deco.cpp +++ b/autotests/integration/dont_crash_empty_deco.cpp @@ -12,11 +12,11 @@ #include "core/output.h" #include "core/outputbackend.h" #include "core/renderbackend.h" +#include "libkwineffects/kwineffects.h" #include "pointer_input.h" #include "wayland_server.h" #include "workspace.h" #include "x11window.h" -#include #include diff --git a/autotests/integration/dont_crash_no_border.cpp b/autotests/integration/dont_crash_no_border.cpp index 89789bab7d..3648b0f08a 100644 --- a/autotests/integration/dont_crash_no_border.cpp +++ b/autotests/integration/dont_crash_no_border.cpp @@ -13,11 +13,11 @@ #include "core/output.h" #include "core/outputbackend.h" #include "core/renderbackend.h" +#include "libkwineffects/kwineffects.h" #include "pointer_input.h" #include "wayland_server.h" #include "workspace.h" #include "x11window.h" -#include #include diff --git a/autotests/integration/input_stacking_order.cpp b/autotests/integration/input_stacking_order.cpp index 7080c510ac..0df0211650 100644 --- a/autotests/integration/input_stacking_order.cpp +++ b/autotests/integration/input_stacking_order.cpp @@ -10,12 +10,12 @@ #include "core/output.h" #include "core/outputbackend.h" +#include "libkwineffects/kwineffects.h" #include "pointer_input.h" #include "wayland/seat_interface.h" #include "wayland_server.h" #include "window.h" #include "workspace.h" -#include #include #include diff --git a/autotests/integration/lockscreen.cpp b/autotests/integration/lockscreen.cpp index 82a74f07e4..10eae02f99 100644 --- a/autotests/integration/lockscreen.cpp +++ b/autotests/integration/lockscreen.cpp @@ -12,6 +12,7 @@ #include "core/output.h" #include "core/outputbackend.h" #include "core/renderbackend.h" +#include "libkwineffects/kwineffects.h" #include "pointer_input.h" #include "screenedge.h" #include "wayland/keyboard_interface.h" @@ -19,7 +20,6 @@ #include "wayland_server.h" #include "window.h" #include "workspace.h" -#include #include #include diff --git a/autotests/integration/plasmawindow_test.cpp b/autotests/integration/plasmawindow_test.cpp index d348dcfed6..292a4f1231 100644 --- a/autotests/integration/plasmawindow_test.cpp +++ b/autotests/integration/plasmawindow_test.cpp @@ -10,12 +10,12 @@ #include "core/output.h" #include "core/outputbackend.h" +#include "libkwineffects/kwineffects.h" #include "pointer_input.h" #include "wayland/seat_interface.h" #include "wayland_server.h" #include "workspace.h" #include "x11window.h" -#include #include #include diff --git a/autotests/integration/pointer_input.cpp b/autotests/integration/pointer_input.cpp index 79c60bdb13..8be420e43c 100644 --- a/autotests/integration/pointer_input.cpp +++ b/autotests/integration/pointer_input.cpp @@ -12,6 +12,7 @@ #include "core/outputbackend.h" #include "cursor.h" #include "effects.h" +#include "libkwineffects/kwineffects.h" #include "options.h" #include "pointer_input.h" #include "screenedge.h" @@ -22,7 +23,6 @@ #include "wayland_server.h" #include "window.h" #include "workspace.h" -#include #include #include diff --git a/autotests/integration/screenedge_client_show_test.cpp b/autotests/integration/screenedge_client_show_test.cpp index ebd50732a2..7d0dffba8b 100644 --- a/autotests/integration/screenedge_client_show_test.cpp +++ b/autotests/integration/screenedge_client_show_test.cpp @@ -10,12 +10,12 @@ #include "core/output.h" #include "core/outputbackend.h" +#include "libkwineffects/kwineffects.h" #include "pointer_input.h" #include "screenedge.h" #include "wayland_server.h" #include "workspace.h" #include "x11window.h" -#include #include #include diff --git a/autotests/integration/shade_test.cpp b/autotests/integration/shade_test.cpp index 8b2835b93c..9fe5698bef 100644 --- a/autotests/integration/shade_test.cpp +++ b/autotests/integration/shade_test.cpp @@ -10,11 +10,11 @@ #include "core/output.h" #include "core/outputbackend.h" +#include "libkwineffects/kwineffects.h" #include "pointer_input.h" #include "wayland_server.h" #include "workspace.h" #include "x11window.h" -#include #include diff --git a/autotests/integration/struts_test.cpp b/autotests/integration/struts_test.cpp index 04ce10cac9..1160dccce6 100644 --- a/autotests/integration/struts_test.cpp +++ b/autotests/integration/struts_test.cpp @@ -10,13 +10,13 @@ #include "core/output.h" #include "core/outputbackend.h" +#include "libkwineffects/kwineffects.h" #include "pointer_input.h" #include "screenedge.h" #include "virtualdesktops.h" #include "wayland_server.h" #include "workspace.h" #include "x11window.h" -#include #include #include diff --git a/autotests/integration/tiles_test.cpp b/autotests/integration/tiles_test.cpp index 5a1c914af6..f74dfcd221 100644 --- a/autotests/integration/tiles_test.cpp +++ b/autotests/integration/tiles_test.cpp @@ -10,6 +10,7 @@ #include "core/output.h" #include "core/outputbackend.h" +#include "libkwineffects/kwineffects.h" #include "pointer_input.h" #include "tiles/tilemanager.h" #include "wayland/seat_interface.h" @@ -17,7 +18,6 @@ #include "wayland_server.h" #include "window.h" #include "workspace.h" -#include #include diff --git a/autotests/integration/transient_placement.cpp b/autotests/integration/transient_placement.cpp index 2a81d665d6..709fc6fc19 100644 --- a/autotests/integration/transient_placement.cpp +++ b/autotests/integration/transient_placement.cpp @@ -10,13 +10,13 @@ #include "core/output.h" #include "core/outputbackend.h" +#include "libkwineffects/kwineffects.h" #include "pointer_input.h" #include "wayland/seat_interface.h" #include "wayland/surface_interface.h" #include "wayland_server.h" #include "window.h" #include "workspace.h" -#include #include #include diff --git a/autotests/libkwineffects/kwinglplatformtest.cpp b/autotests/libkwineffects/kwinglplatformtest.cpp index 43e456cb62..06c653ac75 100644 --- a/autotests/libkwineffects/kwinglplatformtest.cpp +++ b/autotests/libkwineffects/kwinglplatformtest.cpp @@ -6,9 +6,9 @@ SPDX-License-Identifier: GPL-2.0-or-later */ +#include "libkwineffects/kwinglplatform.h" #include "mock_gl.h" #include -#include #include #include diff --git a/autotests/libkwineffects/timelinetest.cpp b/autotests/libkwineffects/timelinetest.cpp index 16dc32a8be..7e7298a427 100644 --- a/autotests/libkwineffects/timelinetest.cpp +++ b/autotests/libkwineffects/timelinetest.cpp @@ -7,7 +7,7 @@ SPDX-License-Identifier: GPL-2.0-or-later */ -#include +#include "libkwineffects/kwineffects.h" #include diff --git a/autotests/libkwineffects/windowquadlisttest.cpp b/autotests/libkwineffects/windowquadlisttest.cpp index 4be9cbb03c..38790b418a 100644 --- a/autotests/libkwineffects/windowquadlisttest.cpp +++ b/autotests/libkwineffects/windowquadlisttest.cpp @@ -6,8 +6,8 @@ SPDX-License-Identifier: GPL-2.0-or-later */ +#include "libkwineffects/kwineffects.h" #include -#include Q_DECLARE_METATYPE(KWin::WindowQuadList) diff --git a/autotests/tabbox/CMakeLists.txt b/autotests/tabbox/CMakeLists.txt index e12fed3f32..d8e59fac08 100644 --- a/autotests/tabbox/CMakeLists.txt +++ b/autotests/tabbox/CMakeLists.txt @@ -1,4 +1,3 @@ -include_directories(${KWin_SOURCE_DIR}/src) add_definitions(-DKWIN_UNIT_TEST) ######################################################## # Test TabBox::ClientModel diff --git a/autotests/tabbox/test_tabbox_clientmodel.cpp b/autotests/tabbox/test_tabbox_clientmodel.cpp index 73361b3697..5240c187a3 100644 --- a/autotests/tabbox/test_tabbox_clientmodel.cpp +++ b/autotests/tabbox/test_tabbox_clientmodel.cpp @@ -8,8 +8,8 @@ */ #include "test_tabbox_clientmodel.h" #include "../testutils.h" -#include "clientmodel.h" #include "mock_tabboxhandler.h" +#include "tabbox/clientmodel.h" #include #include diff --git a/autotests/tabbox/test_tabbox_handler.cpp b/autotests/tabbox/test_tabbox_handler.cpp index 2ad9c31d6c..29ece87e3b 100644 --- a/autotests/tabbox/test_tabbox_handler.cpp +++ b/autotests/tabbox/test_tabbox_handler.cpp @@ -7,8 +7,8 @@ SPDX-License-Identifier: GPL-2.0-or-later */ #include "../testutils.h" -#include "clientmodel.h" #include "mock_tabboxhandler.h" +#include "tabbox/clientmodel.h" #include #include diff --git a/autotests/test_window_paint_data.cpp b/autotests/test_window_paint_data.cpp index 3699b4f266..fe40ea6e5b 100644 --- a/autotests/test_window_paint_data.cpp +++ b/autotests/test_window_paint_data.cpp @@ -7,7 +7,7 @@ SPDX-License-Identifier: GPL-2.0-or-later */ -#include +#include "libkwineffects/kwineffects.h" #include "virtualdesktops.h" diff --git a/autotests/testutils.h b/autotests/testutils.h index e9b5e7650a..98b740dce2 100644 --- a/autotests/testutils.h +++ b/autotests/testutils.h @@ -9,7 +9,7 @@ #ifndef TESTUTILS_H #define TESTUTILS_H // KWin -#include +#include "libkwineffects/kwinglobals.h" // XCB #include diff --git a/src/activities.h b/src/activities.h index 8fda43c725..2cc17f87e7 100644 --- a/src/activities.h +++ b/src/activities.h @@ -8,7 +8,7 @@ */ #pragma once -#include +#include "libkwineffects/kwinglobals.h" #include #include diff --git a/src/appmenu.h b/src/appmenu.h index 6bcc14504c..188d078e2b 100644 --- a/src/appmenu.h +++ b/src/appmenu.h @@ -10,7 +10,7 @@ */ #pragma once // KWin -#include +#include "libkwineffects/kwinglobals.h" // Qt #include // xcb diff --git a/src/backends/drm/drm_dmabuf_feedback.cpp b/src/backends/drm/drm_dmabuf_feedback.cpp index 2914badce9..dd4aad972a 100644 --- a/src/backends/drm/drm_dmabuf_feedback.cpp +++ b/src/backends/drm/drm_dmabuf_feedback.cpp @@ -10,7 +10,7 @@ #include "drm_egl_backend.h" #include "drm_gpu.h" -#include "egl_dmabuf.h" +#include "platformsupport/scenes/opengl/egl_dmabuf.h" #include "wayland/linuxdmabufv1clientbuffer.h" #include "wayland/surface_interface.h" diff --git a/src/backends/drm/drm_egl_backend.cpp b/src/backends/drm/drm_egl_backend.cpp index ce99d8ddc6..9fa8e8a6a0 100644 --- a/src/backends/drm/drm_egl_backend.cpp +++ b/src/backends/drm/drm_egl_backend.cpp @@ -7,8 +7,8 @@ SPDX-License-Identifier: GPL-2.0-or-later */ #include "drm_egl_backend.h" -#include "basiceglsurfacetexture_internal.h" -#include "basiceglsurfacetexture_wayland.h" +#include "platformsupport/scenes/opengl/basiceglsurfacetexture_internal.h" +#include "platformsupport/scenes/opengl/basiceglsurfacetexture_wayland.h" // kwin #include "core/renderloop_p.h" #include "drm_abstract_output.h" @@ -23,18 +23,18 @@ #include "drm_output.h" #include "drm_pipeline.h" #include "drm_virtual_egl_layer.h" -#include "egl_dmabuf.h" #include "gbm_dmabuf.h" #include "kwineglutils_p.h" #include "linux_dmabuf.h" #include "options.h" +#include "platformsupport/scenes/opengl/egl_dmabuf.h" #include "scene/surfaceitem_wayland.h" #include "wayland/clientconnection.h" #include "wayland/linuxdmabufv1clientbuffer.h" #include "wayland/surface_interface.h" // kwin libs -#include -#include +#include "libkwineffects/kwineglimagetexture.h" +#include "libkwineffects/kwinglplatform.h" // system #include #include diff --git a/src/backends/drm/drm_egl_backend.h b/src/backends/drm/drm_egl_backend.h index 95c44c00a6..ab18d18b11 100644 --- a/src/backends/drm/drm_egl_backend.h +++ b/src/backends/drm/drm_egl_backend.h @@ -7,10 +7,10 @@ SPDX-License-Identifier: GPL-2.0-or-later */ #pragma once -#include "abstract_egl_backend.h" #include "drm_render_backend.h" +#include "platformsupport/scenes/opengl/abstract_egl_backend.h" -#include +#include "libkwineffects/kwinglutils.h" #include #include diff --git a/src/backends/drm/drm_egl_layer.cpp b/src/backends/drm/drm_egl_layer.cpp index 6df4fce21a..ea666e191c 100644 --- a/src/backends/drm/drm_egl_layer.cpp +++ b/src/backends/drm/drm_egl_layer.cpp @@ -15,7 +15,7 @@ #include "drm_logging.h" #include "drm_output.h" #include "drm_pipeline.h" -#include "egl_dmabuf.h" +#include "platformsupport/scenes/opengl/egl_dmabuf.h" #include "scene/surfaceitem_wayland.h" #include "wayland/linuxdmabufv1clientbuffer.h" #include "wayland/surface_interface.h" diff --git a/src/backends/drm/drm_egl_layer_surface.cpp b/src/backends/drm/drm_egl_layer_surface.cpp index b44caea7cc..a30d81f653 100644 --- a/src/backends/drm/drm_egl_layer_surface.cpp +++ b/src/backends/drm/drm_egl_layer_surface.cpp @@ -17,10 +17,10 @@ #include "drm_gpu.h" #include "drm_logging.h" #include "drm_output.h" -#include "egl_dmabuf.h" #include "gbm_dmabuf.h" #include "kwineglutils_p.h" -#include "kwinglplatform.h" +#include "libkwineffects/kwinglplatform.h" +#include "platformsupport/scenes/opengl/egl_dmabuf.h" #include "scene/surfaceitem_wayland.h" #include "wayland/linuxdmabufv1clientbuffer.h" #include "wayland/surface_interface.h" diff --git a/src/backends/drm/drm_egl_layer_surface.h b/src/backends/drm/drm_egl_layer_surface.h index de78979533..80747b5b9e 100644 --- a/src/backends/drm/drm_egl_layer_surface.h +++ b/src/backends/drm/drm_egl_layer_surface.h @@ -16,7 +16,7 @@ #include "core/outputlayer.h" #include "drm_plane.h" -#include "kwingltexture.h" +#include "libkwineffects/kwingltexture.h" namespace KWaylandServer { diff --git a/src/backends/drm/drm_gbm_swapchain.cpp b/src/backends/drm/drm_gbm_swapchain.cpp index 9078c90f28..cb7a369d75 100644 --- a/src/backends/drm/drm_gbm_swapchain.cpp +++ b/src/backends/drm/drm_gbm_swapchain.cpp @@ -18,7 +18,7 @@ #include "drm_gpu.h" #include "drm_logging.h" #include "kwineglutils_p.h" -#include "kwinglplatform.h" +#include "libkwineffects/kwinglplatform.h" namespace KWin { diff --git a/src/backends/drm/drm_gpu.cpp b/src/backends/drm/drm_gpu.cpp index 083e0f6b8d..0f8399c5a0 100644 --- a/src/backends/drm/drm_gpu.cpp +++ b/src/backends/drm/drm_gpu.cpp @@ -10,7 +10,6 @@ #include -#include "abstract_egl_backend.h" #include "core/renderloop_p.h" #include "core/session.h" #include "drm_atomic_commit.h" @@ -25,6 +24,7 @@ #include "drm_plane.h" #include "drm_virtual_output.h" #include "gbm_dmabuf.h" +#include "platformsupport/scenes/opengl/abstract_egl_backend.h" // system #include #include diff --git a/src/backends/drm/drm_output.cpp b/src/backends/drm/drm_output.cpp index b342cfdaef..2d0383dfdc 100644 --- a/src/backends/drm/drm_output.cpp +++ b/src/backends/drm/drm_output.cpp @@ -22,8 +22,8 @@ #include "drm_egl_backend.h" #include "drm_layer.h" #include "drm_logging.h" -#include "kwinglutils.h" -#include "renderviewport.h" +#include "libkwineffects/kwinglutils.h" +#include "libkwineffects/renderviewport.h" // Qt #include #include diff --git a/src/backends/drm/drm_qpainter_backend.h b/src/backends/drm/drm_qpainter_backend.h index b19902d95d..7c5d0c2dee 100644 --- a/src/backends/drm/drm_qpainter_backend.h +++ b/src/backends/drm/drm_qpainter_backend.h @@ -9,7 +9,7 @@ #pragma once #include "drm_dumb_swapchain.h" #include "drm_render_backend.h" -#include "qpainterbackend.h" +#include "platformsupport/scenes/qpainter/qpainterbackend.h" #include #include diff --git a/src/backends/drm/drm_virtual_egl_layer.cpp b/src/backends/drm/drm_virtual_egl_layer.cpp index 7e4d374749..48401b3c59 100644 --- a/src/backends/drm/drm_virtual_egl_layer.cpp +++ b/src/backends/drm/drm_virtual_egl_layer.cpp @@ -17,9 +17,9 @@ #include "drm_output.h" #include "drm_pipeline.h" #include "drm_virtual_output.h" -#include "egl_dmabuf.h" #include "gbm_dmabuf.h" #include "kwineglutils_p.h" +#include "platformsupport/scenes/opengl/egl_dmabuf.h" #include "scene/surfaceitem_wayland.h" #include "wayland/linuxdmabufv1clientbuffer.h" #include "wayland/surface_interface.h" diff --git a/src/backends/drm/drm_virtual_output.cpp b/src/backends/drm/drm_virtual_output.cpp index 40819c1f26..f0685a3442 100644 --- a/src/backends/drm/drm_virtual_output.cpp +++ b/src/backends/drm/drm_virtual_output.cpp @@ -15,7 +15,7 @@ #include "drm_layer.h" #include "drm_logging.h" #include "drm_render_backend.h" -#include "softwarevsyncmonitor.h" +#include "platformsupport/vsyncconvenience/softwarevsyncmonitor.h" namespace KWin { diff --git a/src/backends/libinput/connection.h b/src/backends/libinput/connection.h index 3e594f8d8d..c687ec24dd 100644 --- a/src/backends/libinput/connection.h +++ b/src/backends/libinput/connection.h @@ -8,7 +8,7 @@ */ #pragma once -#include +#include "libkwineffects/kwinglobals.h" #include diff --git a/src/backends/virtual/virtual_egl_backend.cpp b/src/backends/virtual/virtual_egl_backend.cpp index e016d6d48d..d7f1e9569b 100644 --- a/src/backends/virtual/virtual_egl_backend.cpp +++ b/src/backends/virtual/virtual_egl_backend.cpp @@ -8,15 +8,15 @@ */ #include "virtual_egl_backend.h" // kwin -#include "basiceglsurfacetexture_internal.h" -#include "basiceglsurfacetexture_wayland.h" -#include "virtual_logging.h" -#include "softwarevsyncmonitor.h" +#include "platformsupport/scenes/opengl/basiceglsurfacetexture_internal.h" +#include "platformsupport/scenes/opengl/basiceglsurfacetexture_wayland.h" +#include "platformsupport/vsyncconvenience/softwarevsyncmonitor.h" #include "virtual_backend.h" +#include "virtual_logging.h" #include "virtual_output.h" // kwin libs +#include "libkwineffects/kwinglutils.h" #include -#include #ifndef EGL_PLATFORM_SURFACELESS_MESA #define EGL_PLATFORM_SURFACELESS_MESA 0x31DD diff --git a/src/backends/virtual/virtual_egl_backend.h b/src/backends/virtual/virtual_egl_backend.h index 20fafbb9c3..4238b7f090 100644 --- a/src/backends/virtual/virtual_egl_backend.h +++ b/src/backends/virtual/virtual_egl_backend.h @@ -8,8 +8,8 @@ */ #pragma once -#include "abstract_egl_backend.h" #include "core/outputlayer.h" +#include "platformsupport/scenes/opengl/abstract_egl_backend.h" #include namespace KWin diff --git a/src/backends/virtual/virtual_output.cpp b/src/backends/virtual/virtual_output.cpp index 401e0108f9..a369352cb8 100644 --- a/src/backends/virtual/virtual_output.cpp +++ b/src/backends/virtual/virtual_output.cpp @@ -10,7 +10,7 @@ #include "virtual_backend.h" #include "core/renderloop_p.h" -#include "softwarevsyncmonitor.h" +#include "platformsupport/vsyncconvenience/softwarevsyncmonitor.h" namespace KWin { diff --git a/src/backends/virtual/virtual_qpainter_backend.cpp b/src/backends/virtual/virtual_qpainter_backend.cpp index f9fe1bd779..af6693245d 100644 --- a/src/backends/virtual/virtual_qpainter_backend.cpp +++ b/src/backends/virtual/virtual_qpainter_backend.cpp @@ -7,7 +7,7 @@ SPDX-License-Identifier: GPL-2.0-or-later */ #include "virtual_qpainter_backend.h" -#include "softwarevsyncmonitor.h" +#include "platformsupport/vsyncconvenience/softwarevsyncmonitor.h" #include "virtual_backend.h" #include "virtual_output.h" diff --git a/src/backends/virtual/virtual_qpainter_backend.h b/src/backends/virtual/virtual_qpainter_backend.h index d7d5727e35..2c03394270 100644 --- a/src/backends/virtual/virtual_qpainter_backend.h +++ b/src/backends/virtual/virtual_qpainter_backend.h @@ -9,7 +9,7 @@ #pragma once #include "core/outputlayer.h" -#include "qpainterbackend.h" +#include "platformsupport/scenes/qpainter/qpainterbackend.h" #include #include diff --git a/src/backends/wayland/wayland_backend.h b/src/backends/wayland/wayland_backend.h index 58b97a5726..3ceaef0ca7 100644 --- a/src/backends/wayland/wayland_backend.h +++ b/src/backends/wayland/wayland_backend.h @@ -14,8 +14,8 @@ #include "core/inputbackend.h" #include "core/inputdevice.h" #include "core/outputbackend.h" +#include "libkwineffects/kwinglobals.h" #include "utils/filedescriptor.h" -#include // Qt #include #include diff --git a/src/backends/wayland/wayland_egl_backend.cpp b/src/backends/wayland/wayland_egl_backend.cpp index 610bd09075..a224cc7514 100644 --- a/src/backends/wayland/wayland_egl_backend.cpp +++ b/src/backends/wayland/wayland_egl_backend.cpp @@ -9,9 +9,9 @@ */ #include "wayland_egl_backend.h" -#include "basiceglsurfacetexture_internal.h" -#include "basiceglsurfacetexture_wayland.h" #include "../drm/gbm_dmabuf.h" +#include "platformsupport/scenes/opengl/basiceglsurfacetexture_internal.h" +#include "platformsupport/scenes/opengl/basiceglsurfacetexture_wayland.h" #include "wayland_backend.h" #include "wayland_display.h" @@ -22,8 +22,8 @@ #include // kwin libs -#include -#include +#include "libkwineffects/kwinglplatform.h" +#include "libkwineffects/kwinglutils.h" // KDE #include diff --git a/src/backends/wayland/wayland_egl_backend.h b/src/backends/wayland/wayland_egl_backend.h index af6ee8fc2b..50625a9424 100644 --- a/src/backends/wayland/wayland_egl_backend.h +++ b/src/backends/wayland/wayland_egl_backend.h @@ -9,8 +9,8 @@ */ #pragma once -#include "abstract_egl_backend.h" #include "core/outputlayer.h" +#include "platformsupport/scenes/opengl/abstract_egl_backend.h" #include "utils/damagejournal.h" #include diff --git a/src/backends/wayland/wayland_output.cpp b/src/backends/wayland/wayland_output.cpp index 642b26c377..a77daf2b58 100644 --- a/src/backends/wayland/wayland_output.cpp +++ b/src/backends/wayland/wayland_output.cpp @@ -14,9 +14,9 @@ #include "wayland_display.h" #include "wayland_server.h" -#include "kwingltexture.h" -#include "kwinglutils.h" -#include "renderviewport.h" +#include "libkwineffects/kwingltexture.h" +#include "libkwineffects/kwinglutils.h" +#include "libkwineffects/renderviewport.h" #include #include diff --git a/src/backends/wayland/wayland_qpainter_backend.h b/src/backends/wayland/wayland_qpainter_backend.h index e4dff25761..8094b9e5c5 100644 --- a/src/backends/wayland/wayland_qpainter_backend.h +++ b/src/backends/wayland/wayland_qpainter_backend.h @@ -10,7 +10,7 @@ #pragma once #include "core/outputlayer.h" -#include "qpainterbackend.h" +#include "platformsupport/scenes/qpainter/qpainterbackend.h" #include "utils/damagejournal.h" #include diff --git a/src/backends/x11/standalone/x11_standalone_egl_backend.cpp b/src/backends/x11/standalone/x11_standalone_egl_backend.cpp index a7b3e0f492..c9c8f269c9 100644 --- a/src/backends/x11/standalone/x11_standalone_egl_backend.cpp +++ b/src/backends/x11/standalone/x11_standalone_egl_backend.cpp @@ -9,11 +9,11 @@ #include "core/outputbackend.h" #include "core/overlaywindow.h" #include "core/renderloop_p.h" -#include "kwinglplatform.h" +#include "libkwineffects/kwinglplatform.h" #include "options.h" +#include "platformsupport/vsyncconvenience/softwarevsyncmonitor.h" #include "scene/surfaceitem_x11.h" #include "scene/workspacescene.h" -#include "softwarevsyncmonitor.h" #include "workspace.h" #include "x11_standalone_backend.h" #include "x11_standalone_logging.h" diff --git a/src/backends/x11/standalone/x11_standalone_egl_backend.h b/src/backends/x11/standalone/x11_standalone_egl_backend.h index a495fd98f3..eb8770c408 100644 --- a/src/backends/x11/standalone/x11_standalone_egl_backend.h +++ b/src/backends/x11/standalone/x11_standalone_egl_backend.h @@ -11,8 +11,8 @@ #include "platformsupport/scenes/opengl/openglsurfacetexture_x11.h" #include "utils/damagejournal.h" -#include -#include +#include "libkwineffects/kwingltexture.h" +#include "libkwineffects/kwingltexture_p.h" namespace KWin { diff --git a/src/backends/x11/standalone/x11_standalone_glx_backend.cpp b/src/backends/x11/standalone/x11_standalone_glx_backend.cpp index a769556284..bfda4a4581 100644 --- a/src/backends/x11/standalone/x11_standalone_glx_backend.cpp +++ b/src/backends/x11/standalone/x11_standalone_glx_backend.cpp @@ -14,7 +14,7 @@ // own #include "x11_standalone_glx_backend.h" #include "../common/kwinxrenderutils.h" -#include "softwarevsyncmonitor.h" +#include "platformsupport/vsyncconvenience/softwarevsyncmonitor.h" #include "x11_standalone_backend.h" #include "x11_standalone_glx_context_attribute_builder.h" #include "x11_standalone_glxconvenience.h" @@ -33,9 +33,9 @@ #include "utils/xcbutils.h" #include "workspace.h" // kwin libs -#include -#include -#include +#include "libkwineffects/kwinglplatform.h" +#include "libkwineffects/kwinglutils.h" +#include "libkwineffects/kwinoffscreenquickview.h" // Qt #include #include diff --git a/src/backends/x11/standalone/x11_standalone_glx_backend.h b/src/backends/x11/standalone/x11_standalone_glx_backend.h index 3ea308ab6f..5bbbc85c06 100644 --- a/src/backends/x11/standalone/x11_standalone_glx_backend.h +++ b/src/backends/x11/standalone/x11_standalone_glx_backend.h @@ -8,8 +8,8 @@ */ #pragma once #include "core/outputlayer.h" -#include "openglbackend.h" -#include "openglsurfacetexture_x11.h" +#include "platformsupport/scenes/opengl/openglbackend.h" +#include "platformsupport/scenes/opengl/openglsurfacetexture_x11.h" #include "utils/damagejournal.h" #include "x11eventfilter.h" @@ -17,8 +17,8 @@ #include #include -#include -#include +#include "libkwineffects/kwingltexture.h" +#include "libkwineffects/kwingltexture_p.h" #include #include diff --git a/src/backends/x11/standalone/x11_standalone_omlsynccontrolvsyncmonitor.h b/src/backends/x11/standalone/x11_standalone_omlsynccontrolvsyncmonitor.h index 6e0cf4b3ce..ea2aed9b49 100644 --- a/src/backends/x11/standalone/x11_standalone_omlsynccontrolvsyncmonitor.h +++ b/src/backends/x11/standalone/x11_standalone_omlsynccontrolvsyncmonitor.h @@ -6,7 +6,7 @@ #pragma once -#include "vsyncmonitor.h" +#include "platformsupport/vsyncconvenience/vsyncmonitor.h" #include #include diff --git a/src/backends/x11/standalone/x11_standalone_overlaywindow.cpp b/src/backends/x11/standalone/x11_standalone_overlaywindow.cpp index f3ac72c623..25c2abf9e4 100644 --- a/src/backends/x11/standalone/x11_standalone_overlaywindow.cpp +++ b/src/backends/x11/standalone/x11_standalone_overlaywindow.cpp @@ -10,7 +10,7 @@ #include "x11_standalone_overlaywindow.h" #include "composite.h" -#include "kwinglobals.h" +#include "libkwineffects/kwinglobals.h" #include "scene/workspacescene.h" #include "utils/common.h" #include "utils/xcbutils.h" diff --git a/src/backends/x11/standalone/x11_standalone_sgivideosyncvsyncmonitor.h b/src/backends/x11/standalone/x11_standalone_sgivideosyncvsyncmonitor.h index bf2f116f94..99e1b2d9d9 100644 --- a/src/backends/x11/standalone/x11_standalone_sgivideosyncvsyncmonitor.h +++ b/src/backends/x11/standalone/x11_standalone_sgivideosyncvsyncmonitor.h @@ -6,7 +6,7 @@ #pragma once -#include "vsyncmonitor.h" +#include "platformsupport/vsyncconvenience/vsyncmonitor.h" #include #include diff --git a/src/backends/x11/standalone/x11_standalone_xinputintegration.cpp b/src/backends/x11/standalone/x11_standalone_xinputintegration.cpp index 8fdeff4567..32a9a2ad4f 100644 --- a/src/backends/x11/standalone/x11_standalone_xinputintegration.cpp +++ b/src/backends/x11/standalone/x11_standalone_xinputintegration.cpp @@ -19,10 +19,10 @@ #include "../common/ge_event_mem_mover.h" #include "input.h" +#include "libkwineffects/kwinglobals.h" #include "modifier_only_shortcuts.h" #include "workspace.h" #include "x11eventfilter.h" -#include #include #include diff --git a/src/backends/x11/windowed/x11_windowed_egl_backend.cpp b/src/backends/x11/windowed/x11_windowed_egl_backend.cpp index fb88bc6c58..9047b7f783 100644 --- a/src/backends/x11/windowed/x11_windowed_egl_backend.cpp +++ b/src/backends/x11/windowed/x11_windowed_egl_backend.cpp @@ -12,8 +12,8 @@ #include "x11_windowed_output.h" #include "../../drm/gbm_dmabuf.h" -#include "basiceglsurfacetexture_internal.h" -#include "basiceglsurfacetexture_wayland.h" +#include "platformsupport/scenes/opengl/basiceglsurfacetexture_internal.h" +#include "platformsupport/scenes/opengl/basiceglsurfacetexture_wayland.h" #include #include diff --git a/src/backends/x11/windowed/x11_windowed_egl_backend.h b/src/backends/x11/windowed/x11_windowed_egl_backend.h index 42a0c1aa0b..ee432381a5 100644 --- a/src/backends/x11/windowed/x11_windowed_egl_backend.h +++ b/src/backends/x11/windowed/x11_windowed_egl_backend.h @@ -9,7 +9,7 @@ #pragma once #include "core/outputlayer.h" -#include "kwinglutils.h" +#include "libkwineffects/kwinglutils.h" #include "platformsupport/scenes/opengl/abstract_egl_backend.h" #include diff --git a/src/backends/x11/windowed/x11_windowed_output.cpp b/src/backends/x11/windowed/x11_windowed_output.cpp index d0adb36da9..b0c493fb1b 100644 --- a/src/backends/x11/windowed/x11_windowed_output.cpp +++ b/src/backends/x11/windowed/x11_windowed_output.cpp @@ -17,7 +17,7 @@ #include "core/renderlayer.h" #include "core/renderloop_p.h" #include "cursorsource.h" -#include "renderviewport.h" +#include "libkwineffects/renderviewport.h" #include "scene/cursorscene.h" #include diff --git a/src/backends/x11/windowed/x11_windowed_qpainter_backend.h b/src/backends/x11/windowed/x11_windowed_qpainter_backend.h index 4dec8f3173..36ba217e10 100644 --- a/src/backends/x11/windowed/x11_windowed_qpainter_backend.h +++ b/src/backends/x11/windowed/x11_windowed_qpainter_backend.h @@ -9,7 +9,7 @@ #pragma once #include "core/outputlayer.h" -#include "qpainterbackend.h" +#include "platformsupport/scenes/qpainter/qpainterbackend.h" #include #include diff --git a/src/colors/colordevice.h b/src/colors/colordevice.h index 154d1b22fc..9e78fa4286 100644 --- a/src/colors/colordevice.h +++ b/src/colors/colordevice.h @@ -6,7 +6,7 @@ #pragma once -#include +#include "libkwineffects/kwinglobals.h" #include #include diff --git a/src/colors/colormanager.h b/src/colors/colormanager.h index 9e624331e0..d6c36ced29 100644 --- a/src/colors/colormanager.h +++ b/src/colors/colormanager.h @@ -6,7 +6,7 @@ #pragma once -#include "kwinglobals.h" +#include "libkwineffects/kwinglobals.h" #include #include diff --git a/src/composite.cpp b/src/composite.cpp index 8d024cfd93..1ba83894b5 100644 --- a/src/composite.cpp +++ b/src/composite.cpp @@ -23,8 +23,8 @@ #include "effects.h" #include "ftrace.h" #include "internalwindow.h" -#include "openglbackend.h" -#include "qpainterbackend.h" +#include "platformsupport/scenes/opengl/openglbackend.h" +#include "platformsupport/scenes/qpainter/qpainterbackend.h" #include "scene/cursorscene.h" #include "scene/itemrenderer_opengl.h" #include "scene/itemrenderer_qpainter.h" @@ -42,8 +42,8 @@ #include "x11syncmanager.h" #include "x11window.h" -#include -#include +#include "libkwineffects/kwinglplatform.h" +#include "libkwineffects/kwingltexture.h" #include #include diff --git a/src/composite.h b/src/composite.h index e326d00889..2256d6590b 100644 --- a/src/composite.h +++ b/src/composite.h @@ -9,7 +9,7 @@ */ #pragma once -#include +#include "libkwineffects/kwinglobals.h" #include #include diff --git a/src/core/outputbackend.cpp b/src/core/outputbackend.cpp index 8ee42c103b..c24ddcf93b 100644 --- a/src/core/outputbackend.cpp +++ b/src/core/outputbackend.cpp @@ -11,10 +11,10 @@ #include "dmabuftexture.h" #include "inputbackend.h" -#include "openglbackend.h" #include "output.h" #include "outputconfiguration.h" -#include "qpainterbackend.h" +#include "platformsupport/scenes/opengl/openglbackend.h" +#include "platformsupport/scenes/qpainter/qpainterbackend.h" namespace KWin { diff --git a/src/core/outputbackend.h b/src/core/outputbackend.h index c38e28c36b..eb52e8176a 100644 --- a/src/core/outputbackend.h +++ b/src/core/outputbackend.h @@ -9,9 +9,9 @@ #pragma once +#include "libkwineffects/kwinglobals.h" #include #include -#include #include diff --git a/src/core/outputlayer.h b/src/core/outputlayer.h index 784ffd2c2d..3eba3fbf71 100644 --- a/src/core/outputlayer.h +++ b/src/core/outputlayer.h @@ -7,7 +7,7 @@ #pragma once #include "kwin_export.h" -#include "rendertarget.h" +#include "libkwineffects/rendertarget.h" #include #include diff --git a/src/core/renderbackend.h b/src/core/renderbackend.h index 41d6537bb0..8eaf6b7fd2 100644 --- a/src/core/renderbackend.h +++ b/src/core/renderbackend.h @@ -6,8 +6,8 @@ #pragma once -#include "kwinglobals.h" -#include "rendertarget.h" +#include "libkwineffects/kwinglobals.h" +#include "libkwineffects/rendertarget.h" #include diff --git a/src/core/renderjournal.h b/src/core/renderjournal.h index dcd73ad347..cbc90379f9 100644 --- a/src/core/renderjournal.h +++ b/src/core/renderjournal.h @@ -6,7 +6,7 @@ #pragma once -#include "kwinglobals.h" +#include "libkwineffects/kwinglobals.h" #include #include diff --git a/src/core/renderloop.h b/src/core/renderloop.h index bab0118092..02f86c8f0c 100644 --- a/src/core/renderloop.h +++ b/src/core/renderloop.h @@ -6,7 +6,7 @@ #pragma once -#include "kwinglobals.h" +#include "libkwineffects/kwinglobals.h" #include "options.h" #include diff --git a/src/core/session.h b/src/core/session.h index 7bcf8f221f..3b37178499 100644 --- a/src/core/session.h +++ b/src/core/session.h @@ -6,7 +6,7 @@ #pragma once -#include +#include "libkwineffects/kwinglobals.h" #include #include diff --git a/src/cursor.h b/src/cursor.h index 3eec5912f8..47aabeaf12 100644 --- a/src/cursor.h +++ b/src/cursor.h @@ -8,7 +8,7 @@ */ #pragma once // kwin -#include +#include "libkwineffects/kwinglobals.h" // Qt #include #include diff --git a/src/cursordelegate_opengl.cpp b/src/cursordelegate_opengl.cpp index f420312b4d..29ac142630 100644 --- a/src/cursordelegate_opengl.cpp +++ b/src/cursordelegate_opengl.cpp @@ -9,10 +9,10 @@ #include "core/output.h" #include "core/renderlayer.h" #include "cursor.h" -#include "kwingltexture.h" -#include "kwinglutils.h" -#include "rendertarget.h" -#include "renderviewport.h" +#include "libkwineffects/kwingltexture.h" +#include "libkwineffects/kwinglutils.h" +#include "libkwineffects/rendertarget.h" +#include "libkwineffects/renderviewport.h" #include "scene/cursorscene.h" #include diff --git a/src/cursordelegate_qpainter.cpp b/src/cursordelegate_qpainter.cpp index 4829905f1f..76ce756366 100644 --- a/src/cursordelegate_qpainter.cpp +++ b/src/cursordelegate_qpainter.cpp @@ -9,8 +9,8 @@ #include "core/output.h" #include "core/renderlayer.h" #include "cursor.h" -#include "rendertarget.h" -#include "renderviewport.h" +#include "libkwineffects/rendertarget.h" +#include "libkwineffects/renderviewport.h" #include "scene/cursorscene.h" #include diff --git a/src/debug_console.cpp b/src/debug_console.cpp index d8f4a0143c..7b4056d6c9 100644 --- a/src/debug_console.cpp +++ b/src/debug_console.cpp @@ -12,6 +12,8 @@ #include "input_event.h" #include "internalwindow.h" #include "keyboard_input.h" +#include "libkwineffects/kwinglplatform.h" +#include "libkwineffects/kwinglutils.h" #include "main.h" #include "platformsupport/scenes/opengl/openglbackend.h" #include "unmanaged.h" @@ -33,8 +35,6 @@ #include "x11window.h" #include "xkb.h" #include -#include -#include #include "ui_debug_console.h" diff --git a/src/decorations/decorationbridge.h b/src/decorations/decorationbridge.h index 2e47581acf..9b9bdd5aae 100644 --- a/src/decorations/decorationbridge.h +++ b/src/decorations/decorationbridge.h @@ -8,7 +8,7 @@ */ #pragma once -#include +#include "libkwineffects/kwinglobals.h" #include diff --git a/src/dmabuftexture.cpp b/src/dmabuftexture.cpp index 572748b95c..88221939c7 100644 --- a/src/dmabuftexture.cpp +++ b/src/dmabuftexture.cpp @@ -6,7 +6,7 @@ #include "dmabuftexture.h" -#include "kwinglutils.h" +#include "libkwineffects/kwinglutils.h" #include diff --git a/src/effectloader.cpp b/src/effectloader.cpp index ed95c4cf88..4724666f3b 100644 --- a/src/effectloader.cpp +++ b/src/effectloader.cpp @@ -11,10 +11,10 @@ // config #include // KWin +#include "libkwineffects/kwineffects.h" #include "plugin.h" #include "scripting/scriptedeffect.h" #include "utils/common.h" -#include // KDE #include #include diff --git a/src/effects.cpp b/src/effects.cpp index d7efd7c2c4..10fed28a5b 100644 --- a/src/effects.cpp +++ b/src/effects.cpp @@ -31,7 +31,7 @@ #include "unmanaged.h" #include "x11window.h" #if KWIN_BUILD_TABBOX -#include "tabbox.h" +#include "tabbox/tabbox.h" #endif #include "screenedge.h" #include "scripting/scriptedeffect.h" diff --git a/src/effects.h b/src/effects.h index b82f903a57..c5ffd422ed 100644 --- a/src/effects.h +++ b/src/effects.h @@ -10,9 +10,9 @@ #pragma once -#include "kwineffects.h" +#include "libkwineffects/kwineffects.h" -#include "kwinoffscreenquickview.h" +#include "libkwineffects/kwinoffscreenquickview.h" #include "scene/workspacescene.h" #include diff --git a/src/effects/backgroundcontrast/contrast.cpp b/src/effects/backgroundcontrast/contrast.cpp index f3e0e8454f..ee141bdf51 100644 --- a/src/effects/backgroundcontrast/contrast.cpp +++ b/src/effects/backgroundcontrast/contrast.cpp @@ -10,8 +10,8 @@ #include "contrastshader.h" // KConfigSkeleton -#include "rendertarget.h" -#include "renderviewport.h" +#include "libkwineffects/rendertarget.h" +#include "libkwineffects/renderviewport.h" #include "utils/xcbutils.h" #include "wayland/contrast_interface.h" #include "wayland/display.h" diff --git a/src/effects/backgroundcontrast/contrast.h b/src/effects/backgroundcontrast/contrast.h index 21cce412b1..4b6238cd93 100644 --- a/src/effects/backgroundcontrast/contrast.h +++ b/src/effects/backgroundcontrast/contrast.h @@ -7,9 +7,9 @@ #pragma once -#include -#include -#include +#include "libkwineffects/kwineffects.h" +#include "libkwineffects/kwinglplatform.h" +#include "libkwineffects/kwinglutils.h" #include #include diff --git a/src/effects/backgroundcontrast/contrastshader.cpp b/src/effects/backgroundcontrast/contrastshader.cpp index ca7d047e16..c7e6589a82 100644 --- a/src/effects/backgroundcontrast/contrastshader.cpp +++ b/src/effects/backgroundcontrast/contrastshader.cpp @@ -7,8 +7,8 @@ #include "contrastshader.h" -#include -#include +#include "libkwineffects/kwineffects.h" +#include "libkwineffects/kwinglplatform.h" #include #include diff --git a/src/effects/backgroundcontrast/contrastshader.h b/src/effects/backgroundcontrast/contrastshader.h index 96e5fc0528..491d7f1921 100644 --- a/src/effects/backgroundcontrast/contrastshader.h +++ b/src/effects/backgroundcontrast/contrastshader.h @@ -7,7 +7,7 @@ #pragma once -#include +#include "libkwineffects/kwinglutils.h" class QMatrix4x4; diff --git a/src/effects/blendchanges/blendchanges.cpp b/src/effects/blendchanges/blendchanges.cpp index 8e7a8fe91f..a86918e284 100644 --- a/src/effects/blendchanges/blendchanges.cpp +++ b/src/effects/blendchanges/blendchanges.cpp @@ -8,7 +8,7 @@ */ // own #include "blendchanges.h" -#include "kwinglutils.h" +#include "libkwineffects/kwinglutils.h" #include #include diff --git a/src/effects/blendchanges/blendchanges.h b/src/effects/blendchanges/blendchanges.h index ede8853946..4a90e296d3 100644 --- a/src/effects/blendchanges/blendchanges.h +++ b/src/effects/blendchanges/blendchanges.h @@ -7,9 +7,9 @@ SPDX-License-Identifier: GPL-2.0-or-later */ #pragma once +#include "libkwineffects/kwineffects.h" +#include "libkwineffects/kwinoffscreeneffect.h" #include -#include -#include namespace KWin { diff --git a/src/effects/blur/blur.cpp b/src/effects/blur/blur.cpp index 71b1567a4e..c5679db77e 100644 --- a/src/effects/blur/blur.cpp +++ b/src/effects/blur/blur.cpp @@ -11,8 +11,8 @@ // KConfigSkeleton #include "blurconfig.h" -#include "rendertarget.h" -#include "renderviewport.h" +#include "libkwineffects/rendertarget.h" +#include "libkwineffects/renderviewport.h" #include "utils/xcbutils.h" #include "wayland/blur_interface.h" #include "wayland/display.h" diff --git a/src/effects/blur/blur.h b/src/effects/blur/blur.h index 3525429733..dba82186ed 100644 --- a/src/effects/blur/blur.h +++ b/src/effects/blur/blur.h @@ -7,9 +7,9 @@ #pragma once -#include -#include -#include +#include "libkwineffects/kwineffects.h" +#include "libkwineffects/kwinglplatform.h" +#include "libkwineffects/kwinglutils.h" #include #include diff --git a/src/effects/blur/blurshader.cpp b/src/effects/blur/blurshader.cpp index 5f3da80808..a9a594005a 100644 --- a/src/effects/blur/blurshader.cpp +++ b/src/effects/blur/blurshader.cpp @@ -7,7 +7,7 @@ #include "blurshader.h" -#include +#include "libkwineffects/kwineffects.h" static void ensureResources() { diff --git a/src/effects/blur/blurshader.h b/src/effects/blur/blurshader.h index 986e4ca8fd..6b86761717 100644 --- a/src/effects/blur/blurshader.h +++ b/src/effects/blur/blurshader.h @@ -7,7 +7,7 @@ #pragma once -#include +#include "libkwineffects/kwinglutils.h" #include #include diff --git a/src/effects/colorpicker/colorpicker.cpp b/src/effects/colorpicker/colorpicker.cpp index 9f6f582e68..07247bfb52 100644 --- a/src/effects/colorpicker/colorpicker.cpp +++ b/src/effects/colorpicker/colorpicker.cpp @@ -7,13 +7,13 @@ SPDX-License-Identifier: GPL-2.0-or-later */ #include "colorpicker.h" +#include "libkwineffects/kwinglutils.h" +#include "libkwineffects/kwinglutils_funcs.h" +#include "libkwineffects/rendertarget.h" +#include "libkwineffects/renderviewport.h" #include #include #include -#include -#include -#include -#include Q_DECLARE_METATYPE(QColor) diff --git a/src/effects/colorpicker/colorpicker.h b/src/effects/colorpicker/colorpicker.h index 292b647fa9..a318a39807 100644 --- a/src/effects/colorpicker/colorpicker.h +++ b/src/effects/colorpicker/colorpicker.h @@ -8,12 +8,12 @@ */ #pragma once +#include "libkwineffects/kwineffects.h" #include #include #include #include #include -#include namespace KWin { diff --git a/src/effects/desktopgrid/desktopgrideffect.h b/src/effects/desktopgrid/desktopgrideffect.h index eb87d3f464..f910216502 100644 --- a/src/effects/desktopgrid/desktopgrideffect.h +++ b/src/effects/desktopgrid/desktopgrideffect.h @@ -6,7 +6,7 @@ #pragma once -#include +#include "libkwineffects/kwinquickeffect.h" namespace KWin { diff --git a/src/effects/diminactive/diminactive.h b/src/effects/diminactive/diminactive.h index fb551d35dc..6496b991c2 100644 --- a/src/effects/diminactive/diminactive.h +++ b/src/effects/diminactive/diminactive.h @@ -12,7 +12,7 @@ #pragma once // kwineffects -#include +#include "libkwineffects/kwineffects.h" namespace KWin { diff --git a/src/effects/fallapart/fallapart.h b/src/effects/fallapart/fallapart.h index 6b11948ca8..745038f56f 100644 --- a/src/effects/fallapart/fallapart.h +++ b/src/effects/fallapart/fallapart.h @@ -9,7 +9,7 @@ #pragma once -#include +#include "libkwineffects/kwinoffscreeneffect.h" namespace KWin { diff --git a/src/effects/glide/glide.cpp b/src/effects/glide/glide.cpp index 31b3bed878..c297a2a7ba 100644 --- a/src/effects/glide/glide.cpp +++ b/src/effects/glide/glide.cpp @@ -16,8 +16,8 @@ // KConfigSkeleton #include "glideconfig.h" -#include "rendertarget.h" -#include "renderviewport.h" +#include "libkwineffects/rendertarget.h" +#include "libkwineffects/renderviewport.h" // Qt #include diff --git a/src/effects/glide/glide.h b/src/effects/glide/glide.h index 2206ba628c..d8c117b334 100644 --- a/src/effects/glide/glide.h +++ b/src/effects/glide/glide.h @@ -13,7 +13,7 @@ #pragma once // kwineffects -#include +#include "libkwineffects/kwineffects.h" namespace KWin { diff --git a/src/effects/highlightwindow/highlightwindow.h b/src/effects/highlightwindow/highlightwindow.h index d563caf9af..3c307a64a7 100644 --- a/src/effects/highlightwindow/highlightwindow.h +++ b/src/effects/highlightwindow/highlightwindow.h @@ -9,7 +9,7 @@ #pragma once -#include +#include "libkwineffects/kwinanimationeffect.h" namespace KWin { diff --git a/src/effects/invert/invert.cpp b/src/effects/invert/invert.cpp index 3805cd9d1b..f279712ee3 100644 --- a/src/effects/invert/invert.cpp +++ b/src/effects/invert/invert.cpp @@ -10,13 +10,13 @@ #include "invert.h" +#include "libkwineffects/kwinglplatform.h" +#include "libkwineffects/kwinglutils.h" #include #include #include #include #include -#include -#include #include diff --git a/src/effects/invert/invert.h b/src/effects/invert/invert.h index e02696129e..4df220fea9 100644 --- a/src/effects/invert/invert.h +++ b/src/effects/invert/invert.h @@ -10,7 +10,7 @@ #pragma once -#include +#include "libkwineffects/kwinoffscreeneffect.h" namespace KWin { diff --git a/src/effects/kscreen/kscreen.h b/src/effects/kscreen/kscreen.h index ff1609d3fc..1a96426a04 100644 --- a/src/effects/kscreen/kscreen.h +++ b/src/effects/kscreen/kscreen.h @@ -8,7 +8,7 @@ */ #pragma once -#include +#include "libkwineffects/kwineffects.h" namespace KWin { diff --git a/src/effects/magiclamp/magiclamp.h b/src/effects/magiclamp/magiclamp.h index 4bef2b2b04..9bba8bba65 100644 --- a/src/effects/magiclamp/magiclamp.h +++ b/src/effects/magiclamp/magiclamp.h @@ -9,7 +9,7 @@ #pragma once -#include +#include "libkwineffects/kwinoffscreeneffect.h" namespace KWin { diff --git a/src/effects/magnifier/magnifier.cpp b/src/effects/magnifier/magnifier.cpp index 2c48d43167..5af45b5a8b 100644 --- a/src/effects/magnifier/magnifier.cpp +++ b/src/effects/magnifier/magnifier.cpp @@ -17,9 +17,9 @@ #include #include +#include "libkwineffects/kwinglutils.h" +#include "libkwineffects/renderviewport.h" #include -#include -#include namespace KWin { diff --git a/src/effects/magnifier/magnifier.h b/src/effects/magnifier/magnifier.h index aee8d3fb72..de27b26e07 100644 --- a/src/effects/magnifier/magnifier.h +++ b/src/effects/magnifier/magnifier.h @@ -10,7 +10,7 @@ #pragma once -#include +#include "libkwineffects/kwineffects.h" namespace KWin { diff --git a/src/effects/mouseclick/mouseclick.cpp b/src/effects/mouseclick/mouseclick.cpp index f0c88acc72..a438470a76 100644 --- a/src/effects/mouseclick/mouseclick.cpp +++ b/src/effects/mouseclick/mouseclick.cpp @@ -11,7 +11,7 @@ // KConfigSkeleton #include "mouseclickconfig.h" -#include "renderviewport.h" +#include "libkwineffects/renderviewport.h" #include diff --git a/src/effects/mouseclick/mouseclick.h b/src/effects/mouseclick/mouseclick.h index bc5f9041ca..4b6e50d6fa 100644 --- a/src/effects/mouseclick/mouseclick.h +++ b/src/effects/mouseclick/mouseclick.h @@ -9,12 +9,12 @@ #pragma once +#include "libkwineffects/kwineffects.h" +#include "libkwineffects/kwinglutils.h" #include #include #include #include -#include -#include namespace KWin { diff --git a/src/effects/mousemark/mousemark.cpp b/src/effects/mousemark/mousemark.cpp index 38e66a85cd..08740e014a 100644 --- a/src/effects/mousemark/mousemark.cpp +++ b/src/effects/mousemark/mousemark.cpp @@ -13,12 +13,12 @@ // KConfigSkeleton #include "mousemarkconfig.h" +#include "libkwineffects/kwinglplatform.h" +#include "libkwineffects/renderviewport.h" #include #include #include #include -#include -#include #include diff --git a/src/effects/mousemark/mousemark.h b/src/effects/mousemark/mousemark.h index 7320acfbee..bf42663159 100644 --- a/src/effects/mousemark/mousemark.h +++ b/src/effects/mousemark/mousemark.h @@ -9,8 +9,8 @@ #pragma once -#include -#include +#include "libkwineffects/kwineffects.h" +#include "libkwineffects/kwinglutils.h" namespace KWin { diff --git a/src/effects/outputlocator/outputlocator.cpp b/src/effects/outputlocator/outputlocator.cpp index 3aeca5eeff..2d79819ec6 100644 --- a/src/effects/outputlocator/outputlocator.cpp +++ b/src/effects/outputlocator/outputlocator.cpp @@ -6,8 +6,8 @@ #include "outputlocator.h" +#include "libkwineffects/kwinoffscreenquickview.h" #include -#include #include diff --git a/src/effects/outputlocator/outputlocator.h b/src/effects/outputlocator/outputlocator.h index e63b52929e..8278241a67 100644 --- a/src/effects/outputlocator/outputlocator.h +++ b/src/effects/outputlocator/outputlocator.h @@ -6,7 +6,7 @@ #pragma once -#include +#include "libkwineffects/kwineffects.h" #include diff --git a/src/effects/overview/overvieweffect.h b/src/effects/overview/overvieweffect.h index d1f8582179..9ae86ade23 100644 --- a/src/effects/overview/overvieweffect.h +++ b/src/effects/overview/overvieweffect.h @@ -6,7 +6,7 @@ #pragma once -#include +#include "libkwineffects/kwinquickeffect.h" namespace KWin { diff --git a/src/effects/private/expoarea.h b/src/effects/private/expoarea.h index c4a191d906..5fb774c5c8 100644 --- a/src/effects/private/expoarea.h +++ b/src/effects/private/expoarea.h @@ -6,7 +6,7 @@ #pragma once -#include +#include "libkwineffects/kwineffects.h" namespace KWin { diff --git a/src/effects/screenedge/screenedgeeffect.cpp b/src/effects/screenedge/screenedgeeffect.cpp index 3749654029..f1b53c85ac 100644 --- a/src/effects/screenedge/screenedgeeffect.cpp +++ b/src/effects/screenedge/screenedgeeffect.cpp @@ -8,9 +8,9 @@ */ #include "screenedgeeffect.h" // KWin -#include -#include -#include +#include "libkwineffects/kwingltexture.h" +#include "libkwineffects/kwinglutils.h" +#include "libkwineffects/renderviewport.h" // KDE #include // Qt diff --git a/src/effects/screenedge/screenedgeeffect.h b/src/effects/screenedge/screenedgeeffect.h index 7efa550267..b818445282 100644 --- a/src/effects/screenedge/screenedgeeffect.h +++ b/src/effects/screenedge/screenedgeeffect.h @@ -7,7 +7,7 @@ SPDX-License-Identifier: GPL-2.0-or-later */ #pragma once -#include +#include "libkwineffects/kwineffects.h" class QTimer; namespace Plasma diff --git a/src/effects/screenshot/screenshot.cpp b/src/effects/screenshot/screenshot.cpp index 15bd9921cb..9aa98122ce 100644 --- a/src/effects/screenshot/screenshot.cpp +++ b/src/effects/screenshot/screenshot.cpp @@ -11,10 +11,10 @@ #include "screenshot.h" #include "screenshotdbusinterface2.h" -#include -#include -#include -#include +#include "libkwineffects/kwinglplatform.h" +#include "libkwineffects/kwinglutils.h" +#include "libkwineffects/rendertarget.h" +#include "libkwineffects/renderviewport.h" #include diff --git a/src/effects/screenshot/screenshot.h b/src/effects/screenshot/screenshot.h index 36e85fdd2c..bae051581a 100644 --- a/src/effects/screenshot/screenshot.h +++ b/src/effects/screenshot/screenshot.h @@ -10,7 +10,7 @@ #pragma once -#include +#include "libkwineffects/kwineffects.h" #include #include diff --git a/src/effects/screenshot/screenshotdbusinterface2.h b/src/effects/screenshot/screenshotdbusinterface2.h index 7e202f9271..faba216965 100644 --- a/src/effects/screenshot/screenshotdbusinterface2.h +++ b/src/effects/screenshot/screenshotdbusinterface2.h @@ -7,7 +7,7 @@ #pragma once -#include "screenshot/screenshot.h" +#include "screenshot.h" #include #include diff --git a/src/effects/screentransform/screentransform.cpp b/src/effects/screentransform/screentransform.cpp index b33e79aeac..d959294197 100644 --- a/src/effects/screentransform/screentransform.cpp +++ b/src/effects/screentransform/screentransform.cpp @@ -8,9 +8,9 @@ */ // own #include "screentransform.h" -#include "kwinglutils.h" -#include "rendertarget.h" -#include "renderviewport.h" +#include "libkwineffects/kwinglutils.h" +#include "libkwineffects/rendertarget.h" +#include "libkwineffects/renderviewport.h" #include diff --git a/src/effects/screentransform/screentransform.h b/src/effects/screentransform/screentransform.h index 9716c5f7fc..86966903b6 100644 --- a/src/effects/screentransform/screentransform.h +++ b/src/effects/screentransform/screentransform.h @@ -8,7 +8,7 @@ */ #pragma once -#include +#include "libkwineffects/kwineffects.h" namespace KWin { diff --git a/src/effects/sheet/sheet.cpp b/src/effects/sheet/sheet.cpp index 835f28ba44..687fb5e602 100644 --- a/src/effects/sheet/sheet.cpp +++ b/src/effects/sheet/sheet.cpp @@ -15,7 +15,7 @@ // KConfigSkeleton #include "sheetconfig.h" -#include "renderviewport.h" +#include "libkwineffects/renderviewport.h" // Qt #include diff --git a/src/effects/sheet/sheet.h b/src/effects/sheet/sheet.h index 0596550c0c..56f0ba79ab 100644 --- a/src/effects/sheet/sheet.h +++ b/src/effects/sheet/sheet.h @@ -12,7 +12,7 @@ #pragma once // kwineffects -#include +#include "libkwineffects/kwineffects.h" namespace KWin { diff --git a/src/effects/showfps/showfpseffect.cpp b/src/effects/showfps/showfpseffect.cpp index 9e08dcff14..d01f81f174 100644 --- a/src/effects/showfps/showfpseffect.cpp +++ b/src/effects/showfps/showfpseffect.cpp @@ -7,7 +7,7 @@ */ #include "showfpseffect.h" -#include "renderviewport.h" +#include "libkwineffects/renderviewport.h" #include diff --git a/src/effects/showfps/showfpseffect.h b/src/effects/showfps/showfpseffect.h index db6d6e1145..f26e6bc38d 100644 --- a/src/effects/showfps/showfpseffect.h +++ b/src/effects/showfps/showfpseffect.h @@ -8,8 +8,8 @@ #pragma once -#include -#include +#include "libkwineffects/kwineffects.h" +#include "libkwineffects/kwinoffscreenquickview.h" #include diff --git a/src/effects/showpaint/showpaint.cpp b/src/effects/showpaint/showpaint.cpp index 4531321429..440fa13fcc 100644 --- a/src/effects/showpaint/showpaint.cpp +++ b/src/effects/showpaint/showpaint.cpp @@ -10,8 +10,8 @@ #include "showpaint.h" -#include -#include +#include "libkwineffects/kwinglutils.h" +#include "libkwineffects/renderviewport.h" #include #include diff --git a/src/effects/showpaint/showpaint.h b/src/effects/showpaint/showpaint.h index d336c200ee..5b4b012686 100644 --- a/src/effects/showpaint/showpaint.h +++ b/src/effects/showpaint/showpaint.h @@ -9,7 +9,7 @@ #pragma once -#include +#include "libkwineffects/kwineffects.h" namespace KWin { diff --git a/src/effects/slide/slide.h b/src/effects/slide/slide.h index 809da7cede..e29a7f1eb3 100644 --- a/src/effects/slide/slide.h +++ b/src/effects/slide/slide.h @@ -12,7 +12,7 @@ #pragma once // kwineffects -#include +#include "libkwineffects/kwineffects.h" #include "springmotion.h" diff --git a/src/effects/slideback/slideback.h b/src/effects/slideback/slideback.h index 1bdce95388..ff0aab4894 100644 --- a/src/effects/slideback/slideback.h +++ b/src/effects/slideback/slideback.h @@ -10,7 +10,7 @@ #pragma once // Include with base class for effects. -#include +#include "libkwineffects/kwineffects.h" namespace KWin { diff --git a/src/effects/slidingpopups/slidingpopups.h b/src/effects/slidingpopups/slidingpopups.h index ace45c42b0..f8d8420409 100644 --- a/src/effects/slidingpopups/slidingpopups.h +++ b/src/effects/slidingpopups/slidingpopups.h @@ -11,7 +11,7 @@ #pragma once // Include with base class for effects. -#include +#include "libkwineffects/kwineffects.h" namespace KWaylandServer { diff --git a/src/effects/snaphelper/snaphelper.cpp b/src/effects/snaphelper/snaphelper.cpp index d5f5a7c9fa..4b5783601e 100644 --- a/src/effects/snaphelper/snaphelper.cpp +++ b/src/effects/snaphelper/snaphelper.cpp @@ -10,8 +10,8 @@ #include "snaphelper.h" -#include -#include +#include "libkwineffects/kwinglutils.h" +#include "libkwineffects/renderviewport.h" #include diff --git a/src/effects/snaphelper/snaphelper.h b/src/effects/snaphelper/snaphelper.h index 5c1cfc33df..1e37a2e839 100644 --- a/src/effects/snaphelper/snaphelper.h +++ b/src/effects/snaphelper/snaphelper.h @@ -10,7 +10,7 @@ #pragma once -#include +#include "libkwineffects/kwineffects.h" namespace KWin { diff --git a/src/effects/startupfeedback/startupfeedback.cpp b/src/effects/startupfeedback/startupfeedback.cpp index 710dcf6481..c7dedfe98b 100644 --- a/src/effects/startupfeedback/startupfeedback.cpp +++ b/src/effects/startupfeedback/startupfeedback.cpp @@ -24,8 +24,8 @@ #include #include // KWin -#include -#include +#include "libkwineffects/kwinglutils.h" +#include "libkwineffects/renderviewport.h" // based on StartupId in KRunner by Lubos Lunak // SPDX-FileCopyrightText: 2001 Lubos Lunak diff --git a/src/effects/startupfeedback/startupfeedback.h b/src/effects/startupfeedback/startupfeedback.h index 8a404294a9..6cf9242d99 100644 --- a/src/effects/startupfeedback/startupfeedback.h +++ b/src/effects/startupfeedback/startupfeedback.h @@ -8,10 +8,10 @@ */ #pragma once +#include "libkwineffects/kwineffects.h" #include #include #include -#include #include diff --git a/src/effects/thumbnailaside/thumbnailaside.cpp b/src/effects/thumbnailaside/thumbnailaside.cpp index 35f4b26fa8..512f462977 100644 --- a/src/effects/thumbnailaside/thumbnailaside.cpp +++ b/src/effects/thumbnailaside/thumbnailaside.cpp @@ -12,7 +12,7 @@ // KConfigSkeleton #include "thumbnailasideconfig.h" -#include "renderviewport.h" +#include "libkwineffects/renderviewport.h" #include #include diff --git a/src/effects/thumbnailaside/thumbnailaside.h b/src/effects/thumbnailaside/thumbnailaside.h index 94dd571275..a6726725d3 100644 --- a/src/effects/thumbnailaside/thumbnailaside.h +++ b/src/effects/thumbnailaside/thumbnailaside.h @@ -16,7 +16,7 @@ #pragma once -#include +#include "libkwineffects/kwineffects.h" #include diff --git a/src/effects/tileseditor/tileseditoreffect.h b/src/effects/tileseditor/tileseditoreffect.h index fdd1059088..6c2fb6722a 100644 --- a/src/effects/tileseditor/tileseditoreffect.h +++ b/src/effects/tileseditor/tileseditoreffect.h @@ -6,7 +6,7 @@ #pragma once -#include +#include "libkwineffects/kwinquickeffect.h" namespace KWin { diff --git a/src/effects/touchpoints/touchpoints.cpp b/src/effects/touchpoints/touchpoints.cpp index 939cbc7e26..9b5c9e6687 100644 --- a/src/effects/touchpoints/touchpoints.cpp +++ b/src/effects/touchpoints/touchpoints.cpp @@ -10,9 +10,9 @@ #include "touchpoints.h" +#include "libkwineffects/kwinglutils.h" +#include "libkwineffects/renderviewport.h" #include -#include -#include #include #include diff --git a/src/effects/touchpoints/touchpoints.h b/src/effects/touchpoints/touchpoints.h index ce4274c9db..d1eb7964fd 100644 --- a/src/effects/touchpoints/touchpoints.h +++ b/src/effects/touchpoints/touchpoints.h @@ -10,7 +10,7 @@ #pragma once -#include +#include "libkwineffects/kwineffects.h" namespace KWin { diff --git a/src/effects/trackmouse/trackmouse.cpp b/src/effects/trackmouse/trackmouse.cpp index 3faf64f5b9..c0a3b5c801 100644 --- a/src/effects/trackmouse/trackmouse.cpp +++ b/src/effects/trackmouse/trackmouse.cpp @@ -19,9 +19,9 @@ #include #include +#include "libkwineffects/kwinglutils.h" +#include "libkwineffects/renderviewport.h" #include -#include -#include #include #include diff --git a/src/effects/trackmouse/trackmouse.h b/src/effects/trackmouse/trackmouse.h index 183ecbe999..de298d3f96 100644 --- a/src/effects/trackmouse/trackmouse.h +++ b/src/effects/trackmouse/trackmouse.h @@ -11,7 +11,7 @@ #pragma once -#include +#include "libkwineffects/kwineffects.h" class QAction; diff --git a/src/effects/windowview/windowviewconfig.kcfgc b/src/effects/windowview/windowviewconfig.kcfgc index 9eb6c04d23..963cc550ea 100644 --- a/src/effects/windowview/windowviewconfig.kcfgc +++ b/src/effects/windowview/windowviewconfig.kcfgc @@ -7,4 +7,4 @@ ClassName=WindowViewConfig NameSpace=KWin Singleton=true Mutators=true -IncludeFiles=kwinglobals.h +IncludeFiles=\"libkwineffects/kwinglobals.h\" diff --git a/src/effects/windowview/windowvieweffect.h b/src/effects/windowview/windowvieweffect.h index 800a5cbf18..17545e9805 100644 --- a/src/effects/windowview/windowvieweffect.h +++ b/src/effects/windowview/windowvieweffect.h @@ -6,7 +6,7 @@ #pragma once -#include +#include "libkwineffects/kwinquickeffect.h" #include diff --git a/src/effects/wobblywindows/wobblywindows.h b/src/effects/wobblywindows/wobblywindows.h index b3b7b50dd1..ece404d25f 100644 --- a/src/effects/wobblywindows/wobblywindows.h +++ b/src/effects/wobblywindows/wobblywindows.h @@ -10,7 +10,7 @@ #pragma once // Include with base class for effects. -#include +#include "libkwineffects/kwinoffscreeneffect.h" namespace KWin { diff --git a/src/effects/zoom/zoom.cpp b/src/effects/zoom/zoom.cpp index d93fd8702d..6969ae6901 100644 --- a/src/effects/zoom/zoom.cpp +++ b/src/effects/zoom/zoom.cpp @@ -24,9 +24,9 @@ #include #include -#include -#include -#include +#include "libkwineffects/kwinglutils.h" +#include "libkwineffects/rendertarget.h" +#include "libkwineffects/renderviewport.h" namespace KWin { diff --git a/src/effects/zoom/zoom.h b/src/effects/zoom/zoom.h index 1610fd20f7..cc19de4a9a 100644 --- a/src/effects/zoom/zoom.h +++ b/src/effects/zoom/zoom.h @@ -12,9 +12,9 @@ #include +#include "libkwineffects/kwineffects.h" #include #include -#include namespace KWin { diff --git a/src/events.cpp b/src/events.cpp index 596d704021..813c92c7e1 100644 --- a/src/events.cpp +++ b/src/events.cpp @@ -21,7 +21,7 @@ #include "workspace.h" #include "x11window.h" #if KWIN_BUILD_TABBOX -#include "tabbox.h" +#include "tabbox/tabbox.h" #endif #include "effects.h" #include "group.h" diff --git a/src/focuschain.h b/src/focuschain.h index 91e171f90d..54a5a7fe08 100644 --- a/src/focuschain.h +++ b/src/focuschain.h @@ -8,7 +8,7 @@ */ #pragma once // KWin -#include +#include "libkwineffects/kwinglobals.h" // Qt #include #include diff --git a/src/ftrace.h b/src/ftrace.h index 8ce3ae9e60..bfbb40fae5 100644 --- a/src/ftrace.h +++ b/src/ftrace.h @@ -9,7 +9,7 @@ #pragma once -#include +#include "libkwineffects/kwinglobals.h" #include #include diff --git a/src/gestures.h b/src/gestures.h index 2abc65ccef..7c1acb2ca8 100644 --- a/src/gestures.h +++ b/src/gestures.h @@ -8,7 +8,7 @@ */ #pragma once -#include "kwinglobals.h" +#include "libkwineffects/kwinglobals.h" #include #include diff --git a/src/globalshortcuts.cpp b/src/globalshortcuts.cpp index 45d2e5701b..ea95cd9ad1 100644 --- a/src/globalshortcuts.cpp +++ b/src/globalshortcuts.cpp @@ -12,7 +12,7 @@ #include // kwin #include "gestures.h" -#include "kwinglobals.h" +#include "libkwineffects/kwinglobals.h" #include "main.h" #include "utils/common.h" // KDE diff --git a/src/globalshortcuts.h b/src/globalshortcuts.h index 50f9a23203..7ed3b7e378 100644 --- a/src/globalshortcuts.h +++ b/src/globalshortcuts.h @@ -8,7 +8,7 @@ */ #pragma once // KWin -#include +#include "libkwineffects/kwinglobals.h" // Qt #include diff --git a/src/input.h b/src/input.h index 5cb86ba68e..ba1d48608a 100644 --- a/src/input.h +++ b/src/input.h @@ -11,10 +11,10 @@ #pragma once #include +#include "libkwineffects/kwinglobals.h" #include #include #include -#include #include #include diff --git a/src/inputmethod.h b/src/inputmethod.h index d887940f54..4ae1361f25 100644 --- a/src/inputmethod.h +++ b/src/inputmethod.h @@ -15,8 +15,8 @@ #include +#include "libkwineffects/kwinglobals.h" #include -#include #include #include diff --git a/src/kcms/desktop/desktopsmodel.h b/src/kcms/desktop/desktopsmodel.h index 1958396079..f90416bc74 100644 --- a/src/kcms/desktop/desktopsmodel.h +++ b/src/kcms/desktop/desktopsmodel.h @@ -9,7 +9,7 @@ #include -#include "../virtualdesktopsdbustypes.h" +#include "virtualdesktopsdbustypes.h" class QDBusArgument; class QDBusMessage; diff --git a/src/kcms/rules/CMakeLists.txt b/src/kcms/rules/CMakeLists.txt index 45880bd42d..718e5f2906 100644 --- a/src/kcms/rules/CMakeLists.txt +++ b/src/kcms/rules/CMakeLists.txt @@ -2,8 +2,6 @@ add_definitions(-DTRANSLATION_DOMAIN=\"kcm_kwinrules\") add_definitions(-DKCMRULES) -include_directories(../../) - set(kwinrules_SRCS ../../rulebooksettings.cpp ../../rules.cpp diff --git a/src/kcms/screenedges/CMakeLists.txt b/src/kcms/screenedges/CMakeLists.txt index c982f24663..b068b5007f 100644 --- a/src/kcms/screenedges/CMakeLists.txt +++ b/src/kcms/screenedges/CMakeLists.txt @@ -1,7 +1,6 @@ # KI18N Translation Domain for this library add_definitions(-DTRANSLATION_DOMAIN=\"kcmkwinscreenedges\") -include_directories(${KWin_SOURCE_DIR}/src/effects) set(kcm_screenedges_SRCS monitor.cpp screenpreviewwidget.cpp diff --git a/src/kcms/screenedges/kwinscreenedge.h b/src/kcms/screenedges/kwinscreenedge.h index 088e05d824..09f60eb49b 100644 --- a/src/kcms/screenedges/kwinscreenedge.h +++ b/src/kcms/screenedges/kwinscreenedge.h @@ -11,7 +11,7 @@ #include -#include "kwinglobals.h" +#include "libkwineffects/kwinglobals.h" namespace KWin { diff --git a/src/kcms/screenedges/kwinscreenedgeeffectsettings.kcfgc b/src/kcms/screenedges/kwinscreenedgeeffectsettings.kcfgc index c1fffd8530..ea34a67d42 100644 --- a/src/kcms/screenedges/kwinscreenedgeeffectsettings.kcfgc +++ b/src/kcms/screenedges/kwinscreenedgeeffectsettings.kcfgc @@ -1,7 +1,7 @@ File=kwinscreenedgeeffectsettings.kcfg NameSpace=KWin ClassName=KWinScreenEdgeEffectSettings -IncludeFiles=kwinglobals.h +IncludeFiles=\"libkwineffects/kwinglobals.h\" Mutators=true DefaultValueGetters=true ParentInConstructor=true diff --git a/src/kcms/screenedges/kwinscreenedgescriptsettings.kcfgc b/src/kcms/screenedges/kwinscreenedgescriptsettings.kcfgc index 6b43ae0bda..a77a5cdd54 100644 --- a/src/kcms/screenedges/kwinscreenedgescriptsettings.kcfgc +++ b/src/kcms/screenedges/kwinscreenedgescriptsettings.kcfgc @@ -1,7 +1,7 @@ File=kwinscreenedgescriptsettings.kcfg NameSpace=KWin ClassName=KWinScreenEdgeScriptSettings -IncludeFiles=kwinglobals.h +IncludeFiles=\"libkwineffects/kwinglobals.h\" Mutators=true DefaultValueGetters=true ParentInConstructor=true diff --git a/src/kcms/screenedges/kwinscreenedgesettings.kcfgc b/src/kcms/screenedges/kwinscreenedgesettings.kcfgc index 23dee5b75b..bdb90cc943 100644 --- a/src/kcms/screenedges/kwinscreenedgesettings.kcfgc +++ b/src/kcms/screenedges/kwinscreenedgesettings.kcfgc @@ -1,7 +1,7 @@ File=kwinscreenedgesettings.kcfg NameSpace=KWin ClassName=KWinScreenEdgeSettings -IncludeFiles=kwinglobals.h +IncludeFiles=\"libkwineffects/kwinglobals.h\" Mutators=true DefaultValueGetters=true ParentInConstructor=true diff --git a/src/kcms/screenedges/kwintouchscreenedgeeffectsettings.kcfgc b/src/kcms/screenedges/kwintouchscreenedgeeffectsettings.kcfgc index 40c1a42b49..a702a7f4a7 100644 --- a/src/kcms/screenedges/kwintouchscreenedgeeffectsettings.kcfgc +++ b/src/kcms/screenedges/kwintouchscreenedgeeffectsettings.kcfgc @@ -1,7 +1,7 @@ File=kwintouchscreenedgeeffectsettings.kcfg NameSpace=KWin ClassName=KWinTouchScreenEdgeEffectSettings -IncludeFiles=kwinglobals.h +IncludeFiles=\"libkwineffects/kwinglobals.h\" Mutators=true DefaultValueGetters=true ParentInConstructor=true diff --git a/src/kcms/screenedges/kwintouchscreenscriptsettings.kcfgc b/src/kcms/screenedges/kwintouchscreenscriptsettings.kcfgc index 640d8f5208..303015994d 100644 --- a/src/kcms/screenedges/kwintouchscreenscriptsettings.kcfgc +++ b/src/kcms/screenedges/kwintouchscreenscriptsettings.kcfgc @@ -1,7 +1,7 @@ File=kwintouchscreenscriptsettings.kcfg NameSpace=KWin ClassName=KWinTouchScreenScriptSettings -IncludeFiles=kwinglobals.h +IncludeFiles=\"libkwineffects/kwinglobals.h\" Mutators=true DefaultValueGetters=true ParentInConstructor=true diff --git a/src/kcms/screenedges/kwintouchscreensettings.kcfgc b/src/kcms/screenedges/kwintouchscreensettings.kcfgc index 0a857f0cfb..c486893ebf 100644 --- a/src/kcms/screenedges/kwintouchscreensettings.kcfgc +++ b/src/kcms/screenedges/kwintouchscreensettings.kcfgc @@ -1,7 +1,7 @@ File=kwintouchscreensettings.kcfg NameSpace=KWin ClassName=KWinTouchScreenSettings -IncludeFiles=kwinglobals.h +IncludeFiles=\"libkwineffects/kwinglobals.h\" Mutators=true DefaultValueGetters=true ParentInConstructor=true diff --git a/src/kcms/screenedges/main.h b/src/kcms/screenedges/main.h index b938efb265..01f17168a6 100644 --- a/src/kcms/screenedges/main.h +++ b/src/kcms/screenedges/main.h @@ -13,7 +13,7 @@ #include #include -#include "kwinglobals.h" +#include "libkwineffects/kwinglobals.h" namespace KWin { diff --git a/src/kcms/screenedges/touch.h b/src/kcms/screenedges/touch.h index 5d6063fc49..6a68ab868d 100644 --- a/src/kcms/screenedges/touch.h +++ b/src/kcms/screenedges/touch.h @@ -13,7 +13,7 @@ #include #include -#include "kwinglobals.h" +#include "libkwineffects/kwinglobals.h" class QShowEvent; diff --git a/src/kcms/tabbox/CMakeLists.txt b/src/kcms/tabbox/CMakeLists.txt index 76f5a9472b..82c1485308 100644 --- a/src/kcms/tabbox/CMakeLists.txt +++ b/src/kcms/tabbox/CMakeLists.txt @@ -1,10 +1,6 @@ # KI18N Translation Domain for this library add_definitions(-DTRANSLATION_DOMAIN=\"kcm_kwintabbox\") -include_directories(${KWin_SOURCE_DIR}/src/effects ${KWin_SOURCE_DIR}/src/tabbox ${KWin_SOURCE_DIR}) - -########### next target ############### - set(kcm_kwintabbox_PART_SRCS ${KWin_SOURCE_DIR}/src/tabbox/tabboxconfig.cpp layoutpreview.cpp diff --git a/src/kcms/tabbox/kwintabboxconfigform.h b/src/kcms/tabbox/kwintabboxconfigform.h index 3ea36d42d2..79c21ed1de 100644 --- a/src/kcms/tabbox/kwintabboxconfigform.h +++ b/src/kcms/tabbox/kwintabboxconfigform.h @@ -14,7 +14,7 @@ #include #include -#include "tabboxconfig.h" +#include "tabbox/tabboxconfig.h" namespace Ui { diff --git a/src/kcms/tabbox/kwintabboxsettings.kcfgc b/src/kcms/tabbox/kwintabboxsettings.kcfgc index 2f570c90b8..c1a82b53b7 100644 --- a/src/kcms/tabbox/kwintabboxsettings.kcfgc +++ b/src/kcms/tabbox/kwintabboxsettings.kcfgc @@ -1,7 +1,7 @@ File=kwintabboxsettings.kcfg NameSpace=KWin::TabBox ClassName=TabBoxSettings -IncludeFiles=\"tabboxconfig.h\" +IncludeFiles=\"tabbox/tabboxconfig.h\" Mutators=true DefaultValueGetters=true ParentInConstructor=true diff --git a/src/kcms/tabbox/main.h b/src/kcms/tabbox/main.h index 4e7b3e2574..5bbf4cb6c0 100644 --- a/src/kcms/tabbox/main.h +++ b/src/kcms/tabbox/main.h @@ -11,7 +11,7 @@ #pragma once -#include "tabboxconfig.h" +#include "tabbox/tabboxconfig.h" #include #include diff --git a/src/kcms/virtualkeyboard/CMakeLists.txt b/src/kcms/virtualkeyboard/CMakeLists.txt index 9a37dff1c3..c77586ee84 100644 --- a/src/kcms/virtualkeyboard/CMakeLists.txt +++ b/src/kcms/virtualkeyboard/CMakeLists.txt @@ -13,7 +13,6 @@ kcmutils_generate_module_data( kconfig_add_kcfg_files(kcm_virtualkeyboard_PART_SRCS virtualkeyboardsettings.kcfgc GENERATE_MOC) kcoreaddons_add_plugin(kcm_virtualkeyboard SOURCES kcmvirtualkeyboard.cpp ${kcm_virtualkeyboard_PART_SRCS} INSTALL_NAMESPACE plasma/kcms/systemsettings) -target_include_directories(kcm_virtualkeyboard PRIVATE ${CMAKE_SOURCE_DIR}) kcmutils_generate_desktop_file(kcm_virtualkeyboard) target_link_libraries(kcm_virtualkeyboard diff --git a/src/kcms/xwayland/CMakeLists.txt b/src/kcms/xwayland/CMakeLists.txt index 29e8493cb3..385872fab7 100644 --- a/src/kcms/xwayland/CMakeLists.txt +++ b/src/kcms/xwayland/CMakeLists.txt @@ -13,7 +13,6 @@ kcmutils_generate_module_data( kconfig_add_kcfg_files(kcm_kwinxwayland_PART_SRCS kwinxwaylandsettings.kcfgc GENERATE_MOC) kcoreaddons_add_plugin(kcm_kwinxwayland SOURCES kcmkwinxwayland.cpp ${kcm_kwinxwayland_PART_SRCS} INSTALL_NAMESPACE plasma/kcms/systemsettings) -target_include_directories(kcm_kwinxwayland PRIVATE ${CMAKE_SOURCE_DIR}) kcmutils_generate_desktop_file(kcm_kwinxwayland) target_link_libraries(kcm_kwinxwayland diff --git a/src/layers.cpp b/src/layers.cpp index 52c4879af7..e9801121c6 100644 --- a/src/layers.cpp +++ b/src/layers.cpp @@ -72,7 +72,7 @@ #include "netinfo.h" #include "rules.h" #include "screenedge.h" -#include "tabbox.h" +#include "tabbox/tabbox.h" #include "unmanaged.h" #include "utils/common.h" #include "virtualdesktops.h" diff --git a/src/libkwineffects/anidata.cpp b/src/libkwineffects/anidata.cpp index 327778b400..8730787310 100644 --- a/src/libkwineffects/anidata.cpp +++ b/src/libkwineffects/anidata.cpp @@ -8,7 +8,7 @@ SPDX-License-Identifier: GPL-2.0-or-later */ -#include "anidata_p.h" +#include "libkwineffects/anidata_p.h" #include "logging_p.h" diff --git a/src/libkwineffects/anidata_p.h b/src/libkwineffects/anidata_p.h index d066e6381d..3882416baf 100644 --- a/src/libkwineffects/anidata_p.h +++ b/src/libkwineffects/anidata_p.h @@ -10,7 +10,7 @@ #pragma once -#include "kwinanimationeffect.h" +#include "libkwineffects/kwinanimationeffect.h" #include diff --git a/src/libkwineffects/kwinanimationeffect.cpp b/src/libkwineffects/kwinanimationeffect.cpp index 267a87b59b..b168c0679f 100644 --- a/src/libkwineffects/kwinanimationeffect.cpp +++ b/src/libkwineffects/kwinanimationeffect.cpp @@ -8,9 +8,9 @@ SPDX-License-Identifier: GPL-2.0-or-later */ -#include "kwinanimationeffect.h" -#include "kwinglutils.h" -#include "anidata_p.h" +#include "libkwineffects/kwinanimationeffect.h" +#include "libkwineffects/anidata_p.h" +#include "libkwineffects/kwinglutils.h" #include #include diff --git a/src/libkwineffects/kwinanimationeffect.h b/src/libkwineffects/kwinanimationeffect.h index e5f75d2f15..879ed45208 100644 --- a/src/libkwineffects/kwinanimationeffect.h +++ b/src/libkwineffects/kwinanimationeffect.h @@ -10,10 +10,10 @@ #pragma once +#include "libkwineffects/kwinoffscreeneffect.h" #include #include #include -#include #include namespace KWin diff --git a/src/libkwineffects/kwineffects.cpp b/src/libkwineffects/kwineffects.cpp index 7004364883..939a316aa3 100644 --- a/src/libkwineffects/kwineffects.cpp +++ b/src/libkwineffects/kwineffects.cpp @@ -9,7 +9,7 @@ SPDX-License-Identifier: GPL-2.0-or-later */ -#include "kwineffects.h" +#include "libkwineffects/kwineffects.h" #include "config-kwin.h" diff --git a/src/libkwineffects/kwineffects.h b/src/libkwineffects/kwineffects.h index 5b245c5540..f0280ac374 100644 --- a/src/libkwineffects/kwineffects.h +++ b/src/libkwineffects/kwineffects.h @@ -12,9 +12,9 @@ #pragma once +#include "libkwineffects/kwinglobals.h" #include #include -#include #include #include diff --git a/src/libkwineffects/kwineglimagetexture.cpp b/src/libkwineffects/kwineglimagetexture.cpp index 5811742d15..bf4c8c42fa 100644 --- a/src/libkwineffects/kwineglimagetexture.cpp +++ b/src/libkwineffects/kwineglimagetexture.cpp @@ -7,7 +7,7 @@ SPDX-License-Identifier: GPL-2.0-or-later */ -#include "kwineglimagetexture.h" +#include "libkwineffects/kwineglimagetexture.h" #include #include diff --git a/src/libkwineffects/kwineglimagetexture.h b/src/libkwineffects/kwineglimagetexture.h index 5f00005acb..15f73aa3dd 100644 --- a/src/libkwineffects/kwineglimagetexture.h +++ b/src/libkwineffects/kwineglimagetexture.h @@ -9,7 +9,7 @@ #pragma once -#include +#include "libkwineffects/kwingltexture.h" #include typedef void *EGLImageKHR; diff --git a/src/libkwineffects/kwinglplatform.cpp b/src/libkwineffects/kwinglplatform.cpp index aa0f5b105a..1cea6808cf 100644 --- a/src/libkwineffects/kwinglplatform.cpp +++ b/src/libkwineffects/kwinglplatform.cpp @@ -7,10 +7,10 @@ SPDX-License-Identifier: GPL-2.0-or-later */ -#include "kwinglplatform.h" +#include "libkwineffects/kwinglplatform.h" // include kwinglutils_funcs.h to avoid the redeclaration issues // between qopengl.h and epoxy/gl.h -#include "kwinglutils_funcs.h" +#include "libkwineffects/kwinglutils_funcs.h" #include #include diff --git a/src/libkwineffects/kwinglplatform.h b/src/libkwineffects/kwinglplatform.h index 7a7881bb87..622b203b52 100644 --- a/src/libkwineffects/kwinglplatform.h +++ b/src/libkwineffects/kwinglplatform.h @@ -9,7 +9,7 @@ #pragma once -#include +#include "libkwineffects/kwinglobals.h" #include #include diff --git a/src/libkwineffects/kwingltexture.cpp b/src/libkwineffects/kwingltexture.cpp index ce66cfa294..4efff2c396 100644 --- a/src/libkwineffects/kwingltexture.cpp +++ b/src/libkwineffects/kwingltexture.cpp @@ -10,10 +10,10 @@ */ #include "kwinconfig.h" // KWIN_HAVE_OPENGL -#include "kwineffects.h" -#include "kwinglplatform.h" -#include "kwinglutils.h" -#include "kwinglutils_funcs.h" +#include "libkwineffects/kwineffects.h" +#include "libkwineffects/kwinglplatform.h" +#include "libkwineffects/kwinglutils.h" +#include "libkwineffects/kwinglutils_funcs.h" #include "kwingltexture_p.h" diff --git a/src/libkwineffects/kwingltexture_p.h b/src/libkwineffects/kwingltexture_p.h index 994083c39b..254022f1ea 100644 --- a/src/libkwineffects/kwingltexture_p.h +++ b/src/libkwineffects/kwingltexture_p.h @@ -12,7 +12,7 @@ #pragma once #include "kwinconfig.h" // KWIN_HAVE_OPENGL -#include "kwinglutils.h" +#include "libkwineffects/kwinglutils.h" #include #include diff --git a/src/libkwineffects/kwinglutils.cpp b/src/libkwineffects/kwinglutils.cpp index 7e0aa0fe8d..cf92a604ff 100644 --- a/src/libkwineffects/kwinglutils.cpp +++ b/src/libkwineffects/kwinglutils.cpp @@ -8,16 +8,16 @@ SPDX-License-Identifier: GPL-2.0-or-later */ -#include "kwinglutils.h" +#include "libkwineffects/kwinglutils.h" // need to call GLTexturePrivate::initStatic() #include "kwingltexture_p.h" -#include "kwineffects.h" -#include "kwinglplatform.h" +#include "libkwineffects/kwineffects.h" +#include "libkwineffects/kwinglplatform.h" +#include "libkwineffects/rendertarget.h" +#include "libkwineffects/renderviewport.h" #include "logging_p.h" -#include "rendertarget.h" -#include "renderviewport.h" #include #include diff --git a/src/libkwineffects/kwinglutils.h b/src/libkwineffects/kwinglutils.h index a9b04a50ff..ff0f4677d2 100644 --- a/src/libkwineffects/kwinglutils.h +++ b/src/libkwineffects/kwinglutils.h @@ -10,8 +10,8 @@ #pragma once // kwin -#include "kwingltexture.h" -#include "kwinglutils_funcs.h" +#include "libkwineffects/kwingltexture.h" +#include "libkwineffects/kwinglutils_funcs.h" #include // Qt diff --git a/src/libkwineffects/kwinglutils_funcs.cpp b/src/libkwineffects/kwinglutils_funcs.cpp index 9fb7508861..5d5cdda5be 100644 --- a/src/libkwineffects/kwinglutils_funcs.cpp +++ b/src/libkwineffects/kwinglutils_funcs.cpp @@ -7,8 +7,8 @@ SPDX-License-Identifier: GPL-2.0-or-later */ -#include "kwinglplatform.h" -#include "kwinglutils.h" +#include "libkwineffects/kwinglplatform.h" +#include "libkwineffects/kwinglutils.h" // Resolves given function, using getProcAddress // Useful when functionality is defined in an extension with a different name diff --git a/src/libkwineffects/kwinoffscreeneffect.cpp b/src/libkwineffects/kwinoffscreeneffect.cpp index d71884754c..a54ed6625a 100644 --- a/src/libkwineffects/kwinoffscreeneffect.cpp +++ b/src/libkwineffects/kwinoffscreeneffect.cpp @@ -4,11 +4,11 @@ SPDX-License-Identifier: GPL-2.0-or-later */ -#include "kwinoffscreeneffect.h" -#include "kwingltexture.h" -#include "kwinglutils.h" -#include "rendertarget.h" -#include "renderviewport.h" +#include "libkwineffects/kwinoffscreeneffect.h" +#include "libkwineffects/kwingltexture.h" +#include "libkwineffects/kwinglutils.h" +#include "libkwineffects/rendertarget.h" +#include "libkwineffects/renderviewport.h" namespace KWin { diff --git a/src/libkwineffects/kwinoffscreeneffect.h b/src/libkwineffects/kwinoffscreeneffect.h index 934cd5d3e5..5dea4c86ac 100644 --- a/src/libkwineffects/kwinoffscreeneffect.h +++ b/src/libkwineffects/kwinoffscreeneffect.h @@ -6,7 +6,7 @@ #pragma once -#include "kwineffects.h" +#include "libkwineffects/kwineffects.h" namespace KWin { diff --git a/src/libkwineffects/kwinoffscreenquickview.cpp b/src/libkwineffects/kwinoffscreenquickview.cpp index 2fad6c4503..fc704d7eb1 100644 --- a/src/libkwineffects/kwinoffscreenquickview.cpp +++ b/src/libkwineffects/kwinoffscreenquickview.cpp @@ -7,9 +7,9 @@ SPDX-License-Identifier: GPL-2.0-or-later */ -#include "kwinoffscreenquickview.h" +#include "libkwineffects/kwinoffscreenquickview.h" -#include "kwinglutils.h" +#include "libkwineffects/kwinglutils.h" #include "logging_p.h" #include diff --git a/src/libkwineffects/kwinoffscreenquickview.h b/src/libkwineffects/kwinoffscreenquickview.h index 267776b6c2..5dcd0d20b5 100644 --- a/src/libkwineffects/kwinoffscreenquickview.h +++ b/src/libkwineffects/kwinoffscreenquickview.h @@ -15,7 +15,7 @@ #include -#include "kwineffects.h" +#include "libkwineffects/kwineffects.h" #include diff --git a/src/libkwineffects/kwinquickeffect.cpp b/src/libkwineffects/kwinquickeffect.cpp index a48ccd8d0d..e5b6a5c344 100644 --- a/src/libkwineffects/kwinquickeffect.cpp +++ b/src/libkwineffects/kwinquickeffect.cpp @@ -4,7 +4,7 @@ SPDX-License-Identifier: GPL-2.0-or-later */ -#include "kwinquickeffect.h" +#include "libkwineffects/kwinquickeffect.h" #include "logging_p.h" diff --git a/src/libkwineffects/kwinquickeffect.h b/src/libkwineffects/kwinquickeffect.h index adbe758e4e..1bdfac6761 100644 --- a/src/libkwineffects/kwinquickeffect.h +++ b/src/libkwineffects/kwinquickeffect.h @@ -6,8 +6,8 @@ #pragma once -#include "kwineffects.h" -#include "kwinoffscreenquickview.h" +#include "libkwineffects/kwineffects.h" +#include "libkwineffects/kwinoffscreenquickview.h" #include diff --git a/src/libkwineffects/rendertarget.cpp b/src/libkwineffects/rendertarget.cpp index fe481abe96..439d215f98 100644 --- a/src/libkwineffects/rendertarget.cpp +++ b/src/libkwineffects/rendertarget.cpp @@ -4,8 +4,8 @@ SPDX-License-Identifier: GPL-2.0-or-later */ -#include "rendertarget.h" -#include "kwinglutils.h" +#include "libkwineffects/rendertarget.h" +#include "libkwineffects/kwinglutils.h" namespace KWin { diff --git a/src/libkwineffects/renderviewport.cpp b/src/libkwineffects/renderviewport.cpp index 2b4e875d3b..ddefc9cef4 100644 --- a/src/libkwineffects/renderviewport.cpp +++ b/src/libkwineffects/renderviewport.cpp @@ -3,8 +3,8 @@ SPDX-License-Identifier: GPL-2.0-or-later */ -#include "renderviewport.h" -#include "rendertarget.h" +#include "libkwineffects/renderviewport.h" +#include "libkwineffects/rendertarget.h" namespace KWin { diff --git a/src/main.cpp b/src/main.cpp index 40d521c638..33ec192b36 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -12,7 +12,7 @@ #include #include "atoms.h" -#include "colormanager.h" +#include "colors/colormanager.h" #include "composite.h" #include "core/outputbackend.h" #include "core/session.h" @@ -36,7 +36,7 @@ #include "screenlockerwatcher.h" #endif -#include +#include "libkwineffects/kwineffects.h" // KDE #include diff --git a/src/main.h b/src/main.h index ecfd4774e4..df08d78c77 100644 --- a/src/main.h +++ b/src/main.h @@ -10,8 +10,8 @@ #pragma once +#include "libkwineffects/kwinglobals.h" #include -#include #include #include diff --git a/src/options.cpp b/src/options.cpp index a4057789ed..541ab563db 100644 --- a/src/options.cpp +++ b/src/options.cpp @@ -19,10 +19,10 @@ #include +#include "libkwineffects/kwinglplatform.h" #include "settings.h" #include "workspace.h" #include -#include #endif // KCMRULES diff --git a/src/outline.h b/src/outline.h index 61e23d05aa..043e84f4dd 100644 --- a/src/outline.h +++ b/src/outline.h @@ -8,9 +8,9 @@ */ #pragma once +#include "libkwineffects/kwinglobals.h" #include #include -#include #include #include diff --git a/src/platformsupport/scenes/opengl/CMakeLists.txt b/src/platformsupport/scenes/opengl/CMakeLists.txt index 0b6bb7f5d9..7f5a1261a0 100644 --- a/src/platformsupport/scenes/opengl/CMakeLists.txt +++ b/src/platformsupport/scenes/opengl/CMakeLists.txt @@ -9,4 +9,3 @@ target_sources(kwin PRIVATE openglsurfacetexture_wayland.cpp openglsurfacetexture_x11.cpp ) -target_include_directories(kwin PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}) diff --git a/src/platformsupport/scenes/opengl/abstract_egl_backend.cpp b/src/platformsupport/scenes/opengl/abstract_egl_backend.cpp index 7390b2c1bb..72b6a84037 100644 --- a/src/platformsupport/scenes/opengl/abstract_egl_backend.cpp +++ b/src/platformsupport/scenes/opengl/abstract_egl_backend.cpp @@ -6,22 +6,22 @@ SPDX-License-Identifier: GPL-2.0-or-later */ -#include "abstract_egl_backend.h" +#include "platformsupport/scenes/opengl/abstract_egl_backend.h" #include "composite.h" #include "core/output.h" #include "core/outputbackend.h" #include "dmabuftexture.h" -#include "egl_dmabuf.h" #include "options.h" +#include "platformsupport/scenes/opengl/egl_dmabuf.h" #include "utils/common.h" #include "utils/egl_context_attribute_builder.h" #include "wayland/display.h" #include "wayland_server.h" // kwin libs -#include +#include "libkwineffects/kwineglimagetexture.h" +#include "libkwineffects/kwinglplatform.h" +#include "libkwineffects/kwinglutils.h" #include -#include -#include // Qt #include diff --git a/src/platformsupport/scenes/opengl/abstract_egl_backend.h b/src/platformsupport/scenes/opengl/abstract_egl_backend.h index 1427c1a130..e0673fdc39 100644 --- a/src/platformsupport/scenes/opengl/abstract_egl_backend.h +++ b/src/platformsupport/scenes/opengl/abstract_egl_backend.h @@ -7,7 +7,7 @@ SPDX-License-Identifier: GPL-2.0-or-later */ #pragma once -#include "openglbackend.h" +#include "platformsupport/scenes/opengl/openglbackend.h" #include #include diff --git a/src/platformsupport/scenes/opengl/basiceglsurfacetexture_internal.cpp b/src/platformsupport/scenes/opengl/basiceglsurfacetexture_internal.cpp index fc85b21c1d..9df1ac2b97 100644 --- a/src/platformsupport/scenes/opengl/basiceglsurfacetexture_internal.cpp +++ b/src/platformsupport/scenes/opengl/basiceglsurfacetexture_internal.cpp @@ -4,8 +4,8 @@ SPDX-License-Identifier: GPL-2.0-or-later */ -#include "basiceglsurfacetexture_internal.h" -#include "kwingltexture.h" +#include "platformsupport/scenes/opengl/basiceglsurfacetexture_internal.h" +#include "libkwineffects/kwingltexture.h" #include "scene/surfaceitem_internal.h" #include "utils/common.h" diff --git a/src/platformsupport/scenes/opengl/basiceglsurfacetexture_wayland.cpp b/src/platformsupport/scenes/opengl/basiceglsurfacetexture_wayland.cpp index b5ba232bdd..bcf8c7d6c8 100644 --- a/src/platformsupport/scenes/opengl/basiceglsurfacetexture_wayland.cpp +++ b/src/platformsupport/scenes/opengl/basiceglsurfacetexture_wayland.cpp @@ -4,10 +4,10 @@ SPDX-License-Identifier: GPL-2.0-or-later */ -#include "basiceglsurfacetexture_wayland.h" -#include "egl_dmabuf.h" +#include "platformsupport/scenes/opengl/basiceglsurfacetexture_wayland.h" #include "kwineglext.h" -#include "kwingltexture.h" +#include "libkwineffects/kwingltexture.h" +#include "platformsupport/scenes/opengl/egl_dmabuf.h" #include "scene/surfaceitem_wayland.h" #include "utils/common.h" #include "wayland/drmclientbuffer.h" diff --git a/src/platformsupport/scenes/opengl/egl_dmabuf.cpp b/src/platformsupport/scenes/opengl/egl_dmabuf.cpp index 158f2c6e8b..dd1e238497 100644 --- a/src/platformsupport/scenes/opengl/egl_dmabuf.cpp +++ b/src/platformsupport/scenes/opengl/egl_dmabuf.cpp @@ -7,7 +7,7 @@ SPDX-License-Identifier: GPL-2.0-or-later */ -#include "egl_dmabuf.h" +#include "platformsupport/scenes/opengl/egl_dmabuf.h" #include "kwineglext.h" #include "kwineglutils_p.h" diff --git a/src/platformsupport/scenes/opengl/egl_dmabuf.h b/src/platformsupport/scenes/opengl/egl_dmabuf.h index 82a55db351..b6b4b89796 100644 --- a/src/platformsupport/scenes/opengl/egl_dmabuf.h +++ b/src/platformsupport/scenes/opengl/egl_dmabuf.h @@ -9,7 +9,7 @@ */ #pragma once -#include "abstract_egl_backend.h" +#include "platformsupport/scenes/opengl/abstract_egl_backend.h" #include "linux_dmabuf.h" diff --git a/src/platformsupport/scenes/opengl/openglbackend.cpp b/src/platformsupport/scenes/opengl/openglbackend.cpp index fc33d71298..253b89ba09 100644 --- a/src/platformsupport/scenes/opengl/openglbackend.cpp +++ b/src/platformsupport/scenes/opengl/openglbackend.cpp @@ -7,9 +7,9 @@ SPDX-License-Identifier: GPL-2.0-or-later */ -#include "openglbackend.h" -#include -#include +#include "platformsupport/scenes/opengl/openglbackend.h" +#include "libkwineffects/kwineffects.h" +#include "libkwineffects/kwinglutils_funcs.h" #include "utils/common.h" #include "workspace.h" diff --git a/src/platformsupport/scenes/opengl/openglsurfacetexture.cpp b/src/platformsupport/scenes/opengl/openglsurfacetexture.cpp index 2d406a040b..2d0fec804f 100644 --- a/src/platformsupport/scenes/opengl/openglsurfacetexture.cpp +++ b/src/platformsupport/scenes/opengl/openglsurfacetexture.cpp @@ -5,7 +5,7 @@ */ #include "openglsurfacetexture.h" -#include "kwingltexture.h" +#include "libkwineffects/kwingltexture.h" namespace KWin { diff --git a/src/platformsupport/scenes/opengl/openglsurfacetexture_x11.cpp b/src/platformsupport/scenes/opengl/openglsurfacetexture_x11.cpp index 0f6da4df21..98cd290093 100644 --- a/src/platformsupport/scenes/opengl/openglsurfacetexture_x11.cpp +++ b/src/platformsupport/scenes/opengl/openglsurfacetexture_x11.cpp @@ -4,7 +4,7 @@ SPDX-License-Identifier: GPL-2.0-or-later */ -#include "openglsurfacetexture_x11.h" +#include "platformsupport/scenes/opengl/openglsurfacetexture_x11.h" namespace KWin { diff --git a/src/platformsupport/scenes/qpainter/CMakeLists.txt b/src/platformsupport/scenes/qpainter/CMakeLists.txt index d7d1d3cb80..35c786bb47 100644 --- a/src/platformsupport/scenes/qpainter/CMakeLists.txt +++ b/src/platformsupport/scenes/qpainter/CMakeLists.txt @@ -4,4 +4,3 @@ target_sources(kwin PRIVATE qpaintersurfacetexture_wayland.cpp qpainterbackend.cpp ) -target_include_directories(kwin PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}) diff --git a/src/platformsupport/scenes/qpainter/qpainterbackend.cpp b/src/platformsupport/scenes/qpainter/qpainterbackend.cpp index 4c958169c2..9a6030817e 100644 --- a/src/platformsupport/scenes/qpainter/qpainterbackend.cpp +++ b/src/platformsupport/scenes/qpainter/qpainterbackend.cpp @@ -6,7 +6,7 @@ SPDX-License-Identifier: GPL-2.0-or-later */ -#include "qpainterbackend.h" +#include "platformsupport/scenes/qpainter/qpainterbackend.h" #include "qpaintersurfacetexture_internal.h" #include "qpaintersurfacetexture_wayland.h" #include "utils/common.h" diff --git a/src/platformsupport/vsyncconvenience/CMakeLists.txt b/src/platformsupport/vsyncconvenience/CMakeLists.txt index 2d316ee7cc..d5227c80ce 100644 --- a/src/platformsupport/vsyncconvenience/CMakeLists.txt +++ b/src/platformsupport/vsyncconvenience/CMakeLists.txt @@ -2,5 +2,3 @@ target_sources(kwin PRIVATE softwarevsyncmonitor.cpp vsyncmonitor.cpp ) - -target_include_directories(kwin PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}) diff --git a/src/platformsupport/vsyncconvenience/softwarevsyncmonitor.cpp b/src/platformsupport/vsyncconvenience/softwarevsyncmonitor.cpp index 4c240376fc..a26a61337c 100644 --- a/src/platformsupport/vsyncconvenience/softwarevsyncmonitor.cpp +++ b/src/platformsupport/vsyncconvenience/softwarevsyncmonitor.cpp @@ -4,7 +4,7 @@ SPDX-License-Identifier: GPL-2.0-or-later */ -#include "softwarevsyncmonitor.h" +#include "platformsupport/vsyncconvenience/softwarevsyncmonitor.h" namespace KWin { diff --git a/src/platformsupport/vsyncconvenience/softwarevsyncmonitor.h b/src/platformsupport/vsyncconvenience/softwarevsyncmonitor.h index c39e42fbad..42ea015592 100644 --- a/src/platformsupport/vsyncconvenience/softwarevsyncmonitor.h +++ b/src/platformsupport/vsyncconvenience/softwarevsyncmonitor.h @@ -6,7 +6,7 @@ #pragma once -#include "vsyncmonitor.h" +#include "platformsupport/vsyncconvenience/vsyncmonitor.h" #include #include diff --git a/src/platformsupport/vsyncconvenience/vsyncmonitor.cpp b/src/platformsupport/vsyncconvenience/vsyncmonitor.cpp index 41ae00b970..4ce8954232 100644 --- a/src/platformsupport/vsyncconvenience/vsyncmonitor.cpp +++ b/src/platformsupport/vsyncconvenience/vsyncmonitor.cpp @@ -4,7 +4,7 @@ SPDX-License-Identifier: GPL-2.0-or-later */ -#include "vsyncmonitor.h" +#include "platformsupport/vsyncconvenience/vsyncmonitor.h" namespace KWin { diff --git a/src/platformsupport/vsyncconvenience/vsyncmonitor.h b/src/platformsupport/vsyncconvenience/vsyncmonitor.h index 268a67afea..556150b290 100644 --- a/src/platformsupport/vsyncconvenience/vsyncmonitor.h +++ b/src/platformsupport/vsyncconvenience/vsyncmonitor.h @@ -6,7 +6,7 @@ #pragma once -#include "kwinglobals.h" +#include "libkwineffects/kwinglobals.h" #include diff --git a/src/pluginmanager.h b/src/pluginmanager.h index d4656784a0..99776911ec 100644 --- a/src/pluginmanager.h +++ b/src/pluginmanager.h @@ -6,7 +6,7 @@ #pragma once -#include "kwinglobals.h" +#include "libkwineffects/kwinglobals.h" #include #include diff --git a/src/plugins/colord-integration/colorddevice.cpp b/src/plugins/colord-integration/colorddevice.cpp index fb6a00bad7..3060ce8d30 100644 --- a/src/plugins/colord-integration/colorddevice.cpp +++ b/src/plugins/colord-integration/colorddevice.cpp @@ -5,10 +5,10 @@ */ #include "colorddevice.h" -#include "colordevice.h" #include "colordlogging.h" #include "colordprofileinterface.h" -#include "colormanager.h" +#include "colors/colordevice.h" +#include "colors/colormanager.h" #include "core/output.h" namespace KWin diff --git a/src/plugins/kdecorations/aurorae/src/aurorae.cpp b/src/plugins/kdecorations/aurorae/src/aurorae.cpp index a34d61028f..55433bc55a 100644 --- a/src/plugins/kdecorations/aurorae/src/aurorae.cpp +++ b/src/plugins/kdecorations/aurorae/src/aurorae.cpp @@ -6,10 +6,10 @@ #include "aurorae.h" #include "config-kwin.h" -#include "kwineffects.h" +#include "libkwineffects/kwineffects.h" #include "auroraetheme.h" -#include "kwinoffscreenquickview.h" +#include "libkwineffects/kwinoffscreenquickview.h" // qml imports #include "decorationoptions.h" // KDecoration2 diff --git a/src/plugins/nightcolor/nightcolormanager.cpp b/src/plugins/nightcolor/nightcolormanager.cpp index dc88c58163..2b9a621429 100644 --- a/src/plugins/nightcolor/nightcolormanager.cpp +++ b/src/plugins/nightcolor/nightcolormanager.cpp @@ -8,8 +8,8 @@ */ #include "nightcolormanager.h" #include "clockskewnotifier.h" -#include "colordevice.h" -#include "colormanager.h" +#include "colors/colordevice.h" +#include "colors/colormanager.h" #include "nightcolordbusinterface.h" #include "nightcolorlogging.h" #include "nightcolorsettings.h" diff --git a/src/plugins/screencast/outputscreencastsource.cpp b/src/plugins/screencast/outputscreencastsource.cpp index 6b137ed93d..c25dbf8a0f 100644 --- a/src/plugins/screencast/outputscreencastsource.cpp +++ b/src/plugins/screencast/outputscreencastsource.cpp @@ -10,8 +10,8 @@ #include "composite.h" #include "core/output.h" #include "core/renderloop.h" -#include "kwingltexture.h" -#include "kwinglutils.h" +#include "libkwineffects/kwingltexture.h" +#include "libkwineffects/kwinglutils.h" #include "scene/workspacescene.h" namespace KWin diff --git a/src/plugins/screencast/regionscreencastsource.cpp b/src/plugins/screencast/regionscreencastsource.cpp index 8b747f57a6..8307a755cc 100644 --- a/src/plugins/screencast/regionscreencastsource.cpp +++ b/src/plugins/screencast/regionscreencastsource.cpp @@ -7,11 +7,11 @@ #include "regionscreencastsource.h" #include "screencastutils.h" +#include "libkwineffects/kwingltexture.h" +#include "libkwineffects/kwinglutils.h" #include #include #include -#include -#include #include #include diff --git a/src/plugins/screencast/regionscreencastsource.h b/src/plugins/screencast/regionscreencastsource.h index 560c5d64dc..ce55f43ad2 100644 --- a/src/plugins/screencast/regionscreencastsource.h +++ b/src/plugins/screencast/regionscreencastsource.h @@ -8,9 +8,9 @@ #include "screencastsource.h" +#include "libkwineffects/kwingltexture.h" +#include "libkwineffects/kwinglutils.h" #include -#include -#include namespace KWin { diff --git a/src/plugins/screencast/screencastmanager.cpp b/src/plugins/screencast/screencastmanager.cpp index 54b28d7e49..2aebe4c542 100644 --- a/src/plugins/screencast/screencastmanager.cpp +++ b/src/plugins/screencast/screencastmanager.cpp @@ -11,7 +11,7 @@ #include "core/output.h" #include "core/outputbackend.h" #include "effects.h" -#include "kwingltexture.h" +#include "libkwineffects/kwingltexture.h" #include "outputscreencastsource.h" #include "regionscreencastsource.h" #include "scene/workspacescene.h" diff --git a/src/plugins/screencast/screencaststream.cpp b/src/plugins/screencast/screencaststream.cpp index b9802694de..3f152d7cef 100644 --- a/src/plugins/screencast/screencaststream.cpp +++ b/src/plugins/screencast/screencaststream.cpp @@ -13,14 +13,14 @@ #include "cursor.h" #include "dmabuftexture.h" #include "eglnativefence.h" -#include "kwineffects.h" -#include "kwinglplatform.h" -#include "kwingltexture.h" -#include "kwinglutils.h" #include "kwinscreencast_logging.h" +#include "libkwineffects/kwineffects.h" +#include "libkwineffects/kwinglplatform.h" +#include "libkwineffects/kwingltexture.h" +#include "libkwineffects/kwinglutils.h" #include "main.h" -#include "openglbackend.h" #include "pipewirecore.h" +#include "platformsupport/scenes/opengl/openglbackend.h" #include "scene/workspacescene.h" #include "screencastsource.h" #include "utils/common.h" diff --git a/src/plugins/screencast/screencaststream.h b/src/plugins/screencast/screencaststream.h index 403e29bfa7..fd87c7370b 100644 --- a/src/plugins/screencast/screencaststream.h +++ b/src/plugins/screencast/screencaststream.h @@ -11,7 +11,7 @@ #include "config-kwin.h" #include "dmabuftexture.h" -#include "kwinglobals.h" +#include "libkwineffects/kwinglobals.h" #include "wayland/screencast_v1_interface.h" #include diff --git a/src/plugins/screencast/screencastutils.h b/src/plugins/screencast/screencastutils.h index f4521aecd1..997b5c205b 100644 --- a/src/plugins/screencast/screencastutils.h +++ b/src/plugins/screencast/screencastutils.h @@ -6,9 +6,9 @@ #pragma once -#include "kwinglplatform.h" -#include "kwingltexture.h" -#include "kwinglutils.h" +#include "libkwineffects/kwinglplatform.h" +#include "libkwineffects/kwingltexture.h" +#include "libkwineffects/kwinglutils.h" #include #include diff --git a/src/scene/imageitem.cpp b/src/scene/imageitem.cpp index 00e2790080..adbe038af1 100644 --- a/src/scene/imageitem.cpp +++ b/src/scene/imageitem.cpp @@ -6,7 +6,7 @@ #include "scene/imageitem.h" -#include +#include "libkwineffects/kwingltexture.h" namespace KWin { diff --git a/src/scene/item.h b/src/scene/item.h index e004d964e3..740af90105 100644 --- a/src/scene/item.h +++ b/src/scene/item.h @@ -6,8 +6,8 @@ #pragma once -#include "kwineffects.h" -#include "kwinglobals.h" +#include "libkwineffects/kwineffects.h" +#include "libkwineffects/kwinglobals.h" #include #include diff --git a/src/scene/itemrenderer_opengl.h b/src/scene/itemrenderer_opengl.h index 34c7a9e3a4..8e7405c02b 100644 --- a/src/scene/itemrenderer_opengl.h +++ b/src/scene/itemrenderer_opengl.h @@ -6,8 +6,8 @@ #pragma once -#include "kwineffects.h" -#include "kwinglutils.h" +#include "libkwineffects/kwineffects.h" +#include "libkwineffects/kwinglutils.h" #include "scene/itemrenderer.h" namespace KWin diff --git a/src/scene/workspacescene.h b/src/scene/workspacescene.h index 003a28c5c2..48def28578 100644 --- a/src/scene/workspacescene.h +++ b/src/scene/workspacescene.h @@ -11,7 +11,7 @@ #include "scene/scene.h" -#include "kwineffects.h" +#include "libkwineffects/kwineffects.h" #include "utils/common.h" #include "window.h" diff --git a/src/scene/workspacescene_opengl.cpp b/src/scene/workspacescene_opengl.cpp index d327e4a8a8..6f93d964d0 100644 --- a/src/scene/workspacescene_opengl.cpp +++ b/src/scene/workspacescene_opengl.cpp @@ -13,7 +13,7 @@ */ #include "workspacescene_opengl.h" -#include +#include "libkwineffects/kwinglplatform.h" #include "composite.h" #include "core/output.h" diff --git a/src/scene/workspacescene_opengl.h b/src/scene/workspacescene_opengl.h index a47ed2cb29..12076631aa 100644 --- a/src/scene/workspacescene_opengl.h +++ b/src/scene/workspacescene_opengl.h @@ -10,13 +10,13 @@ #pragma once -#include "openglbackend.h" +#include "platformsupport/scenes/opengl/openglbackend.h" #include "scene/decorationitem.h" #include "scene/shadowitem.h" #include "scene/workspacescene.h" -#include "kwinglutils.h" +#include "libkwineffects/kwinglutils.h" namespace KWin { diff --git a/src/scene/workspacescene_qpainter.h b/src/scene/workspacescene_qpainter.h index ed4c806baa..0535033e81 100644 --- a/src/scene/workspacescene_qpainter.h +++ b/src/scene/workspacescene_qpainter.h @@ -8,7 +8,7 @@ */ #pragma once -#include "qpainterbackend.h" +#include "platformsupport/scenes/qpainter/qpainterbackend.h" #include "scene/decorationitem.h" #include "scene/shadowitem.h" diff --git a/src/screenedge.h b/src/screenedge.h index 8195a9804f..43e5a10bd5 100644 --- a/src/screenedge.h +++ b/src/screenedge.h @@ -18,7 +18,7 @@ #pragma once // KWin -#include "kwinglobals.h" +#include "libkwineffects/kwinglobals.h" // KDE includes #include // Qt diff --git a/src/screenlockerwatcher.h b/src/screenlockerwatcher.h index f98663bb91..3b4a28d87c 100644 --- a/src/screenlockerwatcher.h +++ b/src/screenlockerwatcher.h @@ -10,7 +10,7 @@ #include -#include +#include "libkwineffects/kwinglobals.h" class OrgFreedesktopScreenSaverInterface; class OrgKdeScreensaverInterface; diff --git a/src/scripting/screenedgehandler.h b/src/scripting/screenedgehandler.h index 4327aec16e..0f4e7813ad 100644 --- a/src/scripting/screenedgehandler.h +++ b/src/scripting/screenedgehandler.h @@ -8,8 +8,8 @@ */ #pragma once +#include "libkwineffects/kwinglobals.h" #include -#include class QAction; diff --git a/src/scripting/scriptedeffect.cpp b/src/scripting/scriptedeffect.cpp index 1a42502e57..a28eeb928c 100644 --- a/src/scripting/scriptedeffect.cpp +++ b/src/scripting/scriptedeffect.cpp @@ -17,11 +17,11 @@ #include "screenedge.h" #include "workspace.h" // KDE +#include "libkwineffects/kwinglutils.h" #include #include #include #include -#include // Qt #include #include diff --git a/src/scripting/scriptedeffect.h b/src/scripting/scriptedeffect.h index 82639992b0..9a54215bd5 100644 --- a/src/scripting/scriptedeffect.h +++ b/src/scripting/scriptedeffect.h @@ -10,7 +10,7 @@ #pragma once -#include +#include "libkwineffects/kwinanimationeffect.h" #include #include diff --git a/src/scripting/scripting.cpp b/src/scripting/scripting.cpp index a17e03013a..2a36eee71c 100644 --- a/src/scripting/scripting.cpp +++ b/src/scripting/scripting.cpp @@ -13,7 +13,7 @@ // own #include "dbuscall.h" #include "desktopbackgrounditem.h" -#include "kwinquickeffect.h" +#include "libkwineffects/kwinquickeffect.h" #include "screenedgehandler.h" #include "scripting_logging.h" #include "scriptingutils.h" diff --git a/src/scripting/scripting.h b/src/scripting/scripting.h index ce209c3bca..211eb16187 100644 --- a/src/scripting/scripting.h +++ b/src/scripting/scripting.h @@ -11,7 +11,7 @@ #pragma once -#include +#include "libkwineffects/kwinglobals.h" #include #include diff --git a/src/scripting/windowthumbnailitem.cpp b/src/scripting/windowthumbnailitem.cpp index ec85e066a3..d76e6bdbe5 100644 --- a/src/scripting/windowthumbnailitem.cpp +++ b/src/scripting/windowthumbnailitem.cpp @@ -20,8 +20,8 @@ #include "window.h" #include "workspace.h" -#include -#include +#include "libkwineffects/kwingltexture.h" +#include "libkwineffects/kwinglutils.h" #include #include diff --git a/src/scripting/workspace_wrapper.h b/src/scripting/workspace_wrapper.h index 4606eaccb7..b6918df835 100644 --- a/src/scripting/workspace_wrapper.h +++ b/src/scripting/workspace_wrapper.h @@ -10,12 +10,12 @@ #pragma once +#include "libkwineffects/kwinglobals.h" #include #include #include #include #include -#include namespace KWin { diff --git a/src/shadow.h b/src/shadow.h index 4046009eb7..aaffe8225c 100644 --- a/src/shadow.h +++ b/src/shadow.h @@ -9,8 +9,8 @@ */ #pragma once +#include "libkwineffects/kwineffects.h" #include -#include namespace KDecoration2 { diff --git a/src/sm.h b/src/sm.h index b344c32ae9..0074fa2fca 100644 --- a/src/sm.h +++ b/src/sm.h @@ -16,7 +16,7 @@ #include -#include +#include "libkwineffects/kwinglobals.h" #include namespace KWin diff --git a/src/tabbox/tabboxhandler.cpp b/src/tabbox/tabboxhandler.cpp index d886160526..5745e98fc3 100644 --- a/src/tabbox/tabboxhandler.cpp +++ b/src/tabbox/tabboxhandler.cpp @@ -13,11 +13,11 @@ // own #include "clientmodel.h" #include "desktopmodel.h" +#include "libkwineffects/kwinglobals.h" #include "scripting/scripting.h" #include "switcheritem.h" #include "tabbox_logging.h" #include "utils/xcbutils.h" -#include // Qt #include #include diff --git a/src/tabletmodemanager.h b/src/tabletmodemanager.h index 47f3268617..c1347cfee7 100644 --- a/src/tabletmodemanager.h +++ b/src/tabletmodemanager.h @@ -7,11 +7,11 @@ #pragma once +#include "libkwineffects/kwinglobals.h" #include #include #include #include -#include namespace KWin { diff --git a/src/tiles/tile.h b/src/tiles/tile.h index 22e309a7c9..b2f69da120 100644 --- a/src/tiles/tile.h +++ b/src/tiles/tile.h @@ -9,8 +9,8 @@ #pragma once +#include "libkwineffects/kwinglobals.h" #include -#include #include #include diff --git a/src/useractions.cpp b/src/useractions.cpp index d7c86aa469..122143083b 100644 --- a/src/useractions.cpp +++ b/src/useractions.cpp @@ -62,7 +62,7 @@ #include "killwindow.h" #if KWIN_BUILD_TABBOX -#include "tabbox.h" +#include "tabbox/tabbox.h" #endif namespace KWin diff --git a/src/useractions.h b/src/useractions.h index f3446b2fa0..965db88e1b 100644 --- a/src/useractions.h +++ b/src/useractions.h @@ -9,7 +9,7 @@ #pragma once #include "ui_shortcutdialog.h" -#include +#include "libkwineffects/kwinglobals.h" // Qt #include diff --git a/src/utils/common.h b/src/utils/common.h index b1b4d6de25..2b3d9e0b3c 100644 --- a/src/utils/common.h +++ b/src/utils/common.h @@ -14,7 +14,7 @@ #include #include // kwin -#include +#include "libkwineffects/kwinglobals.h" // Qt #include #include diff --git a/src/utils/serviceutils.h b/src/utils/serviceutils.h index 726a27e151..a8f8474ddd 100644 --- a/src/utils/serviceutils.h +++ b/src/utils/serviceutils.h @@ -12,7 +12,7 @@ // cmake stuff #include // kwin -#include +#include "libkwineffects/kwinglobals.h" // Qt #include #include diff --git a/src/utils/xcbutils.h b/src/utils/xcbutils.h index 093cdeaf6c..b0e94bb843 100644 --- a/src/utils/xcbutils.h +++ b/src/utils/xcbutils.h @@ -8,9 +8,9 @@ */ #pragma once +#include "libkwineffects/kwinglobals.h" #include "main.h" #include "utils/c_ptr.h" -#include #include #include diff --git a/src/virtualdesktops.h b/src/virtualdesktops.h index 1df6c8eb98..570d9a22a8 100644 --- a/src/virtualdesktops.h +++ b/src/virtualdesktops.h @@ -8,8 +8,8 @@ */ #pragma once // KWin +#include "libkwineffects/kwinglobals.h" #include -#include // Qt includes #include #include diff --git a/src/wayland_server.h b/src/wayland_server.h index c67a976eaf..8c6ca66fe5 100644 --- a/src/wayland_server.h +++ b/src/wayland_server.h @@ -8,7 +8,7 @@ */ #pragma once -#include +#include "libkwineffects/kwinglobals.h" #include #include diff --git a/src/window.cpp b/src/window.cpp index 61e24d716c..3a1a9c01f8 100644 --- a/src/window.cpp +++ b/src/window.cpp @@ -29,7 +29,7 @@ #include "outline.h" #include "placement.h" #if KWIN_BUILD_TABBOX -#include "tabbox.h" +#include "tabbox/tabbox.h" #endif #include "scene/shadowitem.h" #include "scene/windowitem.h" diff --git a/src/workspace.cpp b/src/workspace.cpp index cff24ae72c..829fb8e676 100644 --- a/src/workspace.cpp +++ b/src/workspace.cpp @@ -12,7 +12,7 @@ // own #include "workspace.h" // kwin libs -#include +#include "libkwineffects/kwinglplatform.h" // kwin #include "core/output.h" #if KWIN_BUILD_ACTIVITIES @@ -43,7 +43,7 @@ #include "tiles/tilemanager.h" #include "x11window.h" #if KWIN_BUILD_TABBOX -#include "tabbox.h" +#include "tabbox/tabbox.h" #endif #include "decorations/decorationbridge.h" #include "kscreenintegration.h" diff --git a/src/x11syncmanager.cpp b/src/x11syncmanager.cpp index 984fa978a6..69857d2397 100644 --- a/src/x11syncmanager.cpp +++ b/src/x11syncmanager.cpp @@ -14,7 +14,7 @@ #include "scene/workspacescene.h" #include "utils/common.h" -#include "kwinglplatform.h" +#include "libkwineffects/kwinglplatform.h" namespace KWin { diff --git a/src/x11syncmanager.h b/src/x11syncmanager.h index f6eafc8136..a194b651e7 100644 --- a/src/x11syncmanager.h +++ b/src/x11syncmanager.h @@ -6,7 +6,7 @@ #pragma once -#include "kwinglutils.h" +#include "libkwineffects/kwinglutils.h" #include #include diff --git a/src/xwayland/databridge.h b/src/xwayland/databridge.h index b43636121d..a0c404e89a 100644 --- a/src/xwayland/databridge.h +++ b/src/xwayland/databridge.h @@ -8,7 +8,7 @@ */ #pragma once -#include "kwinglobals.h" +#include "libkwineffects/kwinglobals.h" #include #include diff --git a/src/xwayland/xwayland_interface.h b/src/xwayland/xwayland_interface.h index 5c79f3bc24..a5711a5f56 100644 --- a/src/xwayland/xwayland_interface.h +++ b/src/xwayland/xwayland_interface.h @@ -8,7 +8,7 @@ */ #pragma once -#include +#include "libkwineffects/kwinglobals.h" #include #include diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt index 1bcc8f680e..dc6a0ba8fe 100644 --- a/tests/CMakeLists.txt +++ b/tests/CMakeLists.txt @@ -8,11 +8,9 @@ endif() set(screenedgeshowtest_SRCS screenedgeshowtest.cpp) add_executable(screenedgeshowtest ${screenedgeshowtest_SRCS}) target_link_libraries(screenedgeshowtest Qt::GuiPrivate Qt::Widgets KF6::ConfigCore KF6::WindowSystem KF6::WaylandClient ${XCB_XCB_LIBRARY}) -target_include_directories(screenedgeshowtest PRIVATE ${CMAKE_SOURCE_DIR}/src) add_executable(x11shadowreader x11shadowreader.cpp) target_link_libraries(x11shadowreader XCB::XCB Qt::GuiPrivate Qt::Widgets KF6::ConfigCore KF6::WindowSystem) -target_include_directories(x11shadowreader PRIVATE ${CMAKE_SOURCE_DIR}/src) add_executable(pointerconstraints pointerconstraintstest.cpp) add_definitions(-DDIR="${CMAKE_CURRENT_SOURCE_DIR}")