From 86084d118c4c617b1ad6d12c948d03d48cef2e81 Mon Sep 17 00:00:00 2001 From: Vlad Zahorodnii Date: Fri, 17 Nov 2023 10:59:08 +0200 Subject: [PATCH] libkwineffects/ -> effect/ --- autotests/CMakeLists.txt | 2 +- .../{libkwineffects => effect}/CMakeLists.txt | 0 .../data/glplatform/V3D-V3D_4_2-desktop-2.1 | 0 .../data/glplatform/VC4-V3D_2_1-desktop-2.1 | 0 .../amd-catalyst-radeonhd-7700M-3.1.13399 | 0 .../data/glplatform/amd-gallium-bonaire-3.0 | 0 .../glplatform/amd-gallium-cayman-gles-3.0 | 0 .../data/glplatform/amd-gallium-hawaii-3.0 | 0 .../data/glplatform/amd-gallium-navi-4.5 | 0 .../glplatform/amd-gallium-radeon-r9-290-4.5 | 0 .../amd-gallium-radeon-rx-480-series-4.5 | 0 .../amd-gallium-radeon-rx-550-series-3.1 | 0 .../amd-gallium-radeon-rx-5700-xt-4.6 | 0 .../amd-gallium-radeon-rx-580-series-4.5 | 0 .../amd-gallium-radeon-rx-vega-56-4.5 | 0 .../amd-gallium-radeon-rx-vega-64-4.5 | 0 .../data/glplatform/amd-gallium-redwood-3.0 | 0 .../data/glplatform/amd-gallium-tonga-4.1 | 0 .../data/glplatform/intel-broadwell-gt2-3.3 | 0 .../data/glplatform/intel-haswell-mobile-3.3 | 0 .../glplatform/intel-ivybridge-desktop-3.0 | 0 .../glplatform/intel-ivybridge-desktop-3.3 | 0 .../glplatform/intel-ivybridge-mobile-3.3 | 0 .../data/glplatform/intel-kabylake-gt2-4.6 | 0 .../glplatform/intel-sandybridge-mobile-3.3 | 0 .../data/glplatform/intel-skylake-gt2-3.0 | 0 .../data/glplatform/lima-mali400-desktop-3.0 | 0 .../data/glplatform/llvmpipe-10.0 | 0 .../data/glplatform/llvmpipe-3.0 | 0 .../data/glplatform/llvmpipe-5.0 | 0 .../glplatform/nvidia-geforce-gtx-560-4.5 | 0 .../glplatform/nvidia-geforce-gtx-660-3.1 | 0 .../glplatform/nvidia-geforce-gtx-950-4.5 | 0 .../glplatform/nvidia-geforce-gtx-970-3.1 | 0 .../glplatform/nvidia-geforce-gtx-970M-3.1 | 0 .../glplatform/nvidia-geforce-gtx-980-3.1 | 0 .../glplatform/panfrost-malit860-desktop-3.0 | 0 .../qualcomm-adreno-330-libhybris-gles-3.0 | 0 .../data/glplatform/virgl-3.1 | 0 .../kwinglplatformtest.cpp | 0 .../{libkwineffects => effect}/mock_gl.cpp | 0 .../{libkwineffects => effect}/mock_gl.h | 0 .../timelinetest.cpp | 2 +- .../windowquadlisttest.cpp | 2 +- .../dont_crash_cancel_animation.cpp | 4 +- .../dont_crash_reinitialize_compositor.cpp | 4 +- .../desktop_switching_animation_test.cpp | 4 +- .../effects/maximize_animation_test.cpp | 4 +- .../effects/minimize_animation_test.cpp | 4 +- .../popup_open_close_animation_test.cpp | 4 +- .../effects/scripted_effects_test.cpp | 6 +-- .../effects/slidingpopups_test.cpp | 4 +- .../toplevel_open_close_animation_test.cpp | 4 +- .../integration/effects/translucency_test.cpp | 4 +- .../integration/effects/wobbly_shade_test.cpp | 4 +- .../integration/generic_scene_opengl_test.cpp | 2 +- autotests/integration/internal_window.cpp | 2 +- autotests/integration/kwin_wayland_test.cpp | 2 +- autotests/integration/lockscreen.cpp | 2 +- autotests/integration/pointer_input.cpp | 2 +- autotests/integration/screenedges_test.cpp | 2 +- .../integration/scripting/screenedge_test.cpp | 2 +- autotests/integration/x11_window_test.cpp | 2 +- autotests/test_window_paint_data.cpp | 2 +- autotests/test_x11_timestamp_update.cpp | 2 +- autotests/testutils.h | 4 +- src/CMakeLists.txt | 46 +++++++++---------- src/activities.h | 2 +- src/appmenu.h | 2 +- src/backends/libinput/connection.h | 2 +- src/backends/wayland/wayland_backend.h | 2 +- .../x11/standalone/x11_standalone_effects.h | 2 +- ...lone_effects_mouse_interception_filter.cpp | 2 +- .../standalone/x11_standalone_glx_backend.cpp | 2 +- .../x11_standalone_overlaywindow.cpp | 2 +- .../x11_standalone_xinputintegration.cpp | 4 +- src/client_machine.cpp | 2 +- src/colors/colordevice.h | 2 +- src/colors/colormanager.h | 2 +- src/compositor.h | 2 +- src/core/outputbackend.h | 2 +- src/core/renderbackend.h | 2 +- src/core/renderjournal.h | 2 +- src/core/renderlayerdelegate.h | 2 +- src/core/renderloop.h | 2 +- src/core/session.h | 2 +- src/cursor.h | 2 +- src/decorations/decorationbridge.h | 2 +- src/{libkwineffects => effect}/anidata.cpp | 2 +- src/{libkwineffects => effect}/anidata_p.h | 4 +- .../animationeffect.cpp | 4 +- .../animationeffect.h | 2 +- src/{libkwineffects => effect}/effect.cpp | 4 +- src/{libkwineffects => effect}/effect.h | 2 +- .../effectframe.cpp | 4 +- src/{libkwineffects => effect}/effectframe.h | 4 +- .../effectloader.cpp | 4 +- src/{libkwineffects => effect}/effectloader.h | 0 src/{libkwineffects => effect}/effects.cpp | 6 +-- src/{libkwineffects => effect}/effects.h | 2 +- .../effecttogglablestate.cpp | 4 +- .../effecttogglablestate.h | 2 +- src/{libkwineffects => effect}/globals.h | 0 src/{libkwineffects => effect}/logging.cpp | 2 +- src/{libkwineffects => effect}/logging_p.h | 0 .../offscreeneffect.cpp | 2 +- .../offscreeneffect.h | 2 +- .../offscreenquickview.cpp | 4 +- .../offscreenquickview.h | 0 .../quickeffect.cpp | 4 +- src/{libkwineffects => effect}/quickeffect.h | 4 +- src/{libkwineffects => effect}/timeline.cpp | 2 +- src/{libkwineffects => effect}/timeline.h | 0 src/{libkwineffects => effect}/xcb.h | 0 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/screenedges/kwinscreenedge.h | 2 +- .../kwinscreenedgeeffectsettings.kcfgc | 2 +- .../kwinscreenedgescriptsettings.kcfgc | 2 +- .../screenedges/kwinscreenedgesettings.kcfgc | 2 +- .../kwintouchscreenedgeeffectsettings.kcfgc | 2 +- .../kwintouchscreenscriptsettings.kcfgc | 2 +- .../screenedges/kwintouchscreensettings.kcfgc | 2 +- src/kcms/screenedges/main.h | 2 +- src/kcms/screenedges/touch.h | 2 +- src/layers.cpp | 2 +- src/main.cpp | 4 +- src/main.h | 2 +- src/main_wayland.cpp | 2 +- src/main_x11.cpp | 2 +- src/opengl/glplatform.cpp | 2 +- src/opengl/glplatform.h | 2 +- src/outline.h | 2 +- src/pluginmanager.h | 2 +- src/plugins/backgroundcontrast/contrast.cpp | 2 +- src/plugins/backgroundcontrast/contrast.h | 2 +- .../backgroundcontrast/contrastshader.cpp | 2 +- src/plugins/blendchanges/blendchanges.h | 6 +-- src/plugins/blur/blur.cpp | 2 +- src/plugins/blur/blur.h | 2 +- .../colorblindnesscorrection.cpp | 2 +- .../colorblindnesscorrection.h | 2 +- src/plugins/colorpicker/colorpicker.cpp | 2 +- src/plugins/colorpicker/colorpicker.h | 2 +- src/plugins/diminactive/diminactive.cpp | 2 +- src/plugins/diminactive/diminactive.h | 4 +- src/plugins/fallapart/fallapart.h | 2 +- src/plugins/glide/glide.h | 4 +- src/plugins/highlightwindow/highlightwindow.h | 2 +- src/plugins/invert/invert.h | 2 +- .../kdecorations/aurorae/src/aurorae.cpp | 2 +- src/plugins/kscreen/kscreen.h | 4 +- src/plugins/magiclamp/magiclamp.h | 4 +- src/plugins/magnifier/magnifier.h | 2 +- src/plugins/mouseclick/mouseclick.cpp | 2 +- src/plugins/mouseclick/mouseclick.h | 4 +- src/plugins/mousemark/mousemark.cpp | 2 +- src/plugins/mousemark/mousemark.h | 2 +- src/plugins/outputlocator/outputlocator.cpp | 4 +- src/plugins/outputlocator/outputlocator.h | 2 +- src/plugins/overview/overvieweffect.cpp | 2 +- src/plugins/overview/overvieweffect.h | 4 +- src/plugins/screenedge/screenedgeeffect.cpp | 2 +- src/plugins/screenedge/screenedgeeffect.h | 2 +- src/plugins/screenshot/screenshot.cpp | 2 +- src/plugins/screenshot/screenshot.h | 2 +- .../screenshot/screenshotdbusinterface2.cpp | 2 +- .../screentransform/screentransform.cpp | 2 +- src/plugins/screentransform/screentransform.h | 4 +- src/plugins/sheet/sheet.h | 4 +- src/plugins/showfps/showfpseffect.h | 4 +- src/plugins/showpaint/showpaint.cpp | 2 +- src/plugins/showpaint/showpaint.h | 2 +- src/plugins/slide/slide.h | 2 +- src/plugins/slideback/motionmanager.h | 2 +- src/plugins/slideback/slideback.h | 2 +- src/plugins/slidingpopups/slidingpopups.h | 4 +- src/plugins/snaphelper/snaphelper.cpp | 2 +- src/plugins/snaphelper/snaphelper.h | 4 +- .../startupfeedback/startupfeedback.cpp | 2 +- src/plugins/startupfeedback/startupfeedback.h | 2 +- src/plugins/thumbnailaside/thumbnailaside.cpp | 2 +- src/plugins/thumbnailaside/thumbnailaside.h | 2 +- src/plugins/tileseditor/tileseditoreffect.cpp | 2 +- src/plugins/tileseditor/tileseditoreffect.h | 2 +- src/plugins/touchpoints/touchpoints.cpp | 2 +- src/plugins/touchpoints/touchpoints.h | 2 +- src/plugins/trackmouse/trackmouse.cpp | 2 +- src/plugins/trackmouse/trackmouse.h | 2 +- src/plugins/windowsystem/windoweffects.cpp | 2 +- src/plugins/windowview/windowviewconfig.kcfgc | 2 +- src/plugins/windowview/windowvieweffect.cpp | 2 +- src/plugins/windowview/windowvieweffect.h | 2 +- src/plugins/wobblywindows/wobblywindows.h | 2 +- src/plugins/zoom/zoom.cpp | 2 +- src/plugins/zoom/zoom.h | 2 +- src/scene/dndiconitem.h | 2 +- src/scene/item.h | 4 +- src/scene/itemrenderer_opengl.h | 2 +- src/scene/workspacescene.cpp | 2 +- src/screenedge.cpp | 2 +- src/screenedge.h | 2 +- src/screenlockerwatcher.h | 2 +- src/scripting/gesturehandler.cpp | 2 +- src/scripting/gesturehandler.h | 2 +- src/scripting/screenedgehandler.h | 2 +- src/scripting/scriptedeffect.h | 2 +- src/scripting/scriptedquicksceneeffect.h | 2 +- src/scripting/scripting.cpp | 2 +- src/scripting/scripting.h | 2 +- src/scripting/workspace_wrapper.cpp | 2 +- src/scripting/workspace_wrapper.h | 2 +- src/sm.h | 2 +- src/tabbox/tabbox.cpp | 2 +- src/tabbox/x11_filter.cpp | 2 +- src/tabletmodemanager.h | 2 +- src/tiles/tile.h | 2 +- src/useractions.h | 2 +- src/utils/common.cpp | 2 +- src/utils/common.h | 2 +- src/utils/serviceutils.h | 2 +- src/utils/vsyncmonitor.h | 2 +- src/utils/xcbutils.h | 4 +- src/virtualdesktops.h | 2 +- src/wayland/presentationtime.h | 2 +- src/wayland/screenedge_v1.h | 2 +- src/wayland_server.h | 2 +- src/window_property_notify_x11_filter.cpp | 2 +- src/workspace.cpp | 2 +- src/x11window.cpp | 2 +- src/xdgactivationv1.cpp | 2 +- src/xwayland/databridge.h | 2 +- src/xwayland/xwayland_interface.h | 2 +- 239 files changed, 257 insertions(+), 257 deletions(-) rename autotests/{libkwineffects => effect}/CMakeLists.txt (100%) rename autotests/{libkwineffects => effect}/data/glplatform/V3D-V3D_4_2-desktop-2.1 (100%) rename autotests/{libkwineffects => effect}/data/glplatform/VC4-V3D_2_1-desktop-2.1 (100%) rename autotests/{libkwineffects => effect}/data/glplatform/amd-catalyst-radeonhd-7700M-3.1.13399 (100%) rename autotests/{libkwineffects => effect}/data/glplatform/amd-gallium-bonaire-3.0 (100%) rename autotests/{libkwineffects => effect}/data/glplatform/amd-gallium-cayman-gles-3.0 (100%) rename autotests/{libkwineffects => effect}/data/glplatform/amd-gallium-hawaii-3.0 (100%) rename autotests/{libkwineffects => effect}/data/glplatform/amd-gallium-navi-4.5 (100%) rename autotests/{libkwineffects => effect}/data/glplatform/amd-gallium-radeon-r9-290-4.5 (100%) rename autotests/{libkwineffects => effect}/data/glplatform/amd-gallium-radeon-rx-480-series-4.5 (100%) rename autotests/{libkwineffects => effect}/data/glplatform/amd-gallium-radeon-rx-550-series-3.1 (100%) rename autotests/{libkwineffects => effect}/data/glplatform/amd-gallium-radeon-rx-5700-xt-4.6 (100%) rename autotests/{libkwineffects => effect}/data/glplatform/amd-gallium-radeon-rx-580-series-4.5 (100%) rename autotests/{libkwineffects => effect}/data/glplatform/amd-gallium-radeon-rx-vega-56-4.5 (100%) rename autotests/{libkwineffects => effect}/data/glplatform/amd-gallium-radeon-rx-vega-64-4.5 (100%) rename autotests/{libkwineffects => effect}/data/glplatform/amd-gallium-redwood-3.0 (100%) rename autotests/{libkwineffects => effect}/data/glplatform/amd-gallium-tonga-4.1 (100%) rename autotests/{libkwineffects => effect}/data/glplatform/intel-broadwell-gt2-3.3 (100%) rename autotests/{libkwineffects => effect}/data/glplatform/intel-haswell-mobile-3.3 (100%) rename autotests/{libkwineffects => effect}/data/glplatform/intel-ivybridge-desktop-3.0 (100%) rename autotests/{libkwineffects => effect}/data/glplatform/intel-ivybridge-desktop-3.3 (100%) rename autotests/{libkwineffects => effect}/data/glplatform/intel-ivybridge-mobile-3.3 (100%) rename autotests/{libkwineffects => effect}/data/glplatform/intel-kabylake-gt2-4.6 (100%) rename autotests/{libkwineffects => effect}/data/glplatform/intel-sandybridge-mobile-3.3 (100%) rename autotests/{libkwineffects => effect}/data/glplatform/intel-skylake-gt2-3.0 (100%) rename autotests/{libkwineffects => effect}/data/glplatform/lima-mali400-desktop-3.0 (100%) rename autotests/{libkwineffects => effect}/data/glplatform/llvmpipe-10.0 (100%) rename autotests/{libkwineffects => effect}/data/glplatform/llvmpipe-3.0 (100%) rename autotests/{libkwineffects => effect}/data/glplatform/llvmpipe-5.0 (100%) rename autotests/{libkwineffects => effect}/data/glplatform/nvidia-geforce-gtx-560-4.5 (100%) rename autotests/{libkwineffects => effect}/data/glplatform/nvidia-geforce-gtx-660-3.1 (100%) rename autotests/{libkwineffects => effect}/data/glplatform/nvidia-geforce-gtx-950-4.5 (100%) rename autotests/{libkwineffects => effect}/data/glplatform/nvidia-geforce-gtx-970-3.1 (100%) rename autotests/{libkwineffects => effect}/data/glplatform/nvidia-geforce-gtx-970M-3.1 (100%) rename autotests/{libkwineffects => effect}/data/glplatform/nvidia-geforce-gtx-980-3.1 (100%) rename autotests/{libkwineffects => effect}/data/glplatform/panfrost-malit860-desktop-3.0 (100%) rename autotests/{libkwineffects => effect}/data/glplatform/qualcomm-adreno-330-libhybris-gles-3.0 (100%) rename autotests/{libkwineffects => effect}/data/glplatform/virgl-3.1 (100%) rename autotests/{libkwineffects => effect}/kwinglplatformtest.cpp (100%) rename autotests/{libkwineffects => effect}/mock_gl.cpp (100%) rename autotests/{libkwineffects => effect}/mock_gl.h (100%) rename autotests/{libkwineffects => effect}/timelinetest.cpp (99%) rename autotests/{libkwineffects => effect}/windowquadlisttest.cpp (99%) rename src/{libkwineffects => effect}/anidata.cpp (98%) rename src/{libkwineffects => effect}/anidata_p.h (95%) rename src/{libkwineffects => effect}/animationeffect.cpp (99%) rename src/{libkwineffects => effect}/animationeffect.h (99%) rename src/{libkwineffects => effect}/effect.cpp (99%) rename src/{libkwineffects => effect}/effect.h (99%) rename src/{libkwineffects => effect}/effectframe.cpp (99%) rename src/{libkwineffects => effect}/effectframe.h (98%) rename src/{libkwineffects => effect}/effectloader.cpp (99%) rename src/{libkwineffects => effect}/effectloader.h (100%) rename src/{libkwineffects => effect}/effects.cpp (99%) rename src/{libkwineffects => effect}/effects.h (99%) rename src/{libkwineffects => effect}/effecttogglablestate.cpp (98%) rename src/{libkwineffects => effect}/effecttogglablestate.h (98%) rename src/{libkwineffects => effect}/globals.h (100%) rename src/{libkwineffects => effect}/logging.cpp (76%) rename src/{libkwineffects => effect}/logging_p.h (100%) rename src/{libkwineffects => effect}/offscreeneffect.cpp (99%) rename src/{libkwineffects => effect}/offscreeneffect.h (99%) rename src/{libkwineffects => effect}/offscreenquickview.cpp (99%) rename src/{libkwineffects => effect}/offscreenquickview.h (100%) rename src/{libkwineffects => effect}/quickeffect.cpp (99%) rename src/{libkwineffects => effect}/quickeffect.h (98%) rename src/{libkwineffects => effect}/timeline.cpp (99%) rename src/{libkwineffects => effect}/timeline.h (100%) rename src/{libkwineffects => effect}/xcb.h (100%) diff --git a/autotests/CMakeLists.txt b/autotests/CMakeLists.txt index 0ef6bcf926..ac596408ae 100644 --- a/autotests/CMakeLists.txt +++ b/autotests/CMakeLists.txt @@ -1,6 +1,6 @@ add_definitions(-DKWIN_UNIT_TEST) remove_definitions(-DQT_USE_QSTRINGBUILDER) -add_subdirectory(libkwineffects) +add_subdirectory(effect) add_subdirectory(integration) add_subdirectory(libinput) add_subdirectory(wayland) diff --git a/autotests/libkwineffects/CMakeLists.txt b/autotests/effect/CMakeLists.txt similarity index 100% rename from autotests/libkwineffects/CMakeLists.txt rename to autotests/effect/CMakeLists.txt diff --git a/autotests/libkwineffects/data/glplatform/V3D-V3D_4_2-desktop-2.1 b/autotests/effect/data/glplatform/V3D-V3D_4_2-desktop-2.1 similarity index 100% rename from autotests/libkwineffects/data/glplatform/V3D-V3D_4_2-desktop-2.1 rename to autotests/effect/data/glplatform/V3D-V3D_4_2-desktop-2.1 diff --git a/autotests/libkwineffects/data/glplatform/VC4-V3D_2_1-desktop-2.1 b/autotests/effect/data/glplatform/VC4-V3D_2_1-desktop-2.1 similarity index 100% rename from autotests/libkwineffects/data/glplatform/VC4-V3D_2_1-desktop-2.1 rename to autotests/effect/data/glplatform/VC4-V3D_2_1-desktop-2.1 diff --git a/autotests/libkwineffects/data/glplatform/amd-catalyst-radeonhd-7700M-3.1.13399 b/autotests/effect/data/glplatform/amd-catalyst-radeonhd-7700M-3.1.13399 similarity index 100% rename from autotests/libkwineffects/data/glplatform/amd-catalyst-radeonhd-7700M-3.1.13399 rename to autotests/effect/data/glplatform/amd-catalyst-radeonhd-7700M-3.1.13399 diff --git a/autotests/libkwineffects/data/glplatform/amd-gallium-bonaire-3.0 b/autotests/effect/data/glplatform/amd-gallium-bonaire-3.0 similarity index 100% rename from autotests/libkwineffects/data/glplatform/amd-gallium-bonaire-3.0 rename to autotests/effect/data/glplatform/amd-gallium-bonaire-3.0 diff --git a/autotests/libkwineffects/data/glplatform/amd-gallium-cayman-gles-3.0 b/autotests/effect/data/glplatform/amd-gallium-cayman-gles-3.0 similarity index 100% rename from autotests/libkwineffects/data/glplatform/amd-gallium-cayman-gles-3.0 rename to autotests/effect/data/glplatform/amd-gallium-cayman-gles-3.0 diff --git a/autotests/libkwineffects/data/glplatform/amd-gallium-hawaii-3.0 b/autotests/effect/data/glplatform/amd-gallium-hawaii-3.0 similarity index 100% rename from autotests/libkwineffects/data/glplatform/amd-gallium-hawaii-3.0 rename to autotests/effect/data/glplatform/amd-gallium-hawaii-3.0 diff --git a/autotests/libkwineffects/data/glplatform/amd-gallium-navi-4.5 b/autotests/effect/data/glplatform/amd-gallium-navi-4.5 similarity index 100% rename from autotests/libkwineffects/data/glplatform/amd-gallium-navi-4.5 rename to autotests/effect/data/glplatform/amd-gallium-navi-4.5 diff --git a/autotests/libkwineffects/data/glplatform/amd-gallium-radeon-r9-290-4.5 b/autotests/effect/data/glplatform/amd-gallium-radeon-r9-290-4.5 similarity index 100% rename from autotests/libkwineffects/data/glplatform/amd-gallium-radeon-r9-290-4.5 rename to autotests/effect/data/glplatform/amd-gallium-radeon-r9-290-4.5 diff --git a/autotests/libkwineffects/data/glplatform/amd-gallium-radeon-rx-480-series-4.5 b/autotests/effect/data/glplatform/amd-gallium-radeon-rx-480-series-4.5 similarity index 100% rename from autotests/libkwineffects/data/glplatform/amd-gallium-radeon-rx-480-series-4.5 rename to autotests/effect/data/glplatform/amd-gallium-radeon-rx-480-series-4.5 diff --git a/autotests/libkwineffects/data/glplatform/amd-gallium-radeon-rx-550-series-3.1 b/autotests/effect/data/glplatform/amd-gallium-radeon-rx-550-series-3.1 similarity index 100% rename from autotests/libkwineffects/data/glplatform/amd-gallium-radeon-rx-550-series-3.1 rename to autotests/effect/data/glplatform/amd-gallium-radeon-rx-550-series-3.1 diff --git a/autotests/libkwineffects/data/glplatform/amd-gallium-radeon-rx-5700-xt-4.6 b/autotests/effect/data/glplatform/amd-gallium-radeon-rx-5700-xt-4.6 similarity index 100% rename from autotests/libkwineffects/data/glplatform/amd-gallium-radeon-rx-5700-xt-4.6 rename to autotests/effect/data/glplatform/amd-gallium-radeon-rx-5700-xt-4.6 diff --git a/autotests/libkwineffects/data/glplatform/amd-gallium-radeon-rx-580-series-4.5 b/autotests/effect/data/glplatform/amd-gallium-radeon-rx-580-series-4.5 similarity index 100% rename from autotests/libkwineffects/data/glplatform/amd-gallium-radeon-rx-580-series-4.5 rename to autotests/effect/data/glplatform/amd-gallium-radeon-rx-580-series-4.5 diff --git a/autotests/libkwineffects/data/glplatform/amd-gallium-radeon-rx-vega-56-4.5 b/autotests/effect/data/glplatform/amd-gallium-radeon-rx-vega-56-4.5 similarity index 100% rename from autotests/libkwineffects/data/glplatform/amd-gallium-radeon-rx-vega-56-4.5 rename to autotests/effect/data/glplatform/amd-gallium-radeon-rx-vega-56-4.5 diff --git a/autotests/libkwineffects/data/glplatform/amd-gallium-radeon-rx-vega-64-4.5 b/autotests/effect/data/glplatform/amd-gallium-radeon-rx-vega-64-4.5 similarity index 100% rename from autotests/libkwineffects/data/glplatform/amd-gallium-radeon-rx-vega-64-4.5 rename to autotests/effect/data/glplatform/amd-gallium-radeon-rx-vega-64-4.5 diff --git a/autotests/libkwineffects/data/glplatform/amd-gallium-redwood-3.0 b/autotests/effect/data/glplatform/amd-gallium-redwood-3.0 similarity index 100% rename from autotests/libkwineffects/data/glplatform/amd-gallium-redwood-3.0 rename to autotests/effect/data/glplatform/amd-gallium-redwood-3.0 diff --git a/autotests/libkwineffects/data/glplatform/amd-gallium-tonga-4.1 b/autotests/effect/data/glplatform/amd-gallium-tonga-4.1 similarity index 100% rename from autotests/libkwineffects/data/glplatform/amd-gallium-tonga-4.1 rename to autotests/effect/data/glplatform/amd-gallium-tonga-4.1 diff --git a/autotests/libkwineffects/data/glplatform/intel-broadwell-gt2-3.3 b/autotests/effect/data/glplatform/intel-broadwell-gt2-3.3 similarity index 100% rename from autotests/libkwineffects/data/glplatform/intel-broadwell-gt2-3.3 rename to autotests/effect/data/glplatform/intel-broadwell-gt2-3.3 diff --git a/autotests/libkwineffects/data/glplatform/intel-haswell-mobile-3.3 b/autotests/effect/data/glplatform/intel-haswell-mobile-3.3 similarity index 100% rename from autotests/libkwineffects/data/glplatform/intel-haswell-mobile-3.3 rename to autotests/effect/data/glplatform/intel-haswell-mobile-3.3 diff --git a/autotests/libkwineffects/data/glplatform/intel-ivybridge-desktop-3.0 b/autotests/effect/data/glplatform/intel-ivybridge-desktop-3.0 similarity index 100% rename from autotests/libkwineffects/data/glplatform/intel-ivybridge-desktop-3.0 rename to autotests/effect/data/glplatform/intel-ivybridge-desktop-3.0 diff --git a/autotests/libkwineffects/data/glplatform/intel-ivybridge-desktop-3.3 b/autotests/effect/data/glplatform/intel-ivybridge-desktop-3.3 similarity index 100% rename from autotests/libkwineffects/data/glplatform/intel-ivybridge-desktop-3.3 rename to autotests/effect/data/glplatform/intel-ivybridge-desktop-3.3 diff --git a/autotests/libkwineffects/data/glplatform/intel-ivybridge-mobile-3.3 b/autotests/effect/data/glplatform/intel-ivybridge-mobile-3.3 similarity index 100% rename from autotests/libkwineffects/data/glplatform/intel-ivybridge-mobile-3.3 rename to autotests/effect/data/glplatform/intel-ivybridge-mobile-3.3 diff --git a/autotests/libkwineffects/data/glplatform/intel-kabylake-gt2-4.6 b/autotests/effect/data/glplatform/intel-kabylake-gt2-4.6 similarity index 100% rename from autotests/libkwineffects/data/glplatform/intel-kabylake-gt2-4.6 rename to autotests/effect/data/glplatform/intel-kabylake-gt2-4.6 diff --git a/autotests/libkwineffects/data/glplatform/intel-sandybridge-mobile-3.3 b/autotests/effect/data/glplatform/intel-sandybridge-mobile-3.3 similarity index 100% rename from autotests/libkwineffects/data/glplatform/intel-sandybridge-mobile-3.3 rename to autotests/effect/data/glplatform/intel-sandybridge-mobile-3.3 diff --git a/autotests/libkwineffects/data/glplatform/intel-skylake-gt2-3.0 b/autotests/effect/data/glplatform/intel-skylake-gt2-3.0 similarity index 100% rename from autotests/libkwineffects/data/glplatform/intel-skylake-gt2-3.0 rename to autotests/effect/data/glplatform/intel-skylake-gt2-3.0 diff --git a/autotests/libkwineffects/data/glplatform/lima-mali400-desktop-3.0 b/autotests/effect/data/glplatform/lima-mali400-desktop-3.0 similarity index 100% rename from autotests/libkwineffects/data/glplatform/lima-mali400-desktop-3.0 rename to autotests/effect/data/glplatform/lima-mali400-desktop-3.0 diff --git a/autotests/libkwineffects/data/glplatform/llvmpipe-10.0 b/autotests/effect/data/glplatform/llvmpipe-10.0 similarity index 100% rename from autotests/libkwineffects/data/glplatform/llvmpipe-10.0 rename to autotests/effect/data/glplatform/llvmpipe-10.0 diff --git a/autotests/libkwineffects/data/glplatform/llvmpipe-3.0 b/autotests/effect/data/glplatform/llvmpipe-3.0 similarity index 100% rename from autotests/libkwineffects/data/glplatform/llvmpipe-3.0 rename to autotests/effect/data/glplatform/llvmpipe-3.0 diff --git a/autotests/libkwineffects/data/glplatform/llvmpipe-5.0 b/autotests/effect/data/glplatform/llvmpipe-5.0 similarity index 100% rename from autotests/libkwineffects/data/glplatform/llvmpipe-5.0 rename to autotests/effect/data/glplatform/llvmpipe-5.0 diff --git a/autotests/libkwineffects/data/glplatform/nvidia-geforce-gtx-560-4.5 b/autotests/effect/data/glplatform/nvidia-geforce-gtx-560-4.5 similarity index 100% rename from autotests/libkwineffects/data/glplatform/nvidia-geforce-gtx-560-4.5 rename to autotests/effect/data/glplatform/nvidia-geforce-gtx-560-4.5 diff --git a/autotests/libkwineffects/data/glplatform/nvidia-geforce-gtx-660-3.1 b/autotests/effect/data/glplatform/nvidia-geforce-gtx-660-3.1 similarity index 100% rename from autotests/libkwineffects/data/glplatform/nvidia-geforce-gtx-660-3.1 rename to autotests/effect/data/glplatform/nvidia-geforce-gtx-660-3.1 diff --git a/autotests/libkwineffects/data/glplatform/nvidia-geforce-gtx-950-4.5 b/autotests/effect/data/glplatform/nvidia-geforce-gtx-950-4.5 similarity index 100% rename from autotests/libkwineffects/data/glplatform/nvidia-geforce-gtx-950-4.5 rename to autotests/effect/data/glplatform/nvidia-geforce-gtx-950-4.5 diff --git a/autotests/libkwineffects/data/glplatform/nvidia-geforce-gtx-970-3.1 b/autotests/effect/data/glplatform/nvidia-geforce-gtx-970-3.1 similarity index 100% rename from autotests/libkwineffects/data/glplatform/nvidia-geforce-gtx-970-3.1 rename to autotests/effect/data/glplatform/nvidia-geforce-gtx-970-3.1 diff --git a/autotests/libkwineffects/data/glplatform/nvidia-geforce-gtx-970M-3.1 b/autotests/effect/data/glplatform/nvidia-geforce-gtx-970M-3.1 similarity index 100% rename from autotests/libkwineffects/data/glplatform/nvidia-geforce-gtx-970M-3.1 rename to autotests/effect/data/glplatform/nvidia-geforce-gtx-970M-3.1 diff --git a/autotests/libkwineffects/data/glplatform/nvidia-geforce-gtx-980-3.1 b/autotests/effect/data/glplatform/nvidia-geforce-gtx-980-3.1 similarity index 100% rename from autotests/libkwineffects/data/glplatform/nvidia-geforce-gtx-980-3.1 rename to autotests/effect/data/glplatform/nvidia-geforce-gtx-980-3.1 diff --git a/autotests/libkwineffects/data/glplatform/panfrost-malit860-desktop-3.0 b/autotests/effect/data/glplatform/panfrost-malit860-desktop-3.0 similarity index 100% rename from autotests/libkwineffects/data/glplatform/panfrost-malit860-desktop-3.0 rename to autotests/effect/data/glplatform/panfrost-malit860-desktop-3.0 diff --git a/autotests/libkwineffects/data/glplatform/qualcomm-adreno-330-libhybris-gles-3.0 b/autotests/effect/data/glplatform/qualcomm-adreno-330-libhybris-gles-3.0 similarity index 100% rename from autotests/libkwineffects/data/glplatform/qualcomm-adreno-330-libhybris-gles-3.0 rename to autotests/effect/data/glplatform/qualcomm-adreno-330-libhybris-gles-3.0 diff --git a/autotests/libkwineffects/data/glplatform/virgl-3.1 b/autotests/effect/data/glplatform/virgl-3.1 similarity index 100% rename from autotests/libkwineffects/data/glplatform/virgl-3.1 rename to autotests/effect/data/glplatform/virgl-3.1 diff --git a/autotests/libkwineffects/kwinglplatformtest.cpp b/autotests/effect/kwinglplatformtest.cpp similarity index 100% rename from autotests/libkwineffects/kwinglplatformtest.cpp rename to autotests/effect/kwinglplatformtest.cpp diff --git a/autotests/libkwineffects/mock_gl.cpp b/autotests/effect/mock_gl.cpp similarity index 100% rename from autotests/libkwineffects/mock_gl.cpp rename to autotests/effect/mock_gl.cpp diff --git a/autotests/libkwineffects/mock_gl.h b/autotests/effect/mock_gl.h similarity index 100% rename from autotests/libkwineffects/mock_gl.h rename to autotests/effect/mock_gl.h diff --git a/autotests/libkwineffects/timelinetest.cpp b/autotests/effect/timelinetest.cpp similarity index 99% rename from autotests/libkwineffects/timelinetest.cpp rename to autotests/effect/timelinetest.cpp index 5bdd055e8a..418ff19b89 100644 --- a/autotests/libkwineffects/timelinetest.cpp +++ b/autotests/effect/timelinetest.cpp @@ -7,7 +7,7 @@ SPDX-License-Identifier: GPL-2.0-or-later */ -#include "libkwineffects/timeline.h" +#include "effect/timeline.h" #include diff --git a/autotests/libkwineffects/windowquadlisttest.cpp b/autotests/effect/windowquadlisttest.cpp similarity index 99% rename from autotests/libkwineffects/windowquadlisttest.cpp rename to autotests/effect/windowquadlisttest.cpp index 7e05def59e..beb844d5b7 100644 --- a/autotests/libkwineffects/windowquadlisttest.cpp +++ b/autotests/effect/windowquadlisttest.cpp @@ -6,7 +6,7 @@ SPDX-License-Identifier: GPL-2.0-or-later */ -#include "libkwineffects/effects.h" +#include "effect/effects.h" #include Q_DECLARE_METATYPE(KWin::WindowQuadList) diff --git a/autotests/integration/dont_crash_cancel_animation.cpp b/autotests/integration/dont_crash_cancel_animation.cpp index 3d0b583991..cdb231a9ef 100644 --- a/autotests/integration/dont_crash_cancel_animation.cpp +++ b/autotests/integration/dont_crash_cancel_animation.cpp @@ -9,8 +9,8 @@ #include "kwin_wayland_test.h" #include "compositor.h" -#include "libkwineffects/effectloader.h" -#include "libkwineffects/effects.h" +#include "effect/effectloader.h" +#include "effect/effects.h" #include "scripting/scriptedeffect.h" #include "wayland_server.h" #include "window.h" diff --git a/autotests/integration/dont_crash_reinitialize_compositor.cpp b/autotests/integration/dont_crash_reinitialize_compositor.cpp index 75b2793783..2ae975d3a2 100644 --- a/autotests/integration/dont_crash_reinitialize_compositor.cpp +++ b/autotests/integration/dont_crash_reinitialize_compositor.cpp @@ -11,8 +11,8 @@ #include "compositor.h" #include "core/output.h" -#include "libkwineffects/effectloader.h" -#include "libkwineffects/effects.h" +#include "effect/effectloader.h" +#include "effect/effects.h" #include "wayland_server.h" #include "window.h" #include "workspace.h" diff --git a/autotests/integration/effects/desktop_switching_animation_test.cpp b/autotests/integration/effects/desktop_switching_animation_test.cpp index 9848602ed8..c4a12c1c05 100644 --- a/autotests/integration/effects/desktop_switching_animation_test.cpp +++ b/autotests/integration/effects/desktop_switching_animation_test.cpp @@ -9,8 +9,8 @@ #include "kwin_wayland_test.h" -#include "libkwineffects/effectloader.h" -#include "libkwineffects/effects.h" +#include "effect/effectloader.h" +#include "effect/effects.h" #include "virtualdesktops.h" #include "wayland_server.h" #include "window.h" diff --git a/autotests/integration/effects/maximize_animation_test.cpp b/autotests/integration/effects/maximize_animation_test.cpp index 6b55093723..128d45ec53 100644 --- a/autotests/integration/effects/maximize_animation_test.cpp +++ b/autotests/integration/effects/maximize_animation_test.cpp @@ -10,8 +10,8 @@ #include "kwin_wayland_test.h" #include "compositor.h" -#include "libkwineffects/effectloader.h" -#include "libkwineffects/effects.h" +#include "effect/effectloader.h" +#include "effect/effects.h" #include "scene/workspacescene.h" #include "wayland_server.h" #include "window.h" diff --git a/autotests/integration/effects/minimize_animation_test.cpp b/autotests/integration/effects/minimize_animation_test.cpp index eb76f3b32b..900d635d76 100644 --- a/autotests/integration/effects/minimize_animation_test.cpp +++ b/autotests/integration/effects/minimize_animation_test.cpp @@ -9,8 +9,8 @@ #include "kwin_wayland_test.h" -#include "libkwineffects/effectloader.h" -#include "libkwineffects/effects.h" +#include "effect/effectloader.h" +#include "effect/effects.h" #include "wayland_server.h" #include "window.h" #include "workspace.h" diff --git a/autotests/integration/effects/popup_open_close_animation_test.cpp b/autotests/integration/effects/popup_open_close_animation_test.cpp index 0be344b69c..e86d95869a 100644 --- a/autotests/integration/effects/popup_open_close_animation_test.cpp +++ b/autotests/integration/effects/popup_open_close_animation_test.cpp @@ -9,9 +9,9 @@ #include "kwin_wayland_test.h" +#include "effect/effectloader.h" +#include "effect/effects.h" #include "internalwindow.h" -#include "libkwineffects/effectloader.h" -#include "libkwineffects/effects.h" #include "useractions.h" #include "wayland_server.h" #include "window.h" diff --git a/autotests/integration/effects/scripted_effects_test.cpp b/autotests/integration/effects/scripted_effects_test.cpp index 20f5e13d34..bfbe2a054e 100644 --- a/autotests/integration/effects/scripted_effects_test.cpp +++ b/autotests/integration/effects/scripted_effects_test.cpp @@ -9,9 +9,9 @@ #include "kwin_wayland_test.h" -#include "libkwineffects/anidata_p.h" -#include "libkwineffects/effectloader.h" -#include "libkwineffects/effects.h" +#include "effect/anidata_p.h" +#include "effect/effectloader.h" +#include "effect/effects.h" #include "scripting/scriptedeffect.h" #include "virtualdesktops.h" #include "wayland_server.h" diff --git a/autotests/integration/effects/slidingpopups_test.cpp b/autotests/integration/effects/slidingpopups_test.cpp index 9828865230..4cfe6df9c0 100644 --- a/autotests/integration/effects/slidingpopups_test.cpp +++ b/autotests/integration/effects/slidingpopups_test.cpp @@ -6,9 +6,9 @@ SPDX-License-Identifier: GPL-2.0-or-later */ +#include "effect/effectloader.h" +#include "effect/effects.h" #include "kwin_wayland_test.h" -#include "libkwineffects/effectloader.h" -#include "libkwineffects/effects.h" #include "wayland_server.h" #include "workspace.h" #include "x11window.h" diff --git a/autotests/integration/effects/toplevel_open_close_animation_test.cpp b/autotests/integration/effects/toplevel_open_close_animation_test.cpp index d436b8a445..8b5fd383ea 100644 --- a/autotests/integration/effects/toplevel_open_close_animation_test.cpp +++ b/autotests/integration/effects/toplevel_open_close_animation_test.cpp @@ -9,8 +9,8 @@ #include "kwin_wayland_test.h" -#include "libkwineffects/effectloader.h" -#include "libkwineffects/effects.h" +#include "effect/effectloader.h" +#include "effect/effects.h" #include "wayland_server.h" #include "window.h" #include "workspace.h" diff --git a/autotests/integration/effects/translucency_test.cpp b/autotests/integration/effects/translucency_test.cpp index bd36116bfa..f0132b9f2f 100644 --- a/autotests/integration/effects/translucency_test.cpp +++ b/autotests/integration/effects/translucency_test.cpp @@ -9,8 +9,8 @@ #include "kwin_wayland_test.h" #include "compositor.h" -#include "libkwineffects/effectloader.h" -#include "libkwineffects/effects.h" +#include "effect/effectloader.h" +#include "effect/effects.h" #include "pointer_input.h" #include "virtualdesktops.h" #include "wayland_server.h" diff --git a/autotests/integration/effects/wobbly_shade_test.cpp b/autotests/integration/effects/wobbly_shade_test.cpp index 997a60b670..11a58e1c9c 100644 --- a/autotests/integration/effects/wobbly_shade_test.cpp +++ b/autotests/integration/effects/wobbly_shade_test.cpp @@ -9,8 +9,8 @@ #include "kwin_wayland_test.h" #include "cursor.h" -#include "libkwineffects/effectloader.h" -#include "libkwineffects/effects.h" +#include "effect/effectloader.h" +#include "effect/effects.h" #include "wayland_server.h" #include "workspace.h" #include "x11window.h" diff --git a/autotests/integration/generic_scene_opengl_test.cpp b/autotests/integration/generic_scene_opengl_test.cpp index 9365dd373d..23855dfc8a 100644 --- a/autotests/integration/generic_scene_opengl_test.cpp +++ b/autotests/integration/generic_scene_opengl_test.cpp @@ -10,7 +10,7 @@ #include "compositor.h" #include "core/renderbackend.h" #include "cursor.h" -#include "libkwineffects/effectloader.h" +#include "effect/effectloader.h" #include "scene/workspacescene.h" #include "wayland_server.h" #include "window.h" diff --git a/autotests/integration/internal_window.cpp b/autotests/integration/internal_window.cpp index bbfd1b2efc..da016a64c5 100644 --- a/autotests/integration/internal_window.cpp +++ b/autotests/integration/internal_window.cpp @@ -9,8 +9,8 @@ #include "kwin_wayland_test.h" #include "core/output.h" +#include "effect/effects.h" #include "internalwindow.h" -#include "libkwineffects/effects.h" #include "pointer_input.h" #include "wayland/surface.h" #include "wayland_server.h" diff --git a/autotests/integration/kwin_wayland_test.cpp b/autotests/integration/kwin_wayland_test.cpp index 5e6926331e..1a1edbef28 100644 --- a/autotests/integration/kwin_wayland_test.cpp +++ b/autotests/integration/kwin_wayland_test.cpp @@ -11,8 +11,8 @@ #include "backends/virtual/virtual_backend.h" #include "compositor_wayland.h" #include "core/session.h" +#include "effect/effects.h" #include "inputmethod.h" -#include "libkwineffects/effects.h" #include "placement.h" #include "pluginmanager.h" #include "utils/xcbutils.h" diff --git a/autotests/integration/lockscreen.cpp b/autotests/integration/lockscreen.cpp index 06cc778c5a..4aa54cf030 100644 --- a/autotests/integration/lockscreen.cpp +++ b/autotests/integration/lockscreen.cpp @@ -11,7 +11,7 @@ #include "compositor.h" #include "core/output.h" #include "core/renderbackend.h" -#include "libkwineffects/effects.h" +#include "effect/effects.h" #include "pointer_input.h" #include "screenedge.h" #include "wayland/keyboard.h" diff --git a/autotests/integration/pointer_input.cpp b/autotests/integration/pointer_input.cpp index 48a395f5ed..69dda6e643 100644 --- a/autotests/integration/pointer_input.cpp +++ b/autotests/integration/pointer_input.cpp @@ -11,7 +11,7 @@ #include "core/output.h" #include "cursor.h" #include "cursorsource.h" -#include "libkwineffects/effects.h" +#include "effect/effects.h" #include "options.h" #include "pointer_input.h" #include "utils/xcursortheme.h" diff --git a/autotests/integration/screenedges_test.cpp b/autotests/integration/screenedges_test.cpp index e75b956cab..e355fa5b26 100644 --- a/autotests/integration/screenedges_test.cpp +++ b/autotests/integration/screenedges_test.cpp @@ -12,7 +12,7 @@ #include "atoms.h" #include "cursor.h" -#include "libkwineffects/effectloader.h" +#include "effect/effectloader.h" #include "main.h" #include "pointer_input.h" #include "screenedge.h" diff --git a/autotests/integration/scripting/screenedge_test.cpp b/autotests/integration/scripting/screenedge_test.cpp index d09f532479..69ea432ff9 100644 --- a/autotests/integration/scripting/screenedge_test.cpp +++ b/autotests/integration/scripting/screenedge_test.cpp @@ -8,7 +8,7 @@ */ #include "kwin_wayland_test.h" -#include "libkwineffects/effectloader.h" +#include "effect/effectloader.h" #include "pointer_input.h" #include "scripting/scripting.h" #include "wayland_server.h" diff --git a/autotests/integration/x11_window_test.cpp b/autotests/integration/x11_window_test.cpp index 2f0a5f2470..aa48b26d8d 100644 --- a/autotests/integration/x11_window_test.cpp +++ b/autotests/integration/x11_window_test.cpp @@ -11,7 +11,7 @@ #include "atoms.h" #include "compositor.h" #include "cursor.h" -#include "libkwineffects/effectloader.h" +#include "effect/effectloader.h" #include "wayland_server.h" #include "workspace.h" #include "x11window.h" diff --git a/autotests/test_window_paint_data.cpp b/autotests/test_window_paint_data.cpp index 9c80f4cdb2..9d4f3d9be7 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 "libkwineffects/effects.h" +#include "effect/effects.h" #include "virtualdesktops.h" diff --git a/autotests/test_x11_timestamp_update.cpp b/autotests/test_x11_timestamp_update.cpp index 635f919f14..91c9e10735 100644 --- a/autotests/test_x11_timestamp_update.cpp +++ b/autotests/test_x11_timestamp_update.cpp @@ -10,7 +10,7 @@ #include #include -#include "libkwineffects/xcb.h" +#include "effect/xcb.h" #include "main.h" #include "utils/common.h" diff --git a/autotests/testutils.h b/autotests/testutils.h index 0729046078..4c8d002fa3 100644 --- a/autotests/testutils.h +++ b/autotests/testutils.h @@ -9,8 +9,8 @@ #ifndef TESTUTILS_H #define TESTUTILS_H // KWin -#include "libkwineffects/globals.h" -#include "libkwineffects/xcb.h" +#include "effect/globals.h" +#include "effect/xcb.h" namespace { diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index fed1a6281c..dceb04600d 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -81,6 +81,18 @@ target_sources(kwin PRIVATE decorations/decorations_logging.cpp decorations/settings.cpp dpmsinputeventfilter.cpp + effect/anidata.cpp + effect/animationeffect.cpp + effect/effect.cpp + effect/effectframe.cpp + effect/effectloader.cpp + effect/effects.cpp + effect/effecttogglablestate.cpp + effect/logging.cpp + effect/offscreeneffect.cpp + effect/offscreenquickview.cpp + effect/quickeffect.cpp + effect/timeline.cpp events.cpp focuschain.cpp ftrace.cpp @@ -106,18 +118,6 @@ target_sources(kwin PRIVATE layers.cpp layershellv1integration.cpp layershellv1window.cpp - libkwineffects/anidata.cpp - libkwineffects/animationeffect.cpp - libkwineffects/effect.cpp - libkwineffects/effectframe.cpp - libkwineffects/effectloader.cpp - libkwineffects/effects.cpp - libkwineffects/effecttogglablestate.cpp - libkwineffects/logging.cpp - libkwineffects/offscreeneffect.cpp - libkwineffects/offscreenquickview.cpp - libkwineffects/quickeffect.cpp - libkwineffects/timeline.cpp lidswitchtracker.cpp main.cpp modifier_only_shortcuts.cpp @@ -294,7 +294,7 @@ set(kwin_dbus_SRCS) qt_add_dbus_adaptor(kwin_dbus_SRCS scripting/org.kde.kwin.Script.xml scripting/scripting.h KWin::AbstractScript) qt_add_dbus_adaptor(kwin_dbus_SRCS org.kde.KWin.xml dbusinterface.h KWin::DBusInterface) qt_add_dbus_adaptor(kwin_dbus_SRCS org.kde.kwin.Compositing.xml dbusinterface.h KWin::CompositorDBusInterface) -qt_add_dbus_adaptor(kwin_dbus_SRCS ${kwin_effects_dbus_xml} libkwineffects/effects.h KWin::EffectsHandler) +qt_add_dbus_adaptor(kwin_dbus_SRCS ${kwin_effects_dbus_xml} effect/effects.h KWin::EffectsHandler) qt_add_dbus_adaptor(kwin_dbus_SRCS org.kde.KWin.VirtualDesktopManager.xml dbusinterface.h KWin::VirtualDesktopManagerDBusInterface) qt_add_dbus_adaptor(kwin_dbus_SRCS org.kde.KWin.Session.xml sm.h KWin::SessionManager) qt_add_dbus_adaptor(kwin_dbus_SRCS org.kde.KWin.Plugins.xml dbusinterface.h KWin::PluginManagerDBusInterface) @@ -435,16 +435,16 @@ install(FILES DESTINATION ${KDE_INSTALL_INCLUDEDIR}/kwin/utils COMPONENT Devel) install(FILES - libkwineffects/animationeffect.h - libkwineffects/effect.h - libkwineffects/effects.h - libkwineffects/effecttogglablestate.h - libkwineffects/globals.h - libkwineffects/offscreeneffect.h - libkwineffects/offscreenquickview.h - libkwineffects/quickeffect.h - libkwineffects/timeline.h - DESTINATION ${KDE_INSTALL_INCLUDEDIR}/kwin/libkwineffects COMPONENT Devel) + effect/animationeffect.h + effect/effect.h + effect/effects.h + effect/effecttogglablestate.h + effect/globals.h + effect/offscreeneffect.h + effect/offscreenquickview.h + effect/quickeffect.h + effect/timeline.h + DESTINATION ${KDE_INSTALL_INCLUDEDIR}/kwin/effect COMPONENT Devel) install(FILES opengl/glframebuffer.h diff --git a/src/activities.h b/src/activities.h index 43fdab2a7b..9064544e23 100644 --- a/src/activities.h +++ b/src/activities.h @@ -8,7 +8,7 @@ */ #pragma once -#include "libkwineffects/globals.h" +#include "effect/globals.h" #include #include diff --git a/src/appmenu.h b/src/appmenu.h index 889bd72d21..54e481225c 100644 --- a/src/appmenu.h +++ b/src/appmenu.h @@ -10,7 +10,7 @@ */ #pragma once // KWin -#include "libkwineffects/globals.h" +#include "effect/globals.h" // Qt #include // xcb diff --git a/src/backends/libinput/connection.h b/src/backends/libinput/connection.h index 82c0135c88..20b07d7b72 100644 --- a/src/backends/libinput/connection.h +++ b/src/backends/libinput/connection.h @@ -8,7 +8,7 @@ */ #pragma once -#include "libkwineffects/globals.h" +#include "effect/globals.h" #include diff --git a/src/backends/wayland/wayland_backend.h b/src/backends/wayland/wayland_backend.h index 9cfa94cc7f..c4ac17d35c 100644 --- a/src/backends/wayland/wayland_backend.h +++ b/src/backends/wayland/wayland_backend.h @@ -14,7 +14,7 @@ #include "core/inputbackend.h" #include "core/inputdevice.h" #include "core/outputbackend.h" -#include "libkwineffects/globals.h" +#include "effect/globals.h" #include "utils/filedescriptor.h" // Qt #include diff --git a/src/backends/x11/standalone/x11_standalone_effects.h b/src/backends/x11/standalone/x11_standalone_effects.h index 145b8c1431..ff54301ae8 100644 --- a/src/backends/x11/standalone/x11_standalone_effects.h +++ b/src/backends/x11/standalone/x11_standalone_effects.h @@ -9,7 +9,7 @@ */ #pragma once -#include "libkwineffects/effects.h" +#include "effect/effects.h" #include "utils/xcbutils.h" #include diff --git a/src/backends/x11/standalone/x11_standalone_effects_mouse_interception_filter.cpp b/src/backends/x11/standalone/x11_standalone_effects_mouse_interception_filter.cpp index a686ba86ac..4cd77b36a0 100644 --- a/src/backends/x11/standalone/x11_standalone_effects_mouse_interception_filter.cpp +++ b/src/backends/x11/standalone/x11_standalone_effects_mouse_interception_filter.cpp @@ -7,7 +7,7 @@ SPDX-License-Identifier: GPL-2.0-or-later */ #include "x11_standalone_effects_mouse_interception_filter.h" -#include "libkwineffects/effects.h" +#include "effect/effects.h" #include "utils/common.h" #include diff --git a/src/backends/x11/standalone/x11_standalone_glx_backend.cpp b/src/backends/x11/standalone/x11_standalone_glx_backend.cpp index be9fd57f6a..5bf3b45c93 100644 --- a/src/backends/x11/standalone/x11_standalone_glx_backend.cpp +++ b/src/backends/x11/standalone/x11_standalone_glx_backend.cpp @@ -34,7 +34,7 @@ #include "utils/xcbutils.h" #include "workspace.h" // kwin libs -#include "libkwineffects/offscreenquickview.h" +#include "effect/offscreenquickview.h" #include "opengl/glplatform.h" #include "opengl/glutils.h" // Qt diff --git a/src/backends/x11/standalone/x11_standalone_overlaywindow.cpp b/src/backends/x11/standalone/x11_standalone_overlaywindow.cpp index c13648f41d..2d2af15c45 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 "compositor.h" -#include "libkwineffects/globals.h" +#include "effect/globals.h" #include "scene/workspacescene.h" #include "utils/common.h" #include "utils/xcbutils.h" diff --git a/src/backends/x11/standalone/x11_standalone_xinputintegration.cpp b/src/backends/x11/standalone/x11_standalone_xinputintegration.cpp index e76b361e96..a90591632c 100644 --- a/src/backends/x11/standalone/x11_standalone_xinputintegration.cpp +++ b/src/backends/x11/standalone/x11_standalone_xinputintegration.cpp @@ -18,9 +18,9 @@ #include "../common/ge_event_mem_mover.h" +#include "effect/globals.h" +#include "effect/xcb.h" #include "input.h" -#include "libkwineffects/globals.h" -#include "libkwineffects/xcb.h" #include "modifier_only_shortcuts.h" #include "workspace.h" #include "x11eventfilter.h" diff --git a/src/client_machine.cpp b/src/client_machine.cpp index e7b42c671b..6f9bcda814 100644 --- a/src/client_machine.cpp +++ b/src/client_machine.cpp @@ -8,7 +8,7 @@ */ // own #include "client_machine.h" -#include "libkwineffects/xcb.h" +#include "effect/xcb.h" #include "main.h" #include "utils/common.h" // KF5 diff --git a/src/colors/colordevice.h b/src/colors/colordevice.h index 449ae92d35..0326b192ec 100644 --- a/src/colors/colordevice.h +++ b/src/colors/colordevice.h @@ -6,7 +6,7 @@ #pragma once -#include "libkwineffects/globals.h" +#include "effect/globals.h" #include #include diff --git a/src/colors/colormanager.h b/src/colors/colormanager.h index f8519a325f..678923c378 100644 --- a/src/colors/colormanager.h +++ b/src/colors/colormanager.h @@ -6,7 +6,7 @@ #pragma once -#include "libkwineffects/globals.h" +#include "effect/globals.h" #include #include diff --git a/src/compositor.h b/src/compositor.h index cda88ee9b0..7957e6d536 100644 --- a/src/compositor.h +++ b/src/compositor.h @@ -9,7 +9,7 @@ */ #pragma once -#include "libkwineffects/globals.h" +#include "effect/globals.h" #include #include diff --git a/src/core/outputbackend.h b/src/core/outputbackend.h index 305d95ea6c..893004762d 100644 --- a/src/core/outputbackend.h +++ b/src/core/outputbackend.h @@ -9,7 +9,7 @@ #pragma once -#include "libkwineffects/globals.h" +#include "effect/globals.h" #include #include diff --git a/src/core/renderbackend.h b/src/core/renderbackend.h index 359b1576ae..6f073509e4 100644 --- a/src/core/renderbackend.h +++ b/src/core/renderbackend.h @@ -7,7 +7,7 @@ #pragma once #include "core/rendertarget.h" -#include "libkwineffects/globals.h" +#include "effect/globals.h" #include diff --git a/src/core/renderjournal.h b/src/core/renderjournal.h index 3b664e496f..6aa73ff9b3 100644 --- a/src/core/renderjournal.h +++ b/src/core/renderjournal.h @@ -6,7 +6,7 @@ #pragma once -#include "libkwineffects/globals.h" +#include "effect/globals.h" #include #include diff --git a/src/core/renderlayerdelegate.h b/src/core/renderlayerdelegate.h index e2c0028b58..50d7d3d2e8 100644 --- a/src/core/renderlayerdelegate.h +++ b/src/core/renderlayerdelegate.h @@ -6,8 +6,8 @@ #pragma once +#include "effect/globals.h" #include "kwin_export.h" -#include "libkwineffects/globals.h" #include #include diff --git a/src/core/renderloop.h b/src/core/renderloop.h index eb64cc388e..e1e6329831 100644 --- a/src/core/renderloop.h +++ b/src/core/renderloop.h @@ -6,7 +6,7 @@ #pragma once -#include "libkwineffects/globals.h" +#include "effect/globals.h" #include diff --git a/src/core/session.h b/src/core/session.h index 279dbd4cd1..41155cd140 100644 --- a/src/core/session.h +++ b/src/core/session.h @@ -6,7 +6,7 @@ #pragma once -#include "libkwineffects/globals.h" +#include "effect/globals.h" #include #include diff --git a/src/cursor.h b/src/cursor.h index 6bb74c7e4a..e632b90cc2 100644 --- a/src/cursor.h +++ b/src/cursor.h @@ -8,7 +8,7 @@ */ #pragma once // kwin -#include "libkwineffects/globals.h" +#include "effect/globals.h" // Qt #include #include diff --git a/src/decorations/decorationbridge.h b/src/decorations/decorationbridge.h index a45bc5a555..cd37716a1a 100644 --- a/src/decorations/decorationbridge.h +++ b/src/decorations/decorationbridge.h @@ -8,7 +8,7 @@ */ #pragma once -#include "libkwineffects/globals.h" +#include "effect/globals.h" #include diff --git a/src/libkwineffects/anidata.cpp b/src/effect/anidata.cpp similarity index 98% rename from src/libkwineffects/anidata.cpp rename to src/effect/anidata.cpp index 8730787310..3758574a74 100644 --- a/src/libkwineffects/anidata.cpp +++ b/src/effect/anidata.cpp @@ -8,7 +8,7 @@ SPDX-License-Identifier: GPL-2.0-or-later */ -#include "libkwineffects/anidata_p.h" +#include "effect/anidata_p.h" #include "logging_p.h" diff --git a/src/libkwineffects/anidata_p.h b/src/effect/anidata_p.h similarity index 95% rename from src/libkwineffects/anidata_p.h rename to src/effect/anidata_p.h index 747fdc01ac..54078c8751 100644 --- a/src/libkwineffects/anidata_p.h +++ b/src/effect/anidata_p.h @@ -10,8 +10,8 @@ #pragma once -#include "libkwineffects/animationeffect.h" -#include "libkwineffects/timeline.h" +#include "effect/animationeffect.h" +#include "effect/timeline.h" #include diff --git a/src/libkwineffects/animationeffect.cpp b/src/effect/animationeffect.cpp similarity index 99% rename from src/libkwineffects/animationeffect.cpp rename to src/effect/animationeffect.cpp index 31a30f96cf..05d7492509 100644 --- a/src/libkwineffects/animationeffect.cpp +++ b/src/effect/animationeffect.cpp @@ -8,8 +8,8 @@ SPDX-License-Identifier: GPL-2.0-or-later */ -#include "libkwineffects/animationeffect.h" -#include "libkwineffects/anidata_p.h" +#include "effect/animationeffect.h" +#include "effect/anidata_p.h" #include "opengl/glutils.h" #include diff --git a/src/libkwineffects/animationeffect.h b/src/effect/animationeffect.h similarity index 99% rename from src/libkwineffects/animationeffect.h rename to src/effect/animationeffect.h index 13c14d5516..9b3763ea1e 100644 --- a/src/libkwineffects/animationeffect.h +++ b/src/effect/animationeffect.h @@ -12,7 +12,7 @@ #include "kwin_export.h" -#include "libkwineffects/offscreeneffect.h" +#include "effect/offscreeneffect.h" #include #include #include diff --git a/src/libkwineffects/effect.cpp b/src/effect/effect.cpp similarity index 99% rename from src/libkwineffects/effect.cpp rename to src/effect/effect.cpp index 9947960193..d567df68e0 100644 --- a/src/libkwineffects/effect.cpp +++ b/src/effect/effect.cpp @@ -6,8 +6,8 @@ SPDX-License-Identifier: GPL-2.0-or-later */ -#include "libkwineffects/effect.h" -#include "libkwineffects/effects.h" +#include "effect/effect.h" +#include "effect/effects.h" #include diff --git a/src/libkwineffects/effect.h b/src/effect/effect.h similarity index 99% rename from src/libkwineffects/effect.h rename to src/effect/effect.h index 259aae8081..777a2a149d 100644 --- a/src/libkwineffects/effect.h +++ b/src/effect/effect.h @@ -9,7 +9,7 @@ #pragma once -#include "libkwineffects/globals.h" +#include "effect/globals.h" #include diff --git a/src/libkwineffects/effectframe.cpp b/src/effect/effectframe.cpp similarity index 99% rename from src/libkwineffects/effectframe.cpp rename to src/effect/effectframe.cpp index 115a2e5b15..36af818516 100644 --- a/src/libkwineffects/effectframe.cpp +++ b/src/effect/effectframe.cpp @@ -5,8 +5,8 @@ SPDX-License-Identifier: GPL-2.0-or-later */ -#include "libkwineffects/effectframe.h" -#include "libkwineffects/effects.h" +#include "effect/effectframe.h" +#include "effect/effects.h" #include #include diff --git a/src/libkwineffects/effectframe.h b/src/effect/effectframe.h similarity index 98% rename from src/libkwineffects/effectframe.h rename to src/effect/effectframe.h index 893f7db0fc..e502b391c2 100644 --- a/src/libkwineffects/effectframe.h +++ b/src/effect/effectframe.h @@ -7,8 +7,8 @@ #pragma once -#include "libkwineffects/globals.h" -#include "libkwineffects/offscreenquickview.h" +#include "effect/globals.h" +#include "effect/offscreenquickview.h" #include #include diff --git a/src/libkwineffects/effectloader.cpp b/src/effect/effectloader.cpp similarity index 99% rename from src/libkwineffects/effectloader.cpp rename to src/effect/effectloader.cpp index f461308f2e..93b82bc480 100644 --- a/src/libkwineffects/effectloader.cpp +++ b/src/effect/effectloader.cpp @@ -7,11 +7,11 @@ SPDX-License-Identifier: GPL-2.0-or-later */ // own -#include "libkwineffects/effectloader.h" +#include "effect/effectloader.h" // config #include // KWin -#include "libkwineffects/effect.h" +#include "effect/effect.h" #include "plugin.h" #include "scripting/scriptedeffect.h" #include "scripting/scriptedquicksceneeffect.h" diff --git a/src/libkwineffects/effectloader.h b/src/effect/effectloader.h similarity index 100% rename from src/libkwineffects/effectloader.h rename to src/effect/effectloader.h diff --git a/src/libkwineffects/effects.cpp b/src/effect/effects.cpp similarity index 99% rename from src/libkwineffects/effects.cpp rename to src/effect/effects.cpp index 84d89cfbdc..a116bf1f45 100644 --- a/src/libkwineffects/effects.cpp +++ b/src/effect/effects.cpp @@ -9,7 +9,7 @@ SPDX-License-Identifier: GPL-2.0-or-later */ -#include "libkwineffects/effects.h" +#include "effect/effects.h" #include "config-kwin.h" @@ -20,6 +20,8 @@ #include "core/rendertarget.h" #include "core/renderviewport.h" #include "decorations/decorationbridge.h" +#include "effect/effectloader.h" +#include "effect/offscreenquickview.h" #include "effectsadaptor.h" #include "group.h" #include "input.h" @@ -27,8 +29,6 @@ #include "inputmethod.h" #include "inputpanelv1window.h" #include "internalwindow.h" -#include "libkwineffects/effectloader.h" -#include "libkwineffects/offscreenquickview.h" #include "opengl/glutils.h" #include "osd.h" #include "pointer_input.h" diff --git a/src/libkwineffects/effects.h b/src/effect/effects.h similarity index 99% rename from src/libkwineffects/effects.h rename to src/effect/effects.h index fa09e21913..0e27655161 100644 --- a/src/libkwineffects/effects.h +++ b/src/effect/effects.h @@ -12,7 +12,7 @@ #pragma once -#include "libkwineffects/effect.h" +#include "effect/effect.h" #include "opengl/glvertexbuffer.h" #include diff --git a/src/libkwineffects/effecttogglablestate.cpp b/src/effect/effecttogglablestate.cpp similarity index 98% rename from src/libkwineffects/effecttogglablestate.cpp rename to src/effect/effecttogglablestate.cpp index c082355540..7659d79bf7 100644 --- a/src/libkwineffects/effecttogglablestate.cpp +++ b/src/effect/effecttogglablestate.cpp @@ -4,8 +4,8 @@ SPDX-License-Identifier: GPL-2.0-or-later */ -#include "libkwineffects/effecttogglablestate.h" -#include "libkwineffects/effects.h" +#include "effect/effecttogglablestate.h" +#include "effect/effects.h" namespace KWin { diff --git a/src/libkwineffects/effecttogglablestate.h b/src/effect/effecttogglablestate.h similarity index 98% rename from src/libkwineffects/effecttogglablestate.h rename to src/effect/effecttogglablestate.h index d33a2300a2..6e2c505d14 100644 --- a/src/libkwineffects/effecttogglablestate.h +++ b/src/effect/effecttogglablestate.h @@ -6,7 +6,7 @@ #pragma once -#include "libkwineffects/globals.h" +#include "effect/globals.h" #include #include diff --git a/src/libkwineffects/globals.h b/src/effect/globals.h similarity index 100% rename from src/libkwineffects/globals.h rename to src/effect/globals.h diff --git a/src/libkwineffects/logging.cpp b/src/effect/logging.cpp similarity index 76% rename from src/libkwineffects/logging.cpp rename to src/effect/logging.cpp index 9e83fa274c..a9f1ae8f36 100644 --- a/src/libkwineffects/logging.cpp +++ b/src/effect/logging.cpp @@ -7,4 +7,4 @@ SPDX-License-Identifier: GPL-2.0-or-later */ #include "logging_p.h" -Q_LOGGING_CATEGORY(LIBKWINEFFECTS, "libkwineffects", QtWarningMsg) +Q_LOGGING_CATEGORY(LIBKWINEFFECTS, "effect", QtWarningMsg) diff --git a/src/libkwineffects/logging_p.h b/src/effect/logging_p.h similarity index 100% rename from src/libkwineffects/logging_p.h rename to src/effect/logging_p.h diff --git a/src/libkwineffects/offscreeneffect.cpp b/src/effect/offscreeneffect.cpp similarity index 99% rename from src/libkwineffects/offscreeneffect.cpp rename to src/effect/offscreeneffect.cpp index f1909e8b3b..716d57f4f4 100644 --- a/src/libkwineffects/offscreeneffect.cpp +++ b/src/effect/offscreeneffect.cpp @@ -4,7 +4,7 @@ SPDX-License-Identifier: GPL-2.0-or-later */ -#include "libkwineffects/offscreeneffect.h" +#include "effect/offscreeneffect.h" #include "core/output.h" #include "core/rendertarget.h" #include "core/renderviewport.h" diff --git a/src/libkwineffects/offscreeneffect.h b/src/effect/offscreeneffect.h similarity index 99% rename from src/libkwineffects/offscreeneffect.h rename to src/effect/offscreeneffect.h index 77a290cc3e..f4fa598004 100644 --- a/src/libkwineffects/offscreeneffect.h +++ b/src/effect/offscreeneffect.h @@ -6,7 +6,7 @@ #pragma once -#include "libkwineffects/effects.h" +#include "effect/effects.h" namespace KWin { diff --git a/src/libkwineffects/offscreenquickview.cpp b/src/effect/offscreenquickview.cpp similarity index 99% rename from src/libkwineffects/offscreenquickview.cpp rename to src/effect/offscreenquickview.cpp index 186f79d077..7c6622531d 100644 --- a/src/libkwineffects/offscreenquickview.cpp +++ b/src/effect/offscreenquickview.cpp @@ -7,8 +7,8 @@ SPDX-License-Identifier: GPL-2.0-or-later */ -#include "libkwineffects/offscreenquickview.h" -#include "libkwineffects/effects.h" +#include "effect/offscreenquickview.h" +#include "effect/effects.h" #include "logging_p.h" #include "opengl/glutils.h" diff --git a/src/libkwineffects/offscreenquickview.h b/src/effect/offscreenquickview.h similarity index 100% rename from src/libkwineffects/offscreenquickview.h rename to src/effect/offscreenquickview.h diff --git a/src/libkwineffects/quickeffect.cpp b/src/effect/quickeffect.cpp similarity index 99% rename from src/libkwineffects/quickeffect.cpp rename to src/effect/quickeffect.cpp index c01eead1e5..d47c3053e4 100644 --- a/src/libkwineffects/quickeffect.cpp +++ b/src/effect/quickeffect.cpp @@ -4,9 +4,9 @@ SPDX-License-Identifier: GPL-2.0-or-later */ -#include "libkwineffects/quickeffect.h" +#include "effect/quickeffect.h" #include "core/output.h" -#include "libkwineffects/effects.h" +#include "effect/effects.h" #include "logging_p.h" diff --git a/src/libkwineffects/quickeffect.h b/src/effect/quickeffect.h similarity index 98% rename from src/libkwineffects/quickeffect.h rename to src/effect/quickeffect.h index 9be4b5a6da..f62e27cb23 100644 --- a/src/libkwineffects/quickeffect.h +++ b/src/effect/quickeffect.h @@ -7,8 +7,8 @@ #pragma once #include "core/output.h" -#include "libkwineffects/effect.h" -#include "libkwineffects/offscreenquickview.h" +#include "effect/effect.h" +#include "effect/offscreenquickview.h" #include diff --git a/src/libkwineffects/timeline.cpp b/src/effect/timeline.cpp similarity index 99% rename from src/libkwineffects/timeline.cpp rename to src/effect/timeline.cpp index 9c09c3f093..3d377dc5c7 100644 --- a/src/libkwineffects/timeline.cpp +++ b/src/effect/timeline.cpp @@ -4,7 +4,7 @@ SPDX-License-Identifier: GPL-2.0-or-later */ -#include "libkwineffects/timeline.h" +#include "effect/timeline.h" namespace KWin { diff --git a/src/libkwineffects/timeline.h b/src/effect/timeline.h similarity index 100% rename from src/libkwineffects/timeline.h rename to src/effect/timeline.h diff --git a/src/libkwineffects/xcb.h b/src/effect/xcb.h similarity index 100% rename from src/libkwineffects/xcb.h rename to src/effect/xcb.h diff --git a/src/events.cpp b/src/events.cpp index 14922b5dba..4beef9a934 100644 --- a/src/events.cpp +++ b/src/events.cpp @@ -16,9 +16,9 @@ #include "atoms.h" #include "cursor.h" +#include "effect/effects.h" #include "focuschain.h" #include "group.h" -#include "libkwineffects/effects.h" #include "netinfo.h" #include "rules.h" #include "screenedge.h" diff --git a/src/focuschain.h b/src/focuschain.h index 9c8b5d7e56..cc6b2ca3ec 100644 --- a/src/focuschain.h +++ b/src/focuschain.h @@ -8,7 +8,7 @@ */ #pragma once // KWin -#include "libkwineffects/globals.h" +#include "effect/globals.h" // Qt #include #include diff --git a/src/ftrace.h b/src/ftrace.h index eda8dd7b97..3147a5e333 100644 --- a/src/ftrace.h +++ b/src/ftrace.h @@ -9,7 +9,7 @@ #pragma once -#include "libkwineffects/globals.h" +#include "effect/globals.h" #include #include diff --git a/src/gestures.h b/src/gestures.h index eaed7971ce..f467f5d595 100644 --- a/src/gestures.h +++ b/src/gestures.h @@ -8,7 +8,7 @@ */ #pragma once -#include "libkwineffects/globals.h" +#include "effect/globals.h" #include #include diff --git a/src/globalshortcuts.cpp b/src/globalshortcuts.cpp index 0656f58f00..ac7ba9550d 100644 --- a/src/globalshortcuts.cpp +++ b/src/globalshortcuts.cpp @@ -11,8 +11,8 @@ // config #include // kwin +#include "effect/globals.h" #include "gestures.h" -#include "libkwineffects/globals.h" #include "main.h" #include "utils/common.h" // KDE diff --git a/src/globalshortcuts.h b/src/globalshortcuts.h index f37e44f0ca..db3db30b7c 100644 --- a/src/globalshortcuts.h +++ b/src/globalshortcuts.h @@ -8,7 +8,7 @@ */ #pragma once // KWin -#include "libkwineffects/globals.h" +#include "effect/globals.h" // Qt #include diff --git a/src/input.h b/src/input.h index f5ff8ed89f..dd0e5534d9 100644 --- a/src/input.h +++ b/src/input.h @@ -11,7 +11,7 @@ #pragma once #include -#include "libkwineffects/globals.h" +#include "effect/globals.h" #include #include #include diff --git a/src/inputmethod.h b/src/inputmethod.h index b6e9fa4a49..752e5d63d6 100644 --- a/src/inputmethod.h +++ b/src/inputmethod.h @@ -15,7 +15,7 @@ #include -#include "libkwineffects/globals.h" +#include "effect/globals.h" #include #include diff --git a/src/kcms/screenedges/kwinscreenedge.h b/src/kcms/screenedges/kwinscreenedge.h index 1a88108803..47da91d5aa 100644 --- a/src/kcms/screenedges/kwinscreenedge.h +++ b/src/kcms/screenedges/kwinscreenedge.h @@ -11,7 +11,7 @@ #include -#include "libkwineffects/globals.h" +#include "effect/globals.h" namespace KWin { diff --git a/src/kcms/screenedges/kwinscreenedgeeffectsettings.kcfgc b/src/kcms/screenedges/kwinscreenedgeeffectsettings.kcfgc index 86ef4add03..daa2db3eea 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=\"libkwineffects/globals.h\" +IncludeFiles=\"effect/globals.h\" Mutators=true DefaultValueGetters=true ParentInConstructor=true diff --git a/src/kcms/screenedges/kwinscreenedgescriptsettings.kcfgc b/src/kcms/screenedges/kwinscreenedgescriptsettings.kcfgc index e27832e116..4b4079ad38 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=\"libkwineffects/globals.h\" +IncludeFiles=\"effect/globals.h\" Mutators=true DefaultValueGetters=true ParentInConstructor=true diff --git a/src/kcms/screenedges/kwinscreenedgesettings.kcfgc b/src/kcms/screenedges/kwinscreenedgesettings.kcfgc index 5ac758778f..d98eedefd7 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=\"libkwineffects/globals.h\" +IncludeFiles=\"effect/globals.h\" Mutators=true DefaultValueGetters=true ParentInConstructor=true diff --git a/src/kcms/screenedges/kwintouchscreenedgeeffectsettings.kcfgc b/src/kcms/screenedges/kwintouchscreenedgeeffectsettings.kcfgc index 49a3ce8195..40149ffe53 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=\"libkwineffects/globals.h\" +IncludeFiles=\"effect/globals.h\" Mutators=true DefaultValueGetters=true ParentInConstructor=true diff --git a/src/kcms/screenedges/kwintouchscreenscriptsettings.kcfgc b/src/kcms/screenedges/kwintouchscreenscriptsettings.kcfgc index 9b07372bf4..fa07e70dbf 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=\"libkwineffects/globals.h\" +IncludeFiles=\"effect/globals.h\" Mutators=true DefaultValueGetters=true ParentInConstructor=true diff --git a/src/kcms/screenedges/kwintouchscreensettings.kcfgc b/src/kcms/screenedges/kwintouchscreensettings.kcfgc index 09b7a26229..e60ed93727 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=\"libkwineffects/globals.h\" +IncludeFiles=\"effect/globals.h\" Mutators=true DefaultValueGetters=true ParentInConstructor=true diff --git a/src/kcms/screenedges/main.h b/src/kcms/screenedges/main.h index 53dcbcaa84..b3877a6335 100644 --- a/src/kcms/screenedges/main.h +++ b/src/kcms/screenedges/main.h @@ -13,7 +13,7 @@ #include #include -#include "libkwineffects/globals.h" +#include "effect/globals.h" namespace KWin { diff --git a/src/kcms/screenedges/touch.h b/src/kcms/screenedges/touch.h index b837ccce30..275bb35dae 100644 --- a/src/kcms/screenedges/touch.h +++ b/src/kcms/screenedges/touch.h @@ -13,7 +13,7 @@ #include #include -#include "libkwineffects/globals.h" +#include "effect/globals.h" class QShowEvent; diff --git a/src/layers.cpp b/src/layers.cpp index f327d21b9a..a9ed9bcd19 100644 --- a/src/layers.cpp +++ b/src/layers.cpp @@ -65,10 +65,10 @@ */ #include "compositor.h" +#include "effect/effects.h" #include "focuschain.h" #include "group.h" #include "internalwindow.h" -#include "libkwineffects/effects.h" #include "netinfo.h" #include "rules.h" #include "screenedge.h" diff --git a/src/main.cpp b/src/main.cpp index 7b80c23a46..55f3f46d64 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -19,9 +19,9 @@ #include "core/session.h" #include "cursor.h" #include "cursorsource.h" +#include "effect/effects.h" #include "input.h" #include "inputmethod.h" -#include "libkwineffects/effects.h" #include "opengl/gltexture.h" #include "opengl/glutils.h" #include "options.h" @@ -41,7 +41,7 @@ #include "screenlockerwatcher.h" #endif -#include "libkwineffects/effects.h" +#include "effect/effects.h" // KDE #include diff --git a/src/main.h b/src/main.h index 1106d0f9e9..b5d87061ce 100644 --- a/src/main.h +++ b/src/main.h @@ -10,7 +10,7 @@ #pragma once -#include "libkwineffects/globals.h" +#include "effect/globals.h" #include #include diff --git a/src/main_wayland.cpp b/src/main_wayland.cpp index 8f74170696..3d610860ae 100644 --- a/src/main_wayland.cpp +++ b/src/main_wayland.cpp @@ -17,8 +17,8 @@ #include "compositor_wayland.h" #include "core/outputbackend.h" #include "core/session.h" +#include "effect/effects.h" #include "inputmethod.h" -#include "libkwineffects/effects.h" #include "tabletmodemanager.h" #include "utils/realtime.h" #include "wayland/display.h" diff --git a/src/main_x11.cpp b/src/main_x11.cpp index f51c8ba45e..d81ab13c48 100644 --- a/src/main_x11.cpp +++ b/src/main_x11.cpp @@ -17,7 +17,7 @@ #include "core/outputbackend.h" #include "core/session.h" #include "cursor.h" -#include "libkwineffects/effects.h" +#include "effect/effects.h" #include "outline.h" #include "screenedge.h" #include "sm.h" diff --git a/src/opengl/glplatform.cpp b/src/opengl/glplatform.cpp index db22ac7574..00fd1223d8 100644 --- a/src/opengl/glplatform.cpp +++ b/src/opengl/glplatform.cpp @@ -10,7 +10,7 @@ #include "opengl/glplatform.h" // include kwinglutils_funcs.h to avoid the redeclaration issues // between qopengl.h and epoxy/gl.h -#include "libkwineffects/xcb.h" +#include "effect/xcb.h" #include "opengl/glutils_funcs.h" #include diff --git a/src/opengl/glplatform.h b/src/opengl/glplatform.h index f51bf9c584..e5295f0058 100644 --- a/src/opengl/glplatform.h +++ b/src/opengl/glplatform.h @@ -9,7 +9,7 @@ #pragma once -#include "libkwineffects/globals.h" +#include "effect/globals.h" #include "openglcontext.h" #include diff --git a/src/outline.h b/src/outline.h index 5ee2ce2750..ce60fe70a9 100644 --- a/src/outline.h +++ b/src/outline.h @@ -8,7 +8,7 @@ */ #pragma once -#include "libkwineffects/globals.h" +#include "effect/globals.h" #include #include #include diff --git a/src/pluginmanager.h b/src/pluginmanager.h index 11caa996cb..23d8513367 100644 --- a/src/pluginmanager.h +++ b/src/pluginmanager.h @@ -6,7 +6,7 @@ #pragma once -#include "libkwineffects/globals.h" +#include "effect/globals.h" #include #include diff --git a/src/plugins/backgroundcontrast/contrast.cpp b/src/plugins/backgroundcontrast/contrast.cpp index 0916e53d9b..d04b95268b 100644 --- a/src/plugins/backgroundcontrast/contrast.cpp +++ b/src/plugins/backgroundcontrast/contrast.cpp @@ -12,7 +12,7 @@ #include "core/rendertarget.h" #include "core/renderviewport.h" -#include "libkwineffects/effects.h" +#include "effect/effects.h" #include "utils/xcbutils.h" #include "wayland/contrast.h" #include "wayland/display.h" diff --git a/src/plugins/backgroundcontrast/contrast.h b/src/plugins/backgroundcontrast/contrast.h index 7d2abdaf7d..9ef74950cc 100644 --- a/src/plugins/backgroundcontrast/contrast.h +++ b/src/plugins/backgroundcontrast/contrast.h @@ -7,7 +7,7 @@ #pragma once -#include "libkwineffects/effect.h" +#include "effect/effect.h" #include "opengl/glplatform.h" #include "opengl/glutils.h" diff --git a/src/plugins/backgroundcontrast/contrastshader.cpp b/src/plugins/backgroundcontrast/contrastshader.cpp index b728822acb..e77b5a75af 100644 --- a/src/plugins/backgroundcontrast/contrastshader.cpp +++ b/src/plugins/backgroundcontrast/contrastshader.cpp @@ -7,7 +7,7 @@ #include "contrastshader.h" -#include "libkwineffects/effects.h" +#include "effect/effects.h" #include "opengl/glplatform.h" #include diff --git a/src/plugins/blendchanges/blendchanges.h b/src/plugins/blendchanges/blendchanges.h index 918dbb8ae5..3ee3f13321 100644 --- a/src/plugins/blendchanges/blendchanges.h +++ b/src/plugins/blendchanges/blendchanges.h @@ -7,9 +7,9 @@ SPDX-License-Identifier: GPL-2.0-or-later */ #pragma once -#include "libkwineffects/effects.h" -#include "libkwineffects/offscreeneffect.h" -#include "libkwineffects/timeline.h" +#include "effect/effects.h" +#include "effect/offscreeneffect.h" +#include "effect/timeline.h" #include namespace KWin diff --git a/src/plugins/blur/blur.cpp b/src/plugins/blur/blur.cpp index ebeb52f4fc..9eb758f0e1 100644 --- a/src/plugins/blur/blur.cpp +++ b/src/plugins/blur/blur.cpp @@ -12,7 +12,7 @@ #include "core/rendertarget.h" #include "core/renderviewport.h" -#include "libkwineffects/effects.h" +#include "effect/effects.h" #include "opengl/glplatform.h" #include "utils/xcbutils.h" #include "wayland/blur.h" diff --git a/src/plugins/blur/blur.h b/src/plugins/blur/blur.h index 8a02eff267..9cb8a179b0 100644 --- a/src/plugins/blur/blur.h +++ b/src/plugins/blur/blur.h @@ -7,7 +7,7 @@ #pragma once -#include "libkwineffects/effect.h" +#include "effect/effect.h" #include "opengl/glutils.h" #include diff --git a/src/plugins/colorblindnesscorrection/colorblindnesscorrection.cpp b/src/plugins/colorblindnesscorrection/colorblindnesscorrection.cpp index b892c15570..236c79164d 100644 --- a/src/plugins/colorblindnesscorrection/colorblindnesscorrection.cpp +++ b/src/plugins/colorblindnesscorrection/colorblindnesscorrection.cpp @@ -8,7 +8,7 @@ #include -#include "libkwineffects/effects.h" +#include "effect/effects.h" #include "opengl/glshader.h" #include "colorblindnesscorrection_settings.h" diff --git a/src/plugins/colorblindnesscorrection/colorblindnesscorrection.h b/src/plugins/colorblindnesscorrection/colorblindnesscorrection.h index 442caf1625..4ad7854a89 100644 --- a/src/plugins/colorblindnesscorrection/colorblindnesscorrection.h +++ b/src/plugins/colorblindnesscorrection/colorblindnesscorrection.h @@ -8,7 +8,7 @@ #include -#include "libkwineffects/offscreeneffect.h" +#include "effect/offscreeneffect.h" #include "opengl/glshadermanager.h" namespace KWin diff --git a/src/plugins/colorpicker/colorpicker.cpp b/src/plugins/colorpicker/colorpicker.cpp index 8ba282935e..e2037d0112 100644 --- a/src/plugins/colorpicker/colorpicker.cpp +++ b/src/plugins/colorpicker/colorpicker.cpp @@ -9,7 +9,7 @@ #include "colorpicker.h" #include "core/rendertarget.h" #include "core/renderviewport.h" -#include "libkwineffects/effects.h" +#include "effect/effects.h" #include "opengl/glutils.h" #include "opengl/glutils_funcs.h" #include diff --git a/src/plugins/colorpicker/colorpicker.h b/src/plugins/colorpicker/colorpicker.h index c2bacb957d..648c9ee46d 100644 --- a/src/plugins/colorpicker/colorpicker.h +++ b/src/plugins/colorpicker/colorpicker.h @@ -8,7 +8,7 @@ */ #pragma once -#include "libkwineffects/effect.h" +#include "effect/effect.h" #include #include #include diff --git a/src/plugins/diminactive/diminactive.cpp b/src/plugins/diminactive/diminactive.cpp index e187681458..c493f771f4 100644 --- a/src/plugins/diminactive/diminactive.cpp +++ b/src/plugins/diminactive/diminactive.cpp @@ -11,7 +11,7 @@ // own #include "diminactive.h" -#include "libkwineffects/effects.h" +#include "effect/effects.h" // KConfigSkeleton #include "diminactiveconfig.h" diff --git a/src/plugins/diminactive/diminactive.h b/src/plugins/diminactive/diminactive.h index b579c12dbf..180340cbe6 100644 --- a/src/plugins/diminactive/diminactive.h +++ b/src/plugins/diminactive/diminactive.h @@ -12,8 +12,8 @@ #pragma once // kwineffects -#include "libkwineffects/effect.h" -#include "libkwineffects/timeline.h" +#include "effect/effect.h" +#include "effect/timeline.h" namespace KWin { diff --git a/src/plugins/fallapart/fallapart.h b/src/plugins/fallapart/fallapart.h index 6206057b5b..3e0f01a937 100644 --- a/src/plugins/fallapart/fallapart.h +++ b/src/plugins/fallapart/fallapart.h @@ -9,7 +9,7 @@ #pragma once -#include "libkwineffects/offscreeneffect.h" +#include "effect/offscreeneffect.h" namespace KWin { diff --git a/src/plugins/glide/glide.h b/src/plugins/glide/glide.h index 1f477fd3b2..dbe4adc287 100644 --- a/src/plugins/glide/glide.h +++ b/src/plugins/glide/glide.h @@ -13,8 +13,8 @@ #pragma once // kwineffects -#include "libkwineffects/effects.h" -#include "libkwineffects/timeline.h" +#include "effect/effects.h" +#include "effect/timeline.h" namespace KWin { diff --git a/src/plugins/highlightwindow/highlightwindow.h b/src/plugins/highlightwindow/highlightwindow.h index 3715d81c54..516ec2b4ef 100644 --- a/src/plugins/highlightwindow/highlightwindow.h +++ b/src/plugins/highlightwindow/highlightwindow.h @@ -9,7 +9,7 @@ #pragma once -#include "libkwineffects/animationeffect.h" +#include "effect/animationeffect.h" namespace KWin { diff --git a/src/plugins/invert/invert.h b/src/plugins/invert/invert.h index dade1b925a..72fa8cab2a 100644 --- a/src/plugins/invert/invert.h +++ b/src/plugins/invert/invert.h @@ -10,7 +10,7 @@ #pragma once -#include "libkwineffects/offscreeneffect.h" +#include "effect/offscreeneffect.h" namespace KWin { diff --git a/src/plugins/kdecorations/aurorae/src/aurorae.cpp b/src/plugins/kdecorations/aurorae/src/aurorae.cpp index 8b031d8eff..d0c83d5f3a 100644 --- a/src/plugins/kdecorations/aurorae/src/aurorae.cpp +++ b/src/plugins/kdecorations/aurorae/src/aurorae.cpp @@ -9,7 +9,7 @@ #include "auroraeshared.h" #include "auroraetheme.h" -#include "libkwineffects/offscreenquickview.h" +#include "effect/offscreenquickview.h" // qml imports #include "decorationoptions.h" // KDecoration2 diff --git a/src/plugins/kscreen/kscreen.h b/src/plugins/kscreen/kscreen.h index 2f97d98149..1907056b41 100644 --- a/src/plugins/kscreen/kscreen.h +++ b/src/plugins/kscreen/kscreen.h @@ -8,8 +8,8 @@ */ #pragma once -#include "libkwineffects/effects.h" -#include "libkwineffects/timeline.h" +#include "effect/effects.h" +#include "effect/timeline.h" namespace KWin { diff --git a/src/plugins/magiclamp/magiclamp.h b/src/plugins/magiclamp/magiclamp.h index 677f62ddfe..b59b3aa036 100644 --- a/src/plugins/magiclamp/magiclamp.h +++ b/src/plugins/magiclamp/magiclamp.h @@ -9,8 +9,8 @@ #pragma once -#include "libkwineffects/offscreeneffect.h" -#include "libkwineffects/timeline.h" +#include "effect/offscreeneffect.h" +#include "effect/timeline.h" namespace KWin { diff --git a/src/plugins/magnifier/magnifier.h b/src/plugins/magnifier/magnifier.h index c1d711a872..b3a16377a7 100644 --- a/src/plugins/magnifier/magnifier.h +++ b/src/plugins/magnifier/magnifier.h @@ -10,7 +10,7 @@ #pragma once -#include "libkwineffects/effects.h" +#include "effect/effects.h" namespace KWin { diff --git a/src/plugins/mouseclick/mouseclick.cpp b/src/plugins/mouseclick/mouseclick.cpp index 8132fc0c27..7cca4fbca0 100644 --- a/src/plugins/mouseclick/mouseclick.cpp +++ b/src/plugins/mouseclick/mouseclick.cpp @@ -13,7 +13,7 @@ #include "core/rendertarget.h" #include "core/renderviewport.h" -#include "libkwineffects/effects.h" +#include "effect/effects.h" #include diff --git a/src/plugins/mouseclick/mouseclick.h b/src/plugins/mouseclick/mouseclick.h index ab9d10cbbe..f40798e41d 100644 --- a/src/plugins/mouseclick/mouseclick.h +++ b/src/plugins/mouseclick/mouseclick.h @@ -9,8 +9,8 @@ #pragma once -#include "libkwineffects/effect.h" -#include "libkwineffects/effectframe.h" +#include "effect/effect.h" +#include "effect/effectframe.h" #include "opengl/glutils.h" #include #include diff --git a/src/plugins/mousemark/mousemark.cpp b/src/plugins/mousemark/mousemark.cpp index 3a1dc9bb26..e43f863447 100644 --- a/src/plugins/mousemark/mousemark.cpp +++ b/src/plugins/mousemark/mousemark.cpp @@ -17,7 +17,7 @@ #include "core/rendertarget.h" #include "core/renderviewport.h" -#include "libkwineffects/effects.h" +#include "effect/effects.h" #include "opengl/glplatform.h" #include #include diff --git a/src/plugins/mousemark/mousemark.h b/src/plugins/mousemark/mousemark.h index f4017e861d..5796660c48 100644 --- a/src/plugins/mousemark/mousemark.h +++ b/src/plugins/mousemark/mousemark.h @@ -10,7 +10,7 @@ #pragma once -#include "libkwineffects/effect.h" +#include "effect/effect.h" #include "opengl/glutils.h" namespace KWin diff --git a/src/plugins/outputlocator/outputlocator.cpp b/src/plugins/outputlocator/outputlocator.cpp index 5fb9c4264d..74c997341b 100644 --- a/src/plugins/outputlocator/outputlocator.cpp +++ b/src/plugins/outputlocator/outputlocator.cpp @@ -6,8 +6,8 @@ #include "outputlocator.h" #include "core/output.h" -#include "libkwineffects/effects.h" -#include "libkwineffects/offscreenquickview.h" +#include "effect/effects.h" +#include "effect/offscreenquickview.h" #include diff --git a/src/plugins/outputlocator/outputlocator.h b/src/plugins/outputlocator/outputlocator.h index 6754230593..387f11bc80 100644 --- a/src/plugins/outputlocator/outputlocator.h +++ b/src/plugins/outputlocator/outputlocator.h @@ -6,7 +6,7 @@ #pragma once -#include "libkwineffects/effect.h" +#include "effect/effect.h" #include diff --git a/src/plugins/overview/overvieweffect.cpp b/src/plugins/overview/overvieweffect.cpp index 790cd6cc62..7ddfeae91d 100644 --- a/src/plugins/overview/overvieweffect.cpp +++ b/src/plugins/overview/overvieweffect.cpp @@ -5,7 +5,7 @@ */ #include "overvieweffect.h" -#include "libkwineffects/effects.h" +#include "effect/effects.h" #include "overviewconfig.h" #include diff --git a/src/plugins/overview/overvieweffect.h b/src/plugins/overview/overvieweffect.h index 1a95eae28a..522a551e1a 100644 --- a/src/plugins/overview/overvieweffect.h +++ b/src/plugins/overview/overvieweffect.h @@ -6,8 +6,8 @@ #pragma once -#include "libkwineffects/effecttogglablestate.h" -#include "libkwineffects/quickeffect.h" +#include "effect/effecttogglablestate.h" +#include "effect/quickeffect.h" namespace KWin { diff --git a/src/plugins/screenedge/screenedgeeffect.cpp b/src/plugins/screenedge/screenedgeeffect.cpp index 79ba305373..4eeb7fc93e 100644 --- a/src/plugins/screenedge/screenedgeeffect.cpp +++ b/src/plugins/screenedge/screenedgeeffect.cpp @@ -10,7 +10,7 @@ // KWin #include "core/rendertarget.h" #include "core/renderviewport.h" -#include "libkwineffects/effects.h" +#include "effect/effects.h" #include "opengl/gltexture.h" #include "opengl/glutils.h" // KDE diff --git a/src/plugins/screenedge/screenedgeeffect.h b/src/plugins/screenedge/screenedgeeffect.h index 6f6eb8d1b3..54dfad8c36 100644 --- a/src/plugins/screenedge/screenedgeeffect.h +++ b/src/plugins/screenedge/screenedgeeffect.h @@ -7,7 +7,7 @@ SPDX-License-Identifier: GPL-2.0-or-later */ #pragma once -#include "libkwineffects/effect.h" +#include "effect/effect.h" #include diff --git a/src/plugins/screenshot/screenshot.cpp b/src/plugins/screenshot/screenshot.cpp index 909ef11a42..9db910646b 100644 --- a/src/plugins/screenshot/screenshot.cpp +++ b/src/plugins/screenshot/screenshot.cpp @@ -14,7 +14,7 @@ #include "core/output.h" #include "core/rendertarget.h" #include "core/renderviewport.h" -#include "libkwineffects/effects.h" +#include "effect/effects.h" #include "opengl/glplatform.h" #include "opengl/glutils.h" diff --git a/src/plugins/screenshot/screenshot.h b/src/plugins/screenshot/screenshot.h index 17318a0f64..cf7120777c 100644 --- a/src/plugins/screenshot/screenshot.h +++ b/src/plugins/screenshot/screenshot.h @@ -10,7 +10,7 @@ #pragma once -#include "libkwineffects/effect.h" +#include "effect/effect.h" #include #include diff --git a/src/plugins/screenshot/screenshotdbusinterface2.cpp b/src/plugins/screenshot/screenshotdbusinterface2.cpp index 3ba8a186f8..f809cb3923 100644 --- a/src/plugins/screenshot/screenshotdbusinterface2.cpp +++ b/src/plugins/screenshot/screenshotdbusinterface2.cpp @@ -8,7 +8,7 @@ #include "screenshotdbusinterface2.h" #include "core/output.h" -#include "libkwineffects/effects.h" +#include "effect/effects.h" #include "screenshot2adaptor.h" #include "screenshotlogging.h" #include "utils/filedescriptor.h" diff --git a/src/plugins/screentransform/screentransform.cpp b/src/plugins/screentransform/screentransform.cpp index bbeec61c92..1a9cc71dec 100644 --- a/src/plugins/screentransform/screentransform.cpp +++ b/src/plugins/screentransform/screentransform.cpp @@ -10,7 +10,7 @@ #include "screentransform.h" #include "core/rendertarget.h" #include "core/renderviewport.h" -#include "libkwineffects/effects.h" +#include "effect/effects.h" #include "opengl/glutils.h" #include diff --git a/src/plugins/screentransform/screentransform.h b/src/plugins/screentransform/screentransform.h index 00198a3b99..cafbc71e40 100644 --- a/src/plugins/screentransform/screentransform.h +++ b/src/plugins/screentransform/screentransform.h @@ -9,8 +9,8 @@ #pragma once #include "core/output.h" -#include "libkwineffects/effect.h" -#include "libkwineffects/timeline.h" +#include "effect/effect.h" +#include "effect/timeline.h" namespace KWin { diff --git a/src/plugins/sheet/sheet.h b/src/plugins/sheet/sheet.h index 57e93e8d3f..5e81e5dc26 100644 --- a/src/plugins/sheet/sheet.h +++ b/src/plugins/sheet/sheet.h @@ -12,8 +12,8 @@ #pragma once // kwineffects -#include "libkwineffects/effects.h" -#include "libkwineffects/timeline.h" +#include "effect/effects.h" +#include "effect/timeline.h" namespace KWin { diff --git a/src/plugins/showfps/showfpseffect.h b/src/plugins/showfps/showfpseffect.h index bb22f11703..6296ea812c 100644 --- a/src/plugins/showfps/showfpseffect.h +++ b/src/plugins/showfps/showfpseffect.h @@ -8,8 +8,8 @@ #pragma once -#include "libkwineffects/effects.h" -#include "libkwineffects/offscreenquickview.h" +#include "effect/effects.h" +#include "effect/offscreenquickview.h" #include diff --git a/src/plugins/showpaint/showpaint.cpp b/src/plugins/showpaint/showpaint.cpp index be65fd78b4..32a0c3b2a2 100644 --- a/src/plugins/showpaint/showpaint.cpp +++ b/src/plugins/showpaint/showpaint.cpp @@ -11,7 +11,7 @@ #include "showpaint.h" #include "core/renderviewport.h" -#include "libkwineffects/effects.h" +#include "effect/effects.h" #include "opengl/glutils.h" #include diff --git a/src/plugins/showpaint/showpaint.h b/src/plugins/showpaint/showpaint.h index 96fa33c7bd..df5721cc01 100644 --- a/src/plugins/showpaint/showpaint.h +++ b/src/plugins/showpaint/showpaint.h @@ -9,7 +9,7 @@ #pragma once -#include "libkwineffects/effect.h" +#include "effect/effect.h" namespace KWin { diff --git a/src/plugins/slide/slide.h b/src/plugins/slide/slide.h index 0380169d05..968372d1ff 100644 --- a/src/plugins/slide/slide.h +++ b/src/plugins/slide/slide.h @@ -12,7 +12,7 @@ #pragma once // kwineffects -#include "libkwineffects/effects.h" +#include "effect/effects.h" #include "springmotion.h" diff --git a/src/plugins/slideback/motionmanager.h b/src/plugins/slideback/motionmanager.h index ba35f14866..5876098f74 100644 --- a/src/plugins/slideback/motionmanager.h +++ b/src/plugins/slideback/motionmanager.h @@ -8,7 +8,7 @@ #pragma once -#include "libkwineffects/effects.h" +#include "effect/effects.h" namespace KWin { diff --git a/src/plugins/slideback/slideback.h b/src/plugins/slideback/slideback.h index 41241bd761..ab695b8454 100644 --- a/src/plugins/slideback/slideback.h +++ b/src/plugins/slideback/slideback.h @@ -10,7 +10,7 @@ #pragma once // Include with base class for effects. -#include "libkwineffects/effects.h" +#include "effect/effects.h" #include "plugins/slideback/motionmanager.h" namespace KWin diff --git a/src/plugins/slidingpopups/slidingpopups.h b/src/plugins/slidingpopups/slidingpopups.h index f569e85b71..621ce6241d 100644 --- a/src/plugins/slidingpopups/slidingpopups.h +++ b/src/plugins/slidingpopups/slidingpopups.h @@ -11,8 +11,8 @@ #pragma once // Include with base class for effects. -#include "libkwineffects/effects.h" -#include "libkwineffects/timeline.h" +#include "effect/effects.h" +#include "effect/timeline.h" namespace KWin { diff --git a/src/plugins/snaphelper/snaphelper.cpp b/src/plugins/snaphelper/snaphelper.cpp index 0d119bd7ce..3906394e49 100644 --- a/src/plugins/snaphelper/snaphelper.cpp +++ b/src/plugins/snaphelper/snaphelper.cpp @@ -12,7 +12,7 @@ #include "core/rendertarget.h" #include "core/renderviewport.h" -#include "libkwineffects/effects.h" +#include "effect/effects.h" #include "opengl/glutils.h" #include diff --git a/src/plugins/snaphelper/snaphelper.h b/src/plugins/snaphelper/snaphelper.h index 0b6f2ca3ee..bca33fb535 100644 --- a/src/plugins/snaphelper/snaphelper.h +++ b/src/plugins/snaphelper/snaphelper.h @@ -10,8 +10,8 @@ #pragma once -#include "libkwineffects/effect.h" -#include "libkwineffects/timeline.h" +#include "effect/effect.h" +#include "effect/timeline.h" namespace KWin { diff --git a/src/plugins/startupfeedback/startupfeedback.cpp b/src/plugins/startupfeedback/startupfeedback.cpp index 835a4043bd..e4942047b4 100644 --- a/src/plugins/startupfeedback/startupfeedback.cpp +++ b/src/plugins/startupfeedback/startupfeedback.cpp @@ -26,7 +26,7 @@ // KWin #include "core/rendertarget.h" #include "core/renderviewport.h" -#include "libkwineffects/effects.h" +#include "effect/effects.h" #include "opengl/glutils.h" // based on StartupId in KRunner by Lubos Lunak diff --git a/src/plugins/startupfeedback/startupfeedback.h b/src/plugins/startupfeedback/startupfeedback.h index 20c87f773a..c2ee4e8b1d 100644 --- a/src/plugins/startupfeedback/startupfeedback.h +++ b/src/plugins/startupfeedback/startupfeedback.h @@ -8,7 +8,7 @@ */ #pragma once -#include "libkwineffects/effect.h" +#include "effect/effect.h" #include #include #include diff --git a/src/plugins/thumbnailaside/thumbnailaside.cpp b/src/plugins/thumbnailaside/thumbnailaside.cpp index ae2867dba9..6587b4fcad 100644 --- a/src/plugins/thumbnailaside/thumbnailaside.cpp +++ b/src/plugins/thumbnailaside/thumbnailaside.cpp @@ -10,7 +10,7 @@ #include "thumbnailaside.h" #include "core/renderviewport.h" -#include "libkwineffects/effects.h" +#include "effect/effects.h" // KConfigSkeleton #include "thumbnailasideconfig.h" diff --git a/src/plugins/thumbnailaside/thumbnailaside.h b/src/plugins/thumbnailaside/thumbnailaside.h index ee6587f64e..1f1eff2c4b 100644 --- a/src/plugins/thumbnailaside/thumbnailaside.h +++ b/src/plugins/thumbnailaside/thumbnailaside.h @@ -16,7 +16,7 @@ #pragma once -#include "libkwineffects/effect.h" +#include "effect/effect.h" #include diff --git a/src/plugins/tileseditor/tileseditoreffect.cpp b/src/plugins/tileseditor/tileseditoreffect.cpp index 06753ef4a4..6c25665ede 100644 --- a/src/plugins/tileseditor/tileseditoreffect.cpp +++ b/src/plugins/tileseditor/tileseditoreffect.cpp @@ -4,7 +4,7 @@ */ #include "tileseditoreffect.h" -#include "libkwineffects/effects.h" +#include "effect/effects.h" #include #include diff --git a/src/plugins/tileseditor/tileseditoreffect.h b/src/plugins/tileseditor/tileseditoreffect.h index 19d771432a..75065bbded 100644 --- a/src/plugins/tileseditor/tileseditoreffect.h +++ b/src/plugins/tileseditor/tileseditoreffect.h @@ -6,7 +6,7 @@ #pragma once -#include "libkwineffects/quickeffect.h" +#include "effect/quickeffect.h" #include diff --git a/src/plugins/touchpoints/touchpoints.cpp b/src/plugins/touchpoints/touchpoints.cpp index 8f87664bcb..5ca92d3aad 100644 --- a/src/plugins/touchpoints/touchpoints.cpp +++ b/src/plugins/touchpoints/touchpoints.cpp @@ -12,7 +12,7 @@ #include "core/rendertarget.h" #include "core/renderviewport.h" -#include "libkwineffects/effects.h" +#include "effect/effects.h" #include "opengl/glutils.h" #include diff --git a/src/plugins/touchpoints/touchpoints.h b/src/plugins/touchpoints/touchpoints.h index 102d2a72fc..ef74fdda90 100644 --- a/src/plugins/touchpoints/touchpoints.h +++ b/src/plugins/touchpoints/touchpoints.h @@ -10,7 +10,7 @@ #pragma once -#include "libkwineffects/effect.h" +#include "effect/effect.h" namespace KWin { diff --git a/src/plugins/trackmouse/trackmouse.cpp b/src/plugins/trackmouse/trackmouse.cpp index eeaf5e635f..d37ace73d1 100644 --- a/src/plugins/trackmouse/trackmouse.cpp +++ b/src/plugins/trackmouse/trackmouse.cpp @@ -21,7 +21,7 @@ #include "core/rendertarget.h" #include "core/renderviewport.h" -#include "libkwineffects/effects.h" +#include "effect/effects.h" #include "opengl/glutils.h" #include diff --git a/src/plugins/trackmouse/trackmouse.h b/src/plugins/trackmouse/trackmouse.h index 294b2a880b..48dee8d485 100644 --- a/src/plugins/trackmouse/trackmouse.h +++ b/src/plugins/trackmouse/trackmouse.h @@ -11,7 +11,7 @@ #pragma once -#include "libkwineffects/effect.h" +#include "effect/effect.h" class QAction; diff --git a/src/plugins/windowsystem/windoweffects.cpp b/src/plugins/windowsystem/windoweffects.cpp index 774ea6de7e..9a89bea738 100644 --- a/src/plugins/windowsystem/windoweffects.cpp +++ b/src/plugins/windowsystem/windoweffects.cpp @@ -4,7 +4,7 @@ SPDX-License-Identifier: GPL-2.0-only OR GPL-3.0-only OR LicenseRef-KDE-Accepted-GPL */ #include "windoweffects.h" -#include "libkwineffects/effects.h" +#include "effect/effects.h" #include #include diff --git a/src/plugins/windowview/windowviewconfig.kcfgc b/src/plugins/windowview/windowviewconfig.kcfgc index 0ed38d12e0..1272ae30b4 100644 --- a/src/plugins/windowview/windowviewconfig.kcfgc +++ b/src/plugins/windowview/windowviewconfig.kcfgc @@ -7,4 +7,4 @@ ClassName=WindowViewConfig NameSpace=KWin Singleton=true Mutators=true -IncludeFiles=\"libkwineffects/globals.h\" +IncludeFiles=\"effect/globals.h\" diff --git a/src/plugins/windowview/windowvieweffect.cpp b/src/plugins/windowview/windowvieweffect.cpp index cfa4b270f3..9f6c761b73 100644 --- a/src/plugins/windowview/windowvieweffect.cpp +++ b/src/plugins/windowview/windowvieweffect.cpp @@ -5,7 +5,7 @@ */ #include "windowvieweffect.h" -#include "libkwineffects/effects.h" +#include "effect/effects.h" #include "windowview1adaptor.h" #include "windowviewconfig.h" diff --git a/src/plugins/windowview/windowvieweffect.h b/src/plugins/windowview/windowvieweffect.h index 83eb69bb63..c3973407a0 100644 --- a/src/plugins/windowview/windowvieweffect.h +++ b/src/plugins/windowview/windowvieweffect.h @@ -6,7 +6,7 @@ #pragma once -#include "libkwineffects/quickeffect.h" +#include "effect/quickeffect.h" #include diff --git a/src/plugins/wobblywindows/wobblywindows.h b/src/plugins/wobblywindows/wobblywindows.h index ec988097fb..68038d0ffe 100644 --- a/src/plugins/wobblywindows/wobblywindows.h +++ b/src/plugins/wobblywindows/wobblywindows.h @@ -10,7 +10,7 @@ #pragma once // Include with base class for effects. -#include "libkwineffects/offscreeneffect.h" +#include "effect/offscreeneffect.h" namespace KWin { diff --git a/src/plugins/zoom/zoom.cpp b/src/plugins/zoom/zoom.cpp index 43cc7eda9b..d18748bf82 100644 --- a/src/plugins/zoom/zoom.cpp +++ b/src/plugins/zoom/zoom.cpp @@ -26,7 +26,7 @@ #include "core/rendertarget.h" #include "core/renderviewport.h" -#include "libkwineffects/effects.h" +#include "effect/effects.h" #include "opengl/glutils.h" namespace KWin diff --git a/src/plugins/zoom/zoom.h b/src/plugins/zoom/zoom.h index edadc91ce4..324327de5e 100644 --- a/src/plugins/zoom/zoom.h +++ b/src/plugins/zoom/zoom.h @@ -12,7 +12,7 @@ #include -#include "libkwineffects/effect.h" +#include "effect/effect.h" #include #include diff --git a/src/scene/dndiconitem.h b/src/scene/dndiconitem.h index fffee05d3f..0ac4e97e13 100644 --- a/src/scene/dndiconitem.h +++ b/src/scene/dndiconitem.h @@ -7,7 +7,7 @@ #pragma once #include "core/output.h" -#include "libkwineffects/globals.h" +#include "effect/globals.h" #include "scene/item.h" namespace KWin diff --git a/src/scene/item.h b/src/scene/item.h index 64c7157466..e0ad6c8a53 100644 --- a/src/scene/item.h +++ b/src/scene/item.h @@ -7,8 +7,8 @@ #pragma once #include "core/colorspace.h" -#include "libkwineffects/effects.h" -#include "libkwineffects/globals.h" +#include "effect/effects.h" +#include "effect/globals.h" #include #include diff --git a/src/scene/itemrenderer_opengl.h b/src/scene/itemrenderer_opengl.h index 8df5a5e36c..27ffae047e 100644 --- a/src/scene/itemrenderer_opengl.h +++ b/src/scene/itemrenderer_opengl.h @@ -6,7 +6,7 @@ #pragma once -#include "libkwineffects/effects.h" +#include "effect/effects.h" #include "opengl/glutils.h" #include "platformsupport/scenes/opengl/openglsurfacetexture.h" #include "scene/itemrenderer.h" diff --git a/src/scene/workspacescene.cpp b/src/scene/workspacescene.cpp index c4066bd62b..5ecf890df5 100644 --- a/src/scene/workspacescene.cpp +++ b/src/scene/workspacescene.cpp @@ -59,8 +59,8 @@ #include "core/renderlayer.h" #include "core/renderloop.h" #include "core/renderviewport.h" +#include "effect/effects.h" #include "internalwindow.h" -#include "libkwineffects/effects.h" #include "scene/dndiconitem.h" #include "scene/itemrenderer.h" #include "scene/shadowitem.h" diff --git a/src/screenedge.cpp b/src/screenedge.cpp index 5416968341..899436097d 100644 --- a/src/screenedge.cpp +++ b/src/screenedge.cpp @@ -22,8 +22,8 @@ #include "core/output.h" #include "cursor.h" +#include "effect/effects.h" #include "gestures.h" -#include "libkwineffects/effects.h" #include "main.h" #include "pointer_input.h" #include "utils/common.h" diff --git a/src/screenedge.h b/src/screenedge.h index dfc623e479..208caeb1c1 100644 --- a/src/screenedge.h +++ b/src/screenedge.h @@ -18,7 +18,7 @@ #pragma once // KWin -#include "libkwineffects/globals.h" +#include "effect/globals.h" // KDE includes #include // Qt diff --git a/src/screenlockerwatcher.h b/src/screenlockerwatcher.h index 15037321dd..7ea061d5d6 100644 --- a/src/screenlockerwatcher.h +++ b/src/screenlockerwatcher.h @@ -10,7 +10,7 @@ #include -#include "libkwineffects/globals.h" +#include "effect/globals.h" class OrgFreedesktopScreenSaverInterface; class OrgKdeScreensaverInterface; diff --git a/src/scripting/gesturehandler.cpp b/src/scripting/gesturehandler.cpp index dbe5fbd1a8..ec7bcfb90c 100644 --- a/src/scripting/gesturehandler.cpp +++ b/src/scripting/gesturehandler.cpp @@ -5,7 +5,7 @@ */ #include "gesturehandler.h" -#include "libkwineffects/effects.h" +#include "effect/effects.h" #include diff --git a/src/scripting/gesturehandler.h b/src/scripting/gesturehandler.h index 6ce98a078b..dd551340b5 100644 --- a/src/scripting/gesturehandler.h +++ b/src/scripting/gesturehandler.h @@ -6,7 +6,7 @@ #pragma once -#include "libkwineffects/globals.h" +#include "effect/globals.h" #include diff --git a/src/scripting/screenedgehandler.h b/src/scripting/screenedgehandler.h index 15ca46d4c1..57a5d9a633 100644 --- a/src/scripting/screenedgehandler.h +++ b/src/scripting/screenedgehandler.h @@ -8,7 +8,7 @@ */ #pragma once -#include "libkwineffects/globals.h" +#include "effect/globals.h" #include class QAction; diff --git a/src/scripting/scriptedeffect.h b/src/scripting/scriptedeffect.h index 63ee37b686..88144c5ef9 100644 --- a/src/scripting/scriptedeffect.h +++ b/src/scripting/scriptedeffect.h @@ -10,7 +10,7 @@ #pragma once -#include "libkwineffects/animationeffect.h" +#include "effect/animationeffect.h" #include #include diff --git a/src/scripting/scriptedquicksceneeffect.h b/src/scripting/scriptedquicksceneeffect.h index 2aa1915b73..364c6bb088 100644 --- a/src/scripting/scriptedquicksceneeffect.h +++ b/src/scripting/scriptedquicksceneeffect.h @@ -6,7 +6,7 @@ #pragma once -#include "libkwineffects/quickeffect.h" +#include "effect/quickeffect.h" #include diff --git a/src/scripting/scripting.cpp b/src/scripting/scripting.cpp index 8c4214520b..b0ce84bbff 100644 --- a/src/scripting/scripting.cpp +++ b/src/scripting/scripting.cpp @@ -13,8 +13,8 @@ // own #include "dbuscall.h" #include "desktopbackgrounditem.h" +#include "effect/quickeffect.h" #include "gesturehandler.h" -#include "libkwineffects/quickeffect.h" #include "screenedgehandler.h" #include "scriptedquicksceneeffect.h" #include "scripting_logging.h" diff --git a/src/scripting/scripting.h b/src/scripting/scripting.h index a7fbeabb6d..d141b22480 100644 --- a/src/scripting/scripting.h +++ b/src/scripting/scripting.h @@ -11,7 +11,7 @@ #pragma once -#include "libkwineffects/globals.h" +#include "effect/globals.h" #include #include diff --git a/src/scripting/workspace_wrapper.cpp b/src/scripting/workspace_wrapper.cpp index 94c29dd426..1c837ecead 100644 --- a/src/scripting/workspace_wrapper.cpp +++ b/src/scripting/workspace_wrapper.cpp @@ -12,7 +12,7 @@ #include "core/output.h" #include "core/outputbackend.h" #include "cursor.h" -#include "libkwineffects/effects.h" +#include "effect/effects.h" #include "outline.h" #include "tiles/tilemanager.h" #include "virtualdesktops.h" diff --git a/src/scripting/workspace_wrapper.h b/src/scripting/workspace_wrapper.h index 8291364a0b..17199ef177 100644 --- a/src/scripting/workspace_wrapper.h +++ b/src/scripting/workspace_wrapper.h @@ -10,7 +10,7 @@ #pragma once -#include "libkwineffects/globals.h" +#include "effect/globals.h" #include #include #include diff --git a/src/sm.h b/src/sm.h index 45b6c4adc5..c4863adc59 100644 --- a/src/sm.h +++ b/src/sm.h @@ -16,7 +16,7 @@ #include -#include "libkwineffects/globals.h" +#include "effect/globals.h" #include namespace KWin diff --git a/src/tabbox/tabbox.cpp b/src/tabbox/tabbox.cpp index ced43f1f84..91677a1530 100644 --- a/src/tabbox/tabbox.cpp +++ b/src/tabbox/tabbox.cpp @@ -22,10 +22,10 @@ #include "activities.h" #endif #include "compositor.h" +#include "effect/effects.h" #include "focuschain.h" #include "input.h" #include "keyboard_input.h" -#include "libkwineffects/effects.h" #include "pointer_input.h" #include "screenedge.h" #include "utils/xcbutils.h" diff --git a/src/tabbox/x11_filter.cpp b/src/tabbox/x11_filter.cpp index 71a1b67747..c281cdac78 100644 --- a/src/tabbox/x11_filter.cpp +++ b/src/tabbox/x11_filter.cpp @@ -8,7 +8,7 @@ */ #include "x11_filter.h" -#include "libkwineffects/effects.h" +#include "effect/effects.h" #include "screenedge.h" #include "tabbox/tabbox.h" #include "utils/xcbutils.h" diff --git a/src/tabletmodemanager.h b/src/tabletmodemanager.h index f9b94a610b..b388961048 100644 --- a/src/tabletmodemanager.h +++ b/src/tabletmodemanager.h @@ -7,7 +7,7 @@ #pragma once -#include "libkwineffects/globals.h" +#include "effect/globals.h" #include #include #include diff --git a/src/tiles/tile.h b/src/tiles/tile.h index 2191d661ae..4bd628f716 100644 --- a/src/tiles/tile.h +++ b/src/tiles/tile.h @@ -9,7 +9,7 @@ #pragma once -#include "libkwineffects/globals.h" +#include "effect/globals.h" #include #include diff --git a/src/useractions.h b/src/useractions.h index c858680b4e..84877aa145 100644 --- a/src/useractions.h +++ b/src/useractions.h @@ -9,7 +9,7 @@ #pragma once #include "ui_shortcutdialog.h" -#include "libkwineffects/globals.h" +#include "effect/globals.h" // Qt #include diff --git a/src/utils/common.cpp b/src/utils/common.cpp index adbabeada6..df9d83d6b4 100644 --- a/src/utils/common.cpp +++ b/src/utils/common.cpp @@ -15,7 +15,7 @@ */ #include "utils/common.h" -#include "libkwineffects/xcb.h" +#include "effect/xcb.h" #include "utils/c_ptr.h" #include diff --git a/src/utils/common.h b/src/utils/common.h index 0234bd7a49..2844ea74d3 100644 --- a/src/utils/common.h +++ b/src/utils/common.h @@ -13,7 +13,7 @@ // cmake stuff #include "config-kwin.h" // kwin -#include "libkwineffects/globals.h" +#include "effect/globals.h" #include "utils/version.h" // Qt #include diff --git a/src/utils/serviceutils.h b/src/utils/serviceutils.h index 4107d3da14..cbc3fa02cf 100644 --- a/src/utils/serviceutils.h +++ b/src/utils/serviceutils.h @@ -12,7 +12,7 @@ // cmake stuff #include // kwin -#include "libkwineffects/globals.h" +#include "effect/globals.h" // Qt #include #include diff --git a/src/utils/vsyncmonitor.h b/src/utils/vsyncmonitor.h index 9079df73c4..f62291e8a4 100644 --- a/src/utils/vsyncmonitor.h +++ b/src/utils/vsyncmonitor.h @@ -6,7 +6,7 @@ #pragma once -#include "libkwineffects/globals.h" +#include "effect/globals.h" #include diff --git a/src/utils/xcbutils.h b/src/utils/xcbutils.h index 52702f418e..98d19b1fe7 100644 --- a/src/utils/xcbutils.h +++ b/src/utils/xcbutils.h @@ -8,8 +8,8 @@ */ #pragma once -#include "libkwineffects/globals.h" -#include "libkwineffects/xcb.h" +#include "effect/globals.h" +#include "effect/xcb.h" #include "main.h" #include "utils/c_ptr.h" #include "utils/version.h" diff --git a/src/virtualdesktops.h b/src/virtualdesktops.h index 30bf1b4f24..69ac39f25c 100644 --- a/src/virtualdesktops.h +++ b/src/virtualdesktops.h @@ -8,7 +8,7 @@ */ #pragma once // KWin -#include "libkwineffects/globals.h" +#include "effect/globals.h" #include // Qt includes #include diff --git a/src/wayland/presentationtime.h b/src/wayland/presentationtime.h index 3522380256..bc915bcac6 100644 --- a/src/wayland/presentationtime.h +++ b/src/wayland/presentationtime.h @@ -9,7 +9,7 @@ #include #include "core/renderbackend.h" -#include "libkwineffects/globals.h" +#include "effect/globals.h" #include "qwayland-server-presentation-time.h" namespace KWin diff --git a/src/wayland/screenedge_v1.h b/src/wayland/screenedge_v1.h index 56d636c03d..d5892e1add 100644 --- a/src/wayland/screenedge_v1.h +++ b/src/wayland/screenedge_v1.h @@ -6,7 +6,7 @@ #pragma once -#include "libkwineffects/globals.h" +#include "effect/globals.h" #include #include diff --git a/src/wayland_server.h b/src/wayland_server.h index b7744379fa..2fc59755ee 100644 --- a/src/wayland_server.h +++ b/src/wayland_server.h @@ -8,7 +8,7 @@ */ #pragma once -#include "libkwineffects/globals.h" +#include "effect/globals.h" #include #include diff --git a/src/window_property_notify_x11_filter.cpp b/src/window_property_notify_x11_filter.cpp index a8be509eef..66c91da97a 100644 --- a/src/window_property_notify_x11_filter.cpp +++ b/src/window_property_notify_x11_filter.cpp @@ -7,7 +7,7 @@ SPDX-License-Identifier: GPL-2.0-or-later */ #include "window_property_notify_x11_filter.h" -#include "libkwineffects/effects.h" +#include "effect/effects.h" #include "workspace.h" #include "x11window.h" diff --git a/src/workspace.cpp b/src/workspace.cpp index 0775f87c6d..a8562a4a34 100644 --- a/src/workspace.cpp +++ b/src/workspace.cpp @@ -24,12 +24,12 @@ #include "core/outputconfiguration.h" #include "cursor.h" #include "dbusinterface.h" +#include "effect/effects.h" #include "focuschain.h" #include "group.h" #include "input.h" #include "internalwindow.h" #include "killwindow.h" -#include "libkwineffects/effects.h" #include "moving_client_x11_filter.h" #include "netinfo.h" #include "outline.h" diff --git a/src/x11window.cpp b/src/x11window.cpp index 2c1cc3e5d5..f9d78605f8 100644 --- a/src/x11window.cpp +++ b/src/x11window.cpp @@ -20,9 +20,9 @@ #include "cursor.h" #include "decorations/decoratedclient.h" #include "decorations/decorationbridge.h" +#include "effect/effects.h" #include "focuschain.h" #include "group.h" -#include "libkwineffects/effects.h" #include "netinfo.h" #include "placement.h" #include "scene/surfaceitem_x11.h" diff --git a/src/xdgactivationv1.cpp b/src/xdgactivationv1.cpp index f0619c415b..b43e38d5b6 100644 --- a/src/xdgactivationv1.cpp +++ b/src/xdgactivationv1.cpp @@ -8,7 +8,7 @@ */ #include "xdgactivationv1.h" -#include "libkwineffects/effects.h" +#include "effect/effects.h" #include "utils/common.h" #include "wayland/display.h" #include "wayland/plasmawindowmanagement.h" diff --git a/src/xwayland/databridge.h b/src/xwayland/databridge.h index 9a2dd0d586..f8fa631024 100644 --- a/src/xwayland/databridge.h +++ b/src/xwayland/databridge.h @@ -8,7 +8,7 @@ */ #pragma once -#include "libkwineffects/globals.h" +#include "effect/globals.h" #include #include diff --git a/src/xwayland/xwayland_interface.h b/src/xwayland/xwayland_interface.h index d3869a7071..a35e4839ca 100644 --- a/src/xwayland/xwayland_interface.h +++ b/src/xwayland/xwayland_interface.h @@ -8,7 +8,7 @@ */ #pragma once -#include "libkwineffects/globals.h" +#include "effect/globals.h" #include