From 8bf2318800c3d142b44a8bdbbfb2cf9916d62d59 Mon Sep 17 00:00:00 2001 From: Vlad Zahorodnii Date: Wed, 13 Sep 2023 08:52:59 +0300 Subject: [PATCH] wayland: Drop "_interface" from filenames The cpp files in the wayland directory are named after protocol names. "_interface" does not contribute anything new. --- .../integration/globalshortcuts_test.cpp | 4 +- .../integration/input_stacking_order.cpp | 2 +- autotests/integration/inputmethod_test.cpp | 4 +- autotests/integration/internal_window.cpp | 2 +- autotests/integration/lockscreen.cpp | 4 +- autotests/integration/plasmawindow_test.cpp | 2 +- .../integration/pointer_constraints_test.cpp | 4 +- autotests/integration/pointer_input.cpp | 2 +- autotests/integration/transient_placement.cpp | 4 +- autotests/integration/xwayland_input_test.cpp | 2 +- .../integration/xwayland_selections_test.cpp | 2 +- src/backends/drm/drm_dmabuf_feedback.cpp | 2 +- src/backends/drm/drm_egl_layer.cpp | 2 +- src/backends/drm/drm_virtual_egl_layer.cpp | 2 +- src/backends/fakeinput/fakeinputbackend.cpp | 2 +- src/backends/fakeinput/fakeinputdevice.cpp | 2 +- src/core/renderloop.cpp | 2 +- src/cursorsource.cpp | 2 +- src/debug_console.cpp | 12 +- src/decorations/decorationbridge.cpp | 2 +- src/dpmsinputeventfilter.cpp | 2 +- src/events.cpp | 4 +- src/idle_inhibition.cpp | 2 +- src/input.cpp | 12 +- src/inputmethod.cpp | 12 +- src/inputmethod.h | 2 +- src/inputpanelv1integration.cpp | 2 +- src/inputpanelv1window.cpp | 12 +- src/inputpanelv1window.h | 2 +- src/keyboard_input.cpp | 6 +- src/keyboard_repeat.cpp | 4 +- src/layershellv1integration.cpp | 4 +- src/layershellv1window.cpp | 8 +- src/main.cpp | 2 +- src/main_wayland.cpp | 2 +- src/plugins/backgroundcontrast/contrast.cpp | 4 +- src/plugins/blur/blur.cpp | 4 +- src/plugins/screencast/screencastmanager.cpp | 2 +- src/plugins/screencast/screencastmanager.h | 2 +- src/plugins/screencast/screencaststream.h | 2 +- src/plugins/slidingpopups/slidingpopups.cpp | 4 +- src/plugins/windowsystem/windowsystem.cpp | 2 +- src/pointer_input.cpp | 8 +- src/popup_input_filter.cpp | 2 +- src/scene/dndiconitem.cpp | 4 +- src/scene/surfaceitem_wayland.cpp | 4 +- src/scene/workspacescene.cpp | 4 +- src/shadow.cpp | 4 +- src/tablet_input.cpp | 4 +- src/touch_input.cpp | 2 +- src/utils/subsurfacemonitor.cpp | 4 +- src/virtualdesktops.cpp | 2 +- src/wayland/CMakeLists.txt | 264 +++++++++--------- src/wayland/abstract_data_source.h | 2 +- .../{appmenu_interface.cpp => appmenu.cpp} | 4 +- .../{appmenu_interface.h => appmenu.h} | 0 .../autotests/client/test_datadevice.cpp | 12 +- .../autotests/client/test_datasource.cpp | 4 +- .../autotests/client/test_drag_drop.cpp | 10 +- src/wayland/autotests/client/test_error.cpp | 4 +- .../autotests/client/test_fake_input.cpp | 2 +- .../client/test_plasma_activities.cpp | 4 +- .../client/test_plasma_virtual_desktop.cpp | 6 +- .../autotests/client/test_plasmashell.cpp | 4 +- .../client/test_pointer_constraints.cpp | 8 +- .../autotests/client/test_selection.cpp | 6 +- .../client/test_server_side_decoration.cpp | 4 +- .../test_server_side_decoration_palette.cpp | 4 +- src/wayland/autotests/client/test_shadow.cpp | 4 +- .../autotests/client/test_shm_pool.cpp | 4 +- .../autotests/client/test_text_input_v2.cpp | 6 +- .../autotests/client/test_wayland_appmenu.cpp | 4 +- .../autotests/client/test_wayland_blur.cpp | 4 +- .../client/test_wayland_contrast.cpp | 4 +- .../autotests/client/test_wayland_filter.cpp | 4 +- .../autotests/client/test_wayland_output.cpp | 2 +- .../autotests/client/test_wayland_seat.cpp | 20 +- .../autotests/client/test_wayland_slide.cpp | 4 +- .../client/test_wayland_subsurface.cpp | 6 +- .../autotests/client/test_wayland_surface.cpp | 8 +- .../client/test_wayland_windowmanagement.cpp | 6 +- .../autotests/client/test_xdg_decoration.cpp | 6 +- .../autotests/client/test_xdg_foreign.cpp | 6 +- .../autotests/client/test_xdg_output.cpp | 4 +- .../autotests/client/test_xdg_shell.cpp | 10 +- .../server/test_datacontrol_interface.cpp | 10 +- .../server/test_inputmethod_interface.cpp | 8 +- ...keyboard_shortcuts_inhibitor_interface.cpp | 6 +- .../server/test_layershellv1_interface.cpp | 8 +- .../autotests/server/test_screencast.cpp | 6 +- src/wayland/autotests/server/test_seat.cpp | 6 +- .../server/test_tablet_interface.cpp | 6 +- .../server/test_textinputv1_interface.cpp | 8 +- .../server/test_textinputv3_interface.cpp | 8 +- .../server/test_viewporter_interface.cpp | 6 +- src/wayland/{blur_interface.cpp => blur.cpp} | 8 +- src/wayland/{blur_interface.h => blur.h} | 0 ...ompositor_interface.cpp => compositor.cpp} | 8 +- .../{compositor_interface.h => compositor.h} | 2 +- ...pe_v1_interface.cpp => contenttype_v1.cpp} | 6 +- ...nttype_v1_interface.h => contenttype_v1.h} | 2 +- .../{contrast_interface.cpp => contrast.cpp} | 8 +- .../{contrast_interface.h => contrast.h} | 0 ...pe_v1_interface.cpp => cursorshape_v1.cpp} | 8 +- ...rshape_v1_interface.h => cursorshape_v1.h} | 0 ...interface.cpp => datacontroldevice_v1.cpp} | 16 +- ..._v1_interface.h => datacontroldevice_v1.h} | 0 ...ce.cpp => datacontroldevicemanager_v1.cpp} | 10 +- ...erface.h => datacontroldevicemanager_v1.h} | 0 ..._interface.cpp => datacontroloffer_v1.cpp} | 8 +- ...r_v1_interface.h => datacontroloffer_v1.h} | 2 +- ...interface.cpp => datacontrolsource_v1.cpp} | 6 +- ..._v1_interface.h => datacontrolsource_v1.h} | 2 +- ...atadevice_interface.cpp => datadevice.cpp} | 20 +- .../{datadevice_interface.h => datadevice.h} | 0 ...atadevice_interface_p.h => datadevice_p.h} | 0 ...er_interface.cpp => datadevicemanager.cpp} | 8 +- ...anager_interface.h => datadevicemanager.h} | 2 +- ...{dataoffer_interface.cpp => dataoffer.cpp} | 8 +- .../{dataoffer_interface.h => dataoffer.h} | 2 +- ...atasource_interface.cpp => datasource.cpp} | 8 +- .../{datasource_interface.h => datasource.h} | 2 +- ...atasource_interface_p.h => datasource_p.h} | 2 +- src/wayland/display.cpp | 2 +- src/wayland/{dpms_interface.cpp => dpms.cpp} | 8 +- src/wayland/{dpms_interface.h => dpms.h} | 0 ...lease_v1_interface.cpp => drmlease_v1.cpp} | 9 +- ...{drmlease_v1_interface.h => drmlease_v1.h} | 0 ...lease_v1_interface_p.h => drmlease_v1_p.h} | 0 ...{fakeinput_interface.cpp => fakeinput.cpp} | 4 +- .../{fakeinput_interface.h => fakeinput.h} | 0 ...1_interface.cpp => fractionalscale_v1.cpp} | 8 +- ...le_v1_interface.h => fractionalscale_v1.h} | 0 ...1_interface_p.h => fractionalscale_v1_p.h} | 0 src/wayland/{idle_interface.cpp => idle.cpp} | 9 +- src/wayland/{idle_interface.h => idle.h} | 0 src/wayland/{idle_interface_p.h => idle_p.h} | 2 +- ...it_v1_interface.cpp => idleinhibit_v1.cpp} | 9 +- ...nhibit_v1_interface.h => idleinhibit_v1.h} | 0 ...it_v1_interface_p.h => idleinhibit_v1_p.h} | 2 +- ...ify_v1_interface.cpp => idlenotify_v1.cpp} | 6 +- ...enotify_v1_interface.h => idlenotify_v1.h} | 0 ...od_v1_interface.cpp => inputmethod_v1.cpp} | 14 +- ...method_v1_interface.h => inputmethod_v1.h} | 0 .../{keyboard_interface.cpp => keyboard.cpp} | 10 +- .../{keyboard_interface.h => keyboard.h} | 0 .../{keyboard_interface_p.h => keyboard_p.h} | 2 +- ....cpp => keyboard_shortcuts_inhibit_v1.cpp} | 8 +- ...face.h => keyboard_shortcuts_inhibit_v1.h} | 4 +- .../{keystate_interface.cpp => keystate.cpp} | 4 +- .../{keystate_interface.h => keystate.h} | 0 ...ell_v1_interface.cpp => layershell_v1.cpp} | 10 +- ...ershell_v1_interface.h => layershell_v1.h} | 0 src/wayland/linuxdmabufv1clientbuffer.cpp | 2 +- ...nterface.cpp => lockscreen_overlay_v1.cpp} | 8 +- ...v1_interface.h => lockscreen_overlay_v1.h} | 0 .../{output_interface.cpp => output.cpp} | 4 +- src/wayland/{output_interface.h => output.h} | 0 ...r_v1_interface.cpp => output_order_v1.cpp} | 4 +- ...order_v1_interface.h => output_order_v1.h} | 0 ...e_v2_interface.cpp => outputdevice_v2.cpp} | 4 +- ...evice_v2_interface.h => outputdevice_v2.h} | 0 ..._interface.cpp => outputmanagement_v2.cpp} | 10 +- ...t_v2_interface.h => outputmanagement_v2.h} | 0 ...smashell_interface.cpp => plasmashell.cpp} | 6 +- ...{plasmashell_interface.h => plasmashell.h} | 0 ...interface.cpp => plasmavirtualdesktop.cpp} | 4 +- ...top_interface.h => plasmavirtualdesktop.h} | 0 ...terface.cpp => plasmawindowmanagement.cpp} | 10 +- ...t_interface.h => plasmawindowmanagement.h} | 0 .../{pointer_interface.cpp => pointer.cpp} | 14 +- .../{pointer_interface.h => pointer.h} | 0 .../{pointer_interface_p.h => pointer_p.h} | 2 +- ...nterface.cpp => pointerconstraints_v1.cpp} | 12 +- ...v1_interface.h => pointerconstraints_v1.h} | 0 ...nterface_p.h => pointerconstraints_v1_p.h} | 4 +- ...1_interface.cpp => pointergestures_v1.cpp} | 12 +- ...es_v1_interface.h => pointergestures_v1.h} | 0 ...1_interface_p.h => pointergestures_v1_p.h} | 0 ...face.cpp => primaryselectiondevice_v1.cpp} | 14 +- ...nterface.h => primaryselectiondevice_v1.h} | 0 ...p => primaryselectiondevicemanager_v1.cpp} | 10 +- ...e.h => primaryselectiondevicemanager_v1.h} | 0 ...rface.cpp => primaryselectionoffer_v1.cpp} | 8 +- ...interface.h => primaryselectionoffer_v1.h} | 2 +- ...face.cpp => primaryselectionsource_v1.cpp} | 6 +- ...nterface.h => primaryselectionsource_v1.h} | 2 +- .../{region_interface.cpp => region.cpp} | 2 +- .../{region_interface_p.h => region_p.h} | 0 ...1_interface.cpp => relativepointer_v1.cpp} | 12 +- ...er_v1_interface.h => relativepointer_v1.h} | 0 ...1_interface_p.h => relativepointer_v1_p.h} | 0 ...ast_v1_interface.cpp => screencast_v1.cpp} | 6 +- ...eencast_v1_interface.h => screencast_v1.h} | 0 ...dge_v1_interface.cpp => screenedge_v1.cpp} | 6 +- ...eenedge_v1_interface.h => screenedge_v1.h} | 0 src/wayland/{seat_interface.cpp => seat.cpp} | 47 ++-- src/wayland/{seat_interface.h => seat.h} | 0 src/wayland/{seat_interface_p.h => seat_p.h} | 2 +- ...on_interface.cpp => server_decoration.cpp} | 6 +- ...ration_interface.h => server_decoration.h} | 0 ...face.cpp => server_decoration_palette.cpp} | 6 +- ...nterface.h => server_decoration_palette.h} | 0 .../{shadow_interface.cpp => shadow.cpp} | 6 +- src/wayland/{shadow_interface.h => shadow.h} | 0 .../{slide_interface.cpp => slide.cpp} | 6 +- src/wayland/{slide_interface.h => slide.h} | 0 ...ositor_interface.cpp => subcompositor.cpp} | 8 +- ...compositor_interface.h => subcompositor.h} | 0 ...ubsurface_interface_p.h => subsurface_p.h} | 2 +- .../{surface_interface.cpp => surface.cpp} | 28 +- .../{surface_interface.h => surface.h} | 0 .../{surface_interface_p.h => surface_p.h} | 2 +- ...{tablet_v2_interface.cpp => tablet_v2.cpp} | 8 +- .../{tablet_v2_interface.h => tablet_v2.h} | 0 ...v1_interface.cpp => tearingcontrol_v1.cpp} | 6 +- ...rol_v1_interface.h => tearingcontrol_v1.h} | 2 +- src/wayland/tests/renderingservertest.cpp | 16 +- src/wayland/tests/waylandservertest.cpp | 8 +- ...nput_v1_interface.cpp => textinput_v1.cpp} | 14 +- ...extinput_v1_interface.h => textinput_v1.h} | 0 ...nput_v1_interface_p.h => textinput_v1_p.h} | 8 +- ...nput_v2_interface.cpp => textinput_v2.cpp} | 8 +- ...extinput_v2_interface.h => textinput_v2.h} | 0 ...nput_v2_interface_p.h => textinput_v2_p.h} | 2 +- ...nput_v3_interface.cpp => textinput_v3.cpp} | 8 +- ...extinput_v3_interface.h => textinput_v3.h} | 0 ...nput_v3_interface_p.h => textinput_v3_p.h} | 2 +- .../{touch_interface.cpp => touch.cpp} | 10 +- src/wayland/{touch_interface.h => touch.h} | 0 .../{touch_interface_p.h => touch_p.h} | 2 +- src/wayland/transaction.cpp | 4 +- ...iewporter_interface.cpp => viewporter.cpp} | 8 +- .../{viewporter_interface.h => viewporter.h} | 0 ...iewporter_interface_p.h => viewporter_p.h} | 0 ..._v1_interface.cpp => xdgactivation_v1.cpp} | 8 +- ...tion_v1_interface.h => xdgactivation_v1.h} | 0 ..._v1_interface.cpp => xdgdecoration_v1.cpp} | 8 +- ...tion_v1_interface.h => xdgdecoration_v1.h} | 0 ..._v1_interface_p.h => xdgdecoration_v1_p.h} | 2 +- ...ign_v2_interface.cpp => xdgforeign_v2.cpp} | 7 +- ...foreign_v2_interface.h => xdgforeign_v2.h} | 0 ...ign_v2_interface_p.h => xdgforeign_v2_p.h} | 4 +- ...tput_v1_interface.cpp => xdgoutput_v1.cpp} | 6 +- ...dgoutput_v1_interface.h => xdgoutput_v1.h} | 0 .../{xdgshell_interface.cpp => xdgshell.cpp} | 10 +- .../{xdgshell_interface.h => xdgshell.h} | 0 .../{xdgshell_interface_p.h => xdgshell_p.h} | 4 +- ...1_interface.cpp => xdgtopleveldrag_v1.cpp} | 18 +- ...ag_v1_interface.h => xdgtopleveldrag_v1.h} | 2 +- ...erface.cpp => xwaylandkeyboardgrab_v1.cpp} | 8 +- ..._interface.h => xwaylandkeyboardgrab_v1.h} | 0 ..._v1_interface.cpp => xwaylandshell_v1.cpp} | 6 +- ...hell_v1_interface.h => xwaylandshell_v1.h} | 0 src/wayland_server.cpp | 88 +++--- src/waylandwindow.cpp | 2 +- src/window.cpp | 6 +- src/x11window.cpp | 2 +- src/xdgactivationv1.cpp | 6 +- src/xdgshellintegration.cpp | 2 +- src/xdgshellwindow.cpp | 16 +- src/xdgshellwindow.h | 2 +- src/xkb.cpp | 6 +- src/xwayland/clipboard.cpp | 2 +- src/xwayland/databridge.cpp | 6 +- src/xwayland/dnd.cpp | 6 +- src/xwayland/dnd.h | 2 +- src/xwayland/drag_wl.cpp | 8 +- src/xwayland/drag_wl.h | 2 +- src/xwayland/drag_x.cpp | 8 +- src/xwayland/drag_x.h | 2 +- src/xwayland/primary.cpp | 2 +- src/xwayland/selection_source.cpp | 6 +- src/xwayland/transfer.cpp | 6 +- src/xwayland/xwayland.cpp | 6 +- src/xwayland/xwldrophandler.cpp | 2 +- src/xwayland/xwldrophandler.h | 2 +- 277 files changed, 802 insertions(+), 809 deletions(-) rename src/wayland/{appmenu_interface.cpp => appmenu.cpp} (98%) rename src/wayland/{appmenu_interface.h => appmenu.h} (100%) rename src/wayland/{blur_interface.cpp => blur.cpp} (96%) rename src/wayland/{blur_interface.h => blur.h} (100%) rename src/wayland/{compositor_interface.cpp => compositor.cpp} (93%) rename src/wayland/{compositor_interface.h => compositor.h} (97%) rename src/wayland/{contenttype_v1_interface.cpp => contenttype_v1.cpp} (95%) rename src/wayland/{contenttype_v1_interface.h => contenttype_v1.h} (97%) rename src/wayland/{contrast_interface.cpp => contrast.cpp} (97%) rename src/wayland/{contrast_interface.h => contrast.h} (100%) rename src/wayland/{cursorshape_v1_interface.cpp => cursorshape_v1.cpp} (98%) rename src/wayland/{cursorshape_v1_interface.h => cursorshape_v1.h} (100%) rename src/wayland/{datacontroldevice_v1_interface.cpp => datacontroldevice_v1.cpp} (94%) rename src/wayland/{datacontroldevice_v1_interface.h => datacontroldevice_v1.h} (100%) rename src/wayland/{datacontroldevicemanager_v1_interface.cpp => datacontroldevicemanager_v1.cpp} (92%) rename src/wayland/{datacontroldevicemanager_v1_interface.h => datacontroldevicemanager_v1.h} (100%) rename src/wayland/{datacontroloffer_v1_interface.cpp => datacontroloffer_v1.cpp} (93%) rename src/wayland/{datacontroloffer_v1_interface.h => datacontroloffer_v1.h} (95%) rename src/wayland/{datacontrolsource_v1_interface.cpp => datacontrolsource_v1.cpp} (94%) rename src/wayland/{datacontrolsource_v1_interface.h => datacontrolsource_v1.h} (96%) rename src/wayland/{datadevice_interface.cpp => datadevice.cpp} (97%) rename src/wayland/{datadevice_interface.h => datadevice.h} (100%) rename src/wayland/{datadevice_interface_p.h => datadevice_p.h} (100%) rename src/wayland/{datadevicemanager_interface.cpp => datadevicemanager.cpp} (94%) rename src/wayland/{datadevicemanager_interface.h => datadevicemanager.h} (97%) rename src/wayland/{dataoffer_interface.cpp => dataoffer.cpp} (98%) rename src/wayland/{dataoffer_interface.h => dataoffer.h} (97%) rename src/wayland/{datasource_interface.cpp => datasource.cpp} (97%) rename src/wayland/{datasource_interface.h => datasource.h} (97%) rename src/wayland/{datasource_interface_p.h => datasource_p.h} (97%) rename src/wayland/{dpms_interface.cpp => dpms.cpp} (97%) rename src/wayland/{dpms_interface.h => dpms.h} (100%) rename src/wayland/{drmlease_v1_interface.cpp => drmlease_v1.cpp} (98%) rename src/wayland/{drmlease_v1_interface.h => drmlease_v1.h} (100%) rename src/wayland/{drmlease_v1_interface_p.h => drmlease_v1_p.h} (100%) rename src/wayland/{fakeinput_interface.cpp => fakeinput.cpp} (99%) rename src/wayland/{fakeinput_interface.h => fakeinput.h} (100%) rename src/wayland/{fractionalscale_v1_interface.cpp => fractionalscale_v1.cpp} (94%) rename src/wayland/{fractionalscale_v1_interface.h => fractionalscale_v1.h} (100%) rename src/wayland/{fractionalscale_v1_interface_p.h => fractionalscale_v1_p.h} (100%) rename src/wayland/{idle_interface.cpp => idle.cpp} (93%) rename src/wayland/{idle_interface.h => idle.h} (100%) rename src/wayland/{idle_interface_p.h => idle_p.h} (97%) rename src/wayland/{idleinhibit_v1_interface.cpp => idleinhibit_v1.cpp} (92%) rename src/wayland/{idleinhibit_v1_interface.h => idleinhibit_v1.h} (100%) rename src/wayland/{idleinhibit_v1_interface_p.h => idleinhibit_v1_p.h} (96%) rename src/wayland/{idlenotify_v1_interface.cpp => idlenotify_v1.cpp} (95%) rename src/wayland/{idlenotify_v1_interface.h => idlenotify_v1.h} (100%) rename src/wayland/{inputmethod_v1_interface.cpp => inputmethod_v1.cpp} (98%) rename src/wayland/{inputmethod_v1_interface.h => inputmethod_v1.h} (100%) rename src/wayland/{keyboard_interface.cpp => keyboard.cpp} (98%) rename src/wayland/{keyboard_interface.h => keyboard.h} (100%) rename src/wayland/{keyboard_interface_p.h => keyboard_p.h} (98%) rename src/wayland/{keyboard_shortcuts_inhibit_v1_interface.cpp => keyboard_shortcuts_inhibit_v1.cpp} (97%) rename src/wayland/{keyboard_shortcuts_inhibit_v1_interface.h => keyboard_shortcuts_inhibit_v1.h} (97%) rename src/wayland/{keystate_interface.cpp => keystate.cpp} (95%) rename src/wayland/{keystate_interface.h => keystate.h} (100%) rename src/wayland/{layershell_v1_interface.cpp => layershell_v1.cpp} (98%) rename src/wayland/{layershell_v1_interface.h => layershell_v1.h} (100%) rename src/wayland/{lockscreen_overlay_v1_interface.cpp => lockscreen_overlay_v1.cpp} (90%) rename src/wayland/{lockscreen_overlay_v1_interface.h => lockscreen_overlay_v1.h} (100%) rename src/wayland/{output_interface.cpp => output.cpp} (99%) rename src/wayland/{output_interface.h => output.h} (100%) rename src/wayland/{output_order_v1_interface.cpp => output_order_v1.cpp} (95%) rename src/wayland/{output_order_v1_interface.h => output_order_v1.h} (100%) rename src/wayland/{outputdevice_v2_interface.cpp => outputdevice_v2.cpp} (99%) rename src/wayland/{outputdevice_v2_interface.h => outputdevice_v2.h} (100%) rename src/wayland/{outputmanagement_v2_interface.cpp => outputmanagement_v2.cpp} (98%) rename src/wayland/{outputmanagement_v2_interface.h => outputmanagement_v2.h} (100%) rename src/wayland/{plasmashell_interface.cpp => plasmashell.cpp} (99%) rename src/wayland/{plasmashell_interface.h => plasmashell.h} (100%) rename src/wayland/{plasmavirtualdesktop_interface.cpp => plasmavirtualdesktop.cpp} (99%) rename src/wayland/{plasmavirtualdesktop_interface.h => plasmavirtualdesktop.h} (100%) rename src/wayland/{plasmawindowmanagement_interface.cpp => plasmawindowmanagement.cpp} (99%) rename src/wayland/{plasmawindowmanagement_interface.h => plasmawindowmanagement.h} (100%) rename src/wayland/{pointer_interface.cpp => pointer.cpp} (98%) rename src/wayland/{pointer_interface.h => pointer.h} (100%) rename src/wayland/{pointer_interface_p.h => pointer_p.h} (98%) rename src/wayland/{pointerconstraints_v1_interface.cpp => pointerconstraints_v1.cpp} (97%) rename src/wayland/{pointerconstraints_v1_interface.h => pointerconstraints_v1.h} (100%) rename src/wayland/{pointerconstraints_v1_interface_p.h => pointerconstraints_v1_p.h} (98%) rename src/wayland/{pointergestures_v1_interface.cpp => pointergestures_v1.cpp} (97%) rename src/wayland/{pointergestures_v1_interface.h => pointergestures_v1.h} (100%) rename src/wayland/{pointergestures_v1_interface_p.h => pointergestures_v1_p.h} (100%) rename src/wayland/{primaryselectiondevice_v1_interface.cpp => primaryselectiondevice_v1.cpp} (92%) rename src/wayland/{primaryselectiondevice_v1_interface.h => primaryselectiondevice_v1.h} (100%) rename src/wayland/{primaryselectiondevicemanager_v1_interface.cpp => primaryselectiondevicemanager_v1.cpp} (92%) rename src/wayland/{primaryselectiondevicemanager_v1_interface.h => primaryselectiondevicemanager_v1.h} (100%) rename src/wayland/{primaryselectionoffer_v1_interface.cpp => primaryselectionoffer_v1.cpp} (93%) rename src/wayland/{primaryselectionoffer_v1_interface.h => primaryselectionoffer_v1.h} (95%) rename src/wayland/{primaryselectionsource_v1_interface.cpp => primaryselectionsource_v1.cpp} (94%) rename src/wayland/{primaryselectionsource_v1_interface.h => primaryselectionsource_v1.h} (95%) rename src/wayland/{region_interface.cpp => region.cpp} (97%) rename src/wayland/{region_interface_p.h => region_p.h} (100%) rename src/wayland/{relativepointer_v1_interface.cpp => relativepointer_v1.cpp} (93%) rename src/wayland/{relativepointer_v1_interface.h => relativepointer_v1.h} (100%) rename src/wayland/{relativepointer_v1_interface_p.h => relativepointer_v1_p.h} (100%) rename src/wayland/{screencast_v1_interface.cpp => screencast_v1.cpp} (97%) rename src/wayland/{screencast_v1_interface.h => screencast_v1.h} (100%) rename src/wayland/{screenedge_v1_interface.cpp => screenedge_v1.cpp} (97%) rename src/wayland/{screenedge_v1_interface.h => screenedge_v1.h} (100%) rename src/wayland/{seat_interface.cpp => seat.cpp} (97%) rename src/wayland/{seat_interface.h => seat.h} (100%) rename src/wayland/{seat_interface_p.h => seat_p.h} (99%) rename src/wayland/{server_decoration_interface.cpp => server_decoration.cpp} (98%) rename src/wayland/{server_decoration_interface.h => server_decoration.h} (100%) rename src/wayland/{server_decoration_palette_interface.cpp => server_decoration_palette.cpp} (97%) rename src/wayland/{server_decoration_palette_interface.h => server_decoration_palette.h} (100%) rename src/wayland/{shadow_interface.cpp => shadow.cpp} (99%) rename src/wayland/{shadow_interface.h => shadow.h} (100%) rename src/wayland/{slide_interface.cpp => slide.cpp} (97%) rename src/wayland/{slide_interface.h => slide.h} (100%) rename src/wayland/{subcompositor_interface.cpp => subcompositor.cpp} (98%) rename src/wayland/{subcompositor_interface.h => subcompositor.h} (100%) rename src/wayland/{subsurface_interface_p.h => subsurface_p.h} (98%) rename src/wayland/{surface_interface.cpp => surface.cpp} (98%) rename src/wayland/{surface_interface.h => surface.h} (100%) rename src/wayland/{surface_interface_p.h => surface_p.h} (99%) rename src/wayland/{tablet_v2_interface.cpp => tablet_v2.cpp} (99%) rename src/wayland/{tablet_v2_interface.h => tablet_v2.h} (100%) rename src/wayland/{tearingcontrol_v1_interface.cpp => tearingcontrol_v1.cpp} (96%) rename src/wayland/{tearingcontrol_v1_interface.h => tearingcontrol_v1.h} (95%) rename src/wayland/{textinput_v1_interface.cpp => textinput_v1.cpp} (98%) rename src/wayland/{textinput_v1_interface.h => textinput_v1.h} (100%) rename src/wayland/{textinput_v1_interface_p.h => textinput_v1_p.h} (96%) rename src/wayland/{textinput_v2_interface.cpp => textinput_v2.cpp} (99%) rename src/wayland/{textinput_v2_interface.h => textinput_v2.h} (100%) rename src/wayland/{textinput_v2_interface_p.h => textinput_v2_p.h} (98%) rename src/wayland/{textinput_v3_interface.cpp => textinput_v3.cpp} (99%) rename src/wayland/{textinput_v3_interface.h => textinput_v3.h} (100%) rename src/wayland/{textinput_v3_interface_p.h => textinput_v3_p.h} (99%) rename src/wayland/{touch_interface.cpp => touch.cpp} (95%) rename src/wayland/{touch_interface.h => touch.h} (100%) rename src/wayland/{touch_interface_p.h => touch_p.h} (96%) rename src/wayland/{viewporter_interface.cpp => viewporter.cpp} (97%) rename src/wayland/{viewporter_interface.h => viewporter.h} (100%) rename src/wayland/{viewporter_interface_p.h => viewporter_p.h} (100%) rename src/wayland/{xdgactivation_v1_interface.cpp => xdgactivation_v1.cpp} (96%) rename src/wayland/{xdgactivation_v1_interface.h => xdgactivation_v1.h} (100%) rename src/wayland/{xdgdecoration_v1_interface.cpp => xdgdecoration_v1.cpp} (96%) rename src/wayland/{xdgdecoration_v1_interface.h => xdgdecoration_v1.h} (100%) rename src/wayland/{xdgdecoration_v1_interface_p.h => xdgdecoration_v1_p.h} (97%) rename src/wayland/{xdgforeign_v2_interface.cpp => xdgforeign_v2.cpp} (98%) rename src/wayland/{xdgforeign_v2_interface.h => xdgforeign_v2.h} (100%) rename src/wayland/{xdgforeign_v2_interface_p.h => xdgforeign_v2_p.h} (98%) rename src/wayland/{xdgoutput_v1_interface.cpp => xdgoutput_v1.cpp} (98%) rename src/wayland/{xdgoutput_v1_interface.h => xdgoutput_v1.h} (100%) rename src/wayland/{xdgshell_interface.cpp => xdgshell.cpp} (99%) rename src/wayland/{xdgshell_interface.h => xdgshell.h} (100%) rename src/wayland/{xdgshell_interface_p.h => xdgshell_p.h} (99%) rename src/wayland/{xdgtopleveldrag_v1_interface.cpp => xdgtopleveldrag_v1.cpp} (94%) rename src/wayland/{xdgtopleveldrag_v1_interface.h => xdgtopleveldrag_v1.h} (97%) rename src/wayland/{xwaylandkeyboardgrab_v1_interface.cpp => xwaylandkeyboardgrab_v1.cpp} (96%) rename src/wayland/{xwaylandkeyboardgrab_v1_interface.h => xwaylandkeyboardgrab_v1.h} (100%) rename src/wayland/{xwaylandshell_v1_interface.cpp => xwaylandshell_v1.cpp} (97%) rename src/wayland/{xwaylandshell_v1_interface.h => xwaylandshell_v1.h} (100%) diff --git a/autotests/integration/globalshortcuts_test.cpp b/autotests/integration/globalshortcuts_test.cpp index dddfe4bb52..c1d2da2db1 100644 --- a/autotests/integration/globalshortcuts_test.cpp +++ b/autotests/integration/globalshortcuts_test.cpp @@ -13,8 +13,8 @@ #include "keyboard_input.h" #include "pointer_input.h" #include "useractions.h" -#include "wayland/keyboard_interface.h" -#include "wayland/seat_interface.h" +#include "wayland/keyboard.h" +#include "wayland/seat.h" #include "wayland_server.h" #include "workspace.h" #include "x11window.h" diff --git a/autotests/integration/input_stacking_order.cpp b/autotests/integration/input_stacking_order.cpp index b9bff0e3eb..27639d01d2 100644 --- a/autotests/integration/input_stacking_order.cpp +++ b/autotests/integration/input_stacking_order.cpp @@ -11,7 +11,7 @@ #include "core/output.h" #include "libkwineffects/kwineffects.h" #include "pointer_input.h" -#include "wayland/seat_interface.h" +#include "wayland/seat.h" #include "wayland_server.h" #include "window.h" #include "workspace.h" diff --git a/autotests/integration/inputmethod_test.cpp b/autotests/integration/inputmethod_test.cpp index 1ff92e9e8f..2116df8e9e 100644 --- a/autotests/integration/inputmethod_test.cpp +++ b/autotests/integration/inputmethod_test.cpp @@ -18,8 +18,8 @@ #include "virtualkeyboard_dbus.h" #include "wayland/clientconnection.h" #include "wayland/display.h" -#include "wayland/seat_interface.h" -#include "wayland/surface_interface.h" +#include "wayland/seat.h" +#include "wayland/surface.h" #include "wayland_server.h" #include "window.h" #include "workspace.h" diff --git a/autotests/integration/internal_window.cpp b/autotests/integration/internal_window.cpp index f8261415dd..d36caecabd 100644 --- a/autotests/integration/internal_window.cpp +++ b/autotests/integration/internal_window.cpp @@ -12,7 +12,7 @@ #include "effects.h" #include "internalwindow.h" #include "pointer_input.h" -#include "wayland/surface_interface.h" +#include "wayland/surface.h" #include "wayland_server.h" #include "workspace.h" diff --git a/autotests/integration/lockscreen.cpp b/autotests/integration/lockscreen.cpp index db890d30d1..0745af118e 100644 --- a/autotests/integration/lockscreen.cpp +++ b/autotests/integration/lockscreen.cpp @@ -14,8 +14,8 @@ #include "libkwineffects/kwineffects.h" #include "pointer_input.h" #include "screenedge.h" -#include "wayland/keyboard_interface.h" -#include "wayland/seat_interface.h" +#include "wayland/keyboard.h" +#include "wayland/seat.h" #include "wayland_server.h" #include "window.h" #include "workspace.h" diff --git a/autotests/integration/plasmawindow_test.cpp b/autotests/integration/plasmawindow_test.cpp index fd483a3c45..9dd2f421d0 100644 --- a/autotests/integration/plasmawindow_test.cpp +++ b/autotests/integration/plasmawindow_test.cpp @@ -11,7 +11,7 @@ #include "core/output.h" #include "libkwineffects/kwineffects.h" #include "pointer_input.h" -#include "wayland/seat_interface.h" +#include "wayland/seat.h" #include "wayland_server.h" #include "workspace.h" #include "x11window.h" diff --git a/autotests/integration/pointer_constraints_test.cpp b/autotests/integration/pointer_constraints_test.cpp index 95281e797f..a320200b12 100644 --- a/autotests/integration/pointer_constraints_test.cpp +++ b/autotests/integration/pointer_constraints_test.cpp @@ -12,8 +12,8 @@ #include "cursor.h" #include "keyboard_input.h" #include "pointer_input.h" -#include "wayland/seat_interface.h" -#include "wayland/surface_interface.h" +#include "wayland/seat.h" +#include "wayland/surface.h" #include "wayland_server.h" #include "window.h" #include "workspace.h" diff --git a/autotests/integration/pointer_input.cpp b/autotests/integration/pointer_input.cpp index 3a01728b50..2bc2f80109 100644 --- a/autotests/integration/pointer_input.cpp +++ b/autotests/integration/pointer_input.cpp @@ -16,7 +16,7 @@ #include "pointer_input.h" #include "utils/xcursortheme.h" #include "virtualdesktops.h" -#include "wayland/seat_interface.h" +#include "wayland/seat.h" #include "wayland_server.h" #include "window.h" #include "workspace.h" diff --git a/autotests/integration/transient_placement.cpp b/autotests/integration/transient_placement.cpp index a5a17e24ff..af0eb2b739 100644 --- a/autotests/integration/transient_placement.cpp +++ b/autotests/integration/transient_placement.cpp @@ -11,8 +11,8 @@ #include "core/output.h" #include "libkwineffects/kwineffects.h" #include "pointer_input.h" -#include "wayland/seat_interface.h" -#include "wayland/surface_interface.h" +#include "wayland/seat.h" +#include "wayland/surface.h" #include "wayland_server.h" #include "window.h" #include "workspace.h" diff --git a/autotests/integration/xwayland_input_test.cpp b/autotests/integration/xwayland_input_test.cpp index ff619bd447..4c551f7a0b 100644 --- a/autotests/integration/xwayland_input_test.cpp +++ b/autotests/integration/xwayland_input_test.cpp @@ -10,7 +10,7 @@ #include "core/output.h" #include "pointer_input.h" -#include "wayland/seat_interface.h" +#include "wayland/seat.h" #include "wayland_server.h" #include "workspace.h" #include "x11window.h" diff --git a/autotests/integration/xwayland_selections_test.cpp b/autotests/integration/xwayland_selections_test.cpp index 7809935b60..997e20435e 100644 --- a/autotests/integration/xwayland_selections_test.cpp +++ b/autotests/integration/xwayland_selections_test.cpp @@ -10,7 +10,7 @@ #include "kwin_wayland_test.h" #include "core/output.h" -#include "wayland/seat_interface.h" +#include "wayland/seat.h" #include "wayland_server.h" #include "window.h" #include "workspace.h" diff --git a/src/backends/drm/drm_dmabuf_feedback.cpp b/src/backends/drm/drm_dmabuf_feedback.cpp index b000e228d3..269d6e57ec 100644 --- a/src/backends/drm/drm_dmabuf_feedback.cpp +++ b/src/backends/drm/drm_dmabuf_feedback.cpp @@ -10,7 +10,7 @@ #include "drm_egl_backend.h" #include "drm_gpu.h" -#include "wayland/surface_interface.h" +#include "wayland/surface.h" namespace KWin { diff --git a/src/backends/drm/drm_egl_layer.cpp b/src/backends/drm/drm_egl_layer.cpp index c26453ed87..6516f8a3f4 100644 --- a/src/backends/drm/drm_egl_layer.cpp +++ b/src/backends/drm/drm_egl_layer.cpp @@ -14,7 +14,7 @@ #include "drm_output.h" #include "drm_pipeline.h" #include "scene/surfaceitem_wayland.h" -#include "wayland/surface_interface.h" +#include "wayland/surface.h" #include #include diff --git a/src/backends/drm/drm_virtual_egl_layer.cpp b/src/backends/drm/drm_virtual_egl_layer.cpp index fb55e3c3b6..e1408e25d2 100644 --- a/src/backends/drm/drm_virtual_egl_layer.cpp +++ b/src/backends/drm/drm_virtual_egl_layer.cpp @@ -14,7 +14,7 @@ #include "platformsupport/scenes/opengl/eglswapchain.h" #include "platformsupport/scenes/opengl/glrendertimequery.h" #include "scene/surfaceitem_wayland.h" -#include "wayland/surface_interface.h" +#include "wayland/surface.h" #include #include diff --git a/src/backends/fakeinput/fakeinputbackend.cpp b/src/backends/fakeinput/fakeinputbackend.cpp index 5cb71adbe9..5aad191659 100644 --- a/src/backends/fakeinput/fakeinputbackend.cpp +++ b/src/backends/fakeinput/fakeinputbackend.cpp @@ -6,7 +6,7 @@ #include "fakeinputbackend.h" #include "fakeinputdevice.h" -#include "wayland/fakeinput_interface.h" +#include "wayland/fakeinput.h" #include "wayland_server.h" namespace KWin diff --git a/src/backends/fakeinput/fakeinputdevice.cpp b/src/backends/fakeinput/fakeinputdevice.cpp index 1a0a5002af..82f052eaf2 100644 --- a/src/backends/fakeinput/fakeinputdevice.cpp +++ b/src/backends/fakeinput/fakeinputdevice.cpp @@ -5,7 +5,7 @@ */ #include "fakeinputdevice.h" -#include "wayland/fakeinput_interface.h" +#include "wayland/fakeinput.h" namespace KWin { diff --git a/src/core/renderloop.cpp b/src/core/renderloop.cpp index 54fbcb1669..a1d7dea1c3 100644 --- a/src/core/renderloop.cpp +++ b/src/core/renderloop.cpp @@ -10,7 +10,7 @@ #include "scene/surfaceitem.h" #include "scene/surfaceitem_wayland.h" #include "utils/common.h" -#include "wayland/surface_interface.h" +#include "wayland/surface.h" namespace KWin { diff --git a/src/cursorsource.cpp b/src/cursorsource.cpp index 78d6c78b33..c1bbb980d9 100644 --- a/src/cursorsource.cpp +++ b/src/cursorsource.cpp @@ -6,7 +6,7 @@ #include "cursorsource.h" #include "cursor.h" -#include "wayland/surface_interface.h" +#include "wayland/surface.h" namespace KWin { diff --git a/src/debug_console.cpp b/src/debug_console.cpp index 8d6b1a3067..e1104c6a4a 100644 --- a/src/debug_console.cpp +++ b/src/debug_console.cpp @@ -21,13 +21,13 @@ #include "utils/subsurfacemonitor.h" #include "wayland/abstract_data_source.h" #include "wayland/clientconnection.h" -#include "wayland/datacontrolsource_v1_interface.h" -#include "wayland/datasource_interface.h" +#include "wayland/datacontrolsource_v1.h" +#include "wayland/datasource.h" #include "wayland/display.h" -#include "wayland/primaryselectionsource_v1_interface.h" -#include "wayland/seat_interface.h" -#include "wayland/subcompositor_interface.h" -#include "wayland/surface_interface.h" +#include "wayland/primaryselectionsource_v1.h" +#include "wayland/seat.h" +#include "wayland/subcompositor.h" +#include "wayland/surface.h" #include "wayland_server.h" #include "waylandwindow.h" #include "workspace.h" diff --git a/src/decorations/decorationbridge.cpp b/src/decorations/decorationbridge.cpp index 41172ca7d3..85f6edea9b 100644 --- a/src/decorations/decorationbridge.cpp +++ b/src/decorations/decorationbridge.cpp @@ -14,7 +14,7 @@ #include "decorations_logging.h" #include "settings.h" // KWin core -#include "wayland/server_decoration_interface.h" +#include "wayland/server_decoration.h" #include "wayland_server.h" #include "window.h" #include "workspace.h" diff --git a/src/dpmsinputeventfilter.cpp b/src/dpmsinputeventfilter.cpp index d740015eb5..78f944ea7b 100644 --- a/src/dpmsinputeventfilter.cpp +++ b/src/dpmsinputeventfilter.cpp @@ -10,7 +10,7 @@ #include "core/output.h" #include "input_event.h" #include "main.h" -#include "wayland/seat_interface.h" +#include "wayland/seat.h" #include "wayland_server.h" #include "workspace.h" diff --git a/src/events.cpp b/src/events.cpp index 715457b7ea..d28d96021e 100644 --- a/src/events.cpp +++ b/src/events.cpp @@ -29,8 +29,8 @@ #include "screenedge.h" #include "useractions.h" #include "utils/xcbutils.h" -#include "wayland/surface_interface.h" -#include "wayland/xwaylandshell_v1_interface.h" +#include "wayland/surface.h" +#include "wayland/xwaylandshell_v1.h" #include "wayland_server.h" #include diff --git a/src/idle_inhibition.cpp b/src/idle_inhibition.cpp index 43a9676361..f51d1e4db9 100644 --- a/src/idle_inhibition.cpp +++ b/src/idle_inhibition.cpp @@ -10,7 +10,7 @@ #include "idle_inhibition.h" #include "input.h" #include "virtualdesktops.h" -#include "wayland/surface_interface.h" +#include "wayland/surface.h" #include "window.h" #include "workspace.h" diff --git a/src/input.cpp b/src/input.cpp index fcd291f7eb..e2a7cc8820 100644 --- a/src/input.cpp +++ b/src/input.cpp @@ -29,7 +29,7 @@ #include "pointer_input.h" #include "tablet_input.h" #include "touch_input.h" -#include "wayland/xdgtopleveldrag_v1_interface.h" +#include "wayland/xdgtopleveldrag_v1.h" #include "x11window.h" #if KWIN_BUILD_TABBOX #include "tabbox/tabbox.h" @@ -43,10 +43,10 @@ #include "screenedge.h" #include "virtualdesktops.h" #include "wayland/display.h" -#include "wayland/inputmethod_v1_interface.h" -#include "wayland/seat_interface.h" -#include "wayland/surface_interface.h" -#include "wayland/tablet_v2_interface.h" +#include "wayland/inputmethod_v1.h" +#include "wayland/seat.h" +#include "wayland/surface.h" +#include "wayland/tablet_v2.h" #include "wayland_server.h" #include "workspace.h" #include "xkb.h" @@ -73,7 +73,7 @@ #include #include "osd.h" -#include "wayland/xdgshell_interface.h" +#include "wayland/xdgshell.h" #include using namespace std::literals; diff --git a/src/inputmethod.cpp b/src/inputmethod.cpp index a54b9cdc84..ac0b3f23f3 100644 --- a/src/inputmethod.cpp +++ b/src/inputmethod.cpp @@ -24,12 +24,12 @@ #include "tablet_input.h" #include "touch_input.h" #include "wayland/display.h" -#include "wayland/inputmethod_v1_interface.h" -#include "wayland/keyboard_interface.h" -#include "wayland/seat_interface.h" -#include "wayland/surface_interface.h" -#include "wayland/textinput_v1_interface.h" -#include "wayland/textinput_v3_interface.h" +#include "wayland/inputmethod_v1.h" +#include "wayland/keyboard.h" +#include "wayland/seat.h" +#include "wayland/surface.h" +#include "wayland/textinput_v1.h" +#include "wayland/textinput_v3.h" #include "xkb.h" #include diff --git a/src/inputmethod.h b/src/inputmethod.h index 4ae1361f25..1215895fdc 100644 --- a/src/inputmethod.h +++ b/src/inputmethod.h @@ -8,7 +8,7 @@ */ #pragma once -#include "wayland/textinput_v2_interface.h" +#include "wayland/textinput_v2.h" #include #include diff --git a/src/inputpanelv1integration.cpp b/src/inputpanelv1integration.cpp index 85bc0d0fe6..404b3cb7e2 100644 --- a/src/inputpanelv1integration.cpp +++ b/src/inputpanelv1integration.cpp @@ -7,7 +7,7 @@ #include "inputpanelv1integration.h" #include "inputpanelv1window.h" #include "wayland/display.h" -#include "wayland/inputmethod_v1_interface.h" +#include "wayland/inputmethod_v1.h" #include "wayland_server.h" using namespace KWaylandServer; diff --git a/src/inputpanelv1window.cpp b/src/inputpanelv1window.cpp index f76a4521e2..8f7ecdf0ec 100644 --- a/src/inputpanelv1window.cpp +++ b/src/inputpanelv1window.cpp @@ -10,12 +10,12 @@ #include "inputpanelv1window.h" #include "core/output.h" #include "inputmethod.h" -#include "wayland/output_interface.h" -#include "wayland/seat_interface.h" -#include "wayland/surface_interface.h" -#include "wayland/textinput_v1_interface.h" -#include "wayland/textinput_v2_interface.h" -#include "wayland/textinput_v3_interface.h" +#include "wayland/output.h" +#include "wayland/seat.h" +#include "wayland/surface.h" +#include "wayland/textinput_v1.h" +#include "wayland/textinput_v2.h" +#include "wayland/textinput_v3.h" #include "wayland_server.h" #include "workspace.h" diff --git a/src/inputpanelv1window.h b/src/inputpanelv1window.h index d889eb3b02..24ca9f4c7f 100644 --- a/src/inputpanelv1window.h +++ b/src/inputpanelv1window.h @@ -9,7 +9,7 @@ #pragma once -#include "wayland/inputmethod_v1_interface.h" +#include "wayland/inputmethod_v1.h" #include "waylandwindow.h" #include diff --git a/src/keyboard_input.cpp b/src/keyboard_input.cpp index aff81fd256..591d646c0d 100644 --- a/src/keyboard_input.cpp +++ b/src/keyboard_input.cpp @@ -16,9 +16,9 @@ #include "keyboard_layout.h" #include "keyboard_repeat.h" #include "modifier_only_shortcuts.h" -#include "wayland/datadevice_interface.h" -#include "wayland/keyboard_interface.h" -#include "wayland/seat_interface.h" +#include "wayland/datadevice.h" +#include "wayland/keyboard.h" +#include "wayland/seat.h" #include "wayland_server.h" #include "window.h" #include "workspace.h" diff --git a/src/keyboard_repeat.cpp b/src/keyboard_repeat.cpp index 550ec7812c..8e9f9126c6 100644 --- a/src/keyboard_repeat.cpp +++ b/src/keyboard_repeat.cpp @@ -9,8 +9,8 @@ #include "keyboard_repeat.h" #include "input_event.h" #include "keyboard_input.h" -#include "wayland/keyboard_interface.h" -#include "wayland/seat_interface.h" +#include "wayland/keyboard.h" +#include "wayland/seat.h" #include "wayland_server.h" #include "xkb.h" diff --git a/src/layershellv1integration.cpp b/src/layershellv1integration.cpp index fc36661ebb..7b7ac79b86 100644 --- a/src/layershellv1integration.cpp +++ b/src/layershellv1integration.cpp @@ -8,8 +8,8 @@ #include "core/output.h" #include "layershellv1window.h" #include "wayland/display.h" -#include "wayland/layershell_v1_interface.h" -#include "wayland/output_interface.h" +#include "wayland/layershell_v1.h" +#include "wayland/output.h" #include "wayland_server.h" #include "workspace.h" diff --git a/src/layershellv1window.cpp b/src/layershellv1window.cpp index 9ffe616bf4..58c5e381b3 100644 --- a/src/layershellv1window.cpp +++ b/src/layershellv1window.cpp @@ -8,10 +8,10 @@ #include "core/output.h" #include "layershellv1integration.h" #include "screenedge.h" -#include "wayland/layershell_v1_interface.h" -#include "wayland/output_interface.h" -#include "wayland/screenedge_v1_interface.h" -#include "wayland/surface_interface.h" +#include "wayland/layershell_v1.h" +#include "wayland/output.h" +#include "wayland/screenedge_v1.h" +#include "wayland/surface.h" #include "wayland_server.h" #include "workspace.h" diff --git a/src/main.cpp b/src/main.cpp index 1963002a08..da0ab35753 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -33,7 +33,7 @@ #include "sm.h" #include "tabletmodemanager.h" #include "utils/xcbutils.h" -#include "wayland/surface_interface.h" +#include "wayland/surface.h" #include "workspace.h" #include "x11eventfilter.h" diff --git a/src/main_wayland.cpp b/src/main_wayland.cpp index 4c9f82c6ba..fbc5cecea9 100644 --- a/src/main_wayland.cpp +++ b/src/main_wayland.cpp @@ -22,7 +22,7 @@ #include "tabletmodemanager.h" #include "utils/realtime.h" #include "wayland/display.h" -#include "wayland/seat_interface.h" +#include "wayland/seat.h" #include "wayland_server.h" #include "workspace.h" #include "xwayland/xwayland.h" diff --git a/src/plugins/backgroundcontrast/contrast.cpp b/src/plugins/backgroundcontrast/contrast.cpp index 4db5a08e68..94a6c192b2 100644 --- a/src/plugins/backgroundcontrast/contrast.cpp +++ b/src/plugins/backgroundcontrast/contrast.cpp @@ -13,9 +13,9 @@ #include "libkwineffects/rendertarget.h" #include "libkwineffects/renderviewport.h" #include "utils/xcbutils.h" -#include "wayland/contrast_interface.h" +#include "wayland/contrast.h" #include "wayland/display.h" -#include "wayland/surface_interface.h" +#include "wayland/surface.h" #include #include diff --git a/src/plugins/blur/blur.cpp b/src/plugins/blur/blur.cpp index 4a1554be84..49b9bc85c0 100644 --- a/src/plugins/blur/blur.cpp +++ b/src/plugins/blur/blur.cpp @@ -14,9 +14,9 @@ #include "libkwineffects/rendertarget.h" #include "libkwineffects/renderviewport.h" #include "utils/xcbutils.h" -#include "wayland/blur_interface.h" +#include "wayland/blur.h" #include "wayland/display.h" -#include "wayland/surface_interface.h" +#include "wayland/surface.h" #include #include diff --git a/src/plugins/screencast/screencastmanager.cpp b/src/plugins/screencast/screencastmanager.cpp index 8a23170d85..9a8215bd65 100644 --- a/src/plugins/screencast/screencastmanager.cpp +++ b/src/plugins/screencast/screencastmanager.cpp @@ -17,7 +17,7 @@ #include "scene/workspacescene.h" #include "screencaststream.h" #include "wayland/display.h" -#include "wayland/output_interface.h" +#include "wayland/output.h" #include "wayland_server.h" #include "window.h" #include "windowscreencastsource.h" diff --git a/src/plugins/screencast/screencastmanager.h b/src/plugins/screencast/screencastmanager.h index ddf0c8a4a1..0ecf850aa2 100644 --- a/src/plugins/screencast/screencastmanager.h +++ b/src/plugins/screencast/screencastmanager.h @@ -10,7 +10,7 @@ #include "plugin.h" -#include "wayland/screencast_v1_interface.h" +#include "wayland/screencast_v1.h" namespace KWin { diff --git a/src/plugins/screencast/screencaststream.h b/src/plugins/screencast/screencaststream.h index cf7a1fb2da..ca8c403049 100644 --- a/src/plugins/screencast/screencaststream.h +++ b/src/plugins/screencast/screencaststream.h @@ -10,7 +10,7 @@ #include "config-kwin.h" -#include "wayland/screencast_v1_interface.h" +#include "wayland/screencast_v1.h" #include #include diff --git a/src/plugins/slidingpopups/slidingpopups.cpp b/src/plugins/slidingpopups/slidingpopups.cpp index 8398fc009e..398ef804d5 100644 --- a/src/plugins/slidingpopups/slidingpopups.cpp +++ b/src/plugins/slidingpopups/slidingpopups.cpp @@ -12,8 +12,8 @@ #include "slidingpopupsconfig.h" #include "wayland/display.h" -#include "wayland/slide_interface.h" -#include "wayland/surface_interface.h" +#include "wayland/slide.h" +#include "wayland/surface.h" #include #include diff --git a/src/plugins/windowsystem/windowsystem.cpp b/src/plugins/windowsystem/windowsystem.cpp index 6842e91d50..7c1da6b5b6 100644 --- a/src/plugins/windowsystem/windowsystem.cpp +++ b/src/plugins/windowsystem/windowsystem.cpp @@ -10,7 +10,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/src/pointer_input.cpp b/src/pointer_input.cpp index 169df2ca54..5b004303a0 100644 --- a/src/pointer_input.cpp +++ b/src/pointer_input.cpp @@ -21,10 +21,10 @@ #include "mousebuttons.h" #include "osd.h" #include "wayland/display.h" -#include "wayland/pointer_interface.h" -#include "wayland/pointerconstraints_v1_interface.h" -#include "wayland/seat_interface.h" -#include "wayland/surface_interface.h" +#include "wayland/pointer.h" +#include "wayland/pointerconstraints_v1.h" +#include "wayland/seat.h" +#include "wayland/surface.h" #include "wayland_server.h" #include "workspace.h" #include "x11window.h" diff --git a/src/popup_input_filter.cpp b/src/popup_input_filter.cpp index b80329ab33..751b1721a8 100644 --- a/src/popup_input_filter.cpp +++ b/src/popup_input_filter.cpp @@ -8,7 +8,7 @@ #include "input_event.h" #include "internalwindow.h" #include "keyboard_input.h" -#include "wayland/seat_interface.h" +#include "wayland/seat.h" #include "wayland_server.h" #include "window.h" #include "workspace.h" diff --git a/src/scene/dndiconitem.cpp b/src/scene/dndiconitem.cpp index ef6a0d7a07..1f1c2ea2df 100644 --- a/src/scene/dndiconitem.cpp +++ b/src/scene/dndiconitem.cpp @@ -6,8 +6,8 @@ #include "scene/dndiconitem.h" #include "scene/surfaceitem_wayland.h" -#include "wayland/datadevice_interface.h" -#include "wayland/surface_interface.h" +#include "wayland/datadevice.h" +#include "wayland/surface.h" namespace KWin { diff --git a/src/scene/surfaceitem_wayland.cpp b/src/scene/surfaceitem_wayland.cpp index 96f1845b6b..35c2ab6739 100644 --- a/src/scene/surfaceitem_wayland.cpp +++ b/src/scene/surfaceitem_wayland.cpp @@ -8,8 +8,8 @@ #include "compositor.h" #include "core/graphicsbuffer.h" #include "core/renderbackend.h" -#include "wayland/subcompositor_interface.h" -#include "wayland/surface_interface.h" +#include "wayland/subcompositor.h" +#include "wayland/surface.h" #include "window.h" #include "x11window.h" diff --git a/src/scene/workspacescene.cpp b/src/scene/workspacescene.cpp index 999412774d..760e3bbbc4 100644 --- a/src/scene/workspacescene.cpp +++ b/src/scene/workspacescene.cpp @@ -66,8 +66,8 @@ #include "scene/surfaceitem.h" #include "scene/windowitem.h" #include "shadow.h" -#include "wayland/seat_interface.h" -#include "wayland/surface_interface.h" +#include "wayland/seat.h" +#include "wayland/surface.h" #include "wayland_server.h" #include "waylandwindow.h" #include "workspace.h" diff --git a/src/shadow.cpp b/src/shadow.cpp index 38c8611527..f8667bed52 100644 --- a/src/shadow.cpp +++ b/src/shadow.cpp @@ -12,8 +12,8 @@ #include "atoms.h" #include "core/graphicsbufferview.h" #include "internalwindow.h" -#include "wayland/shadow_interface.h" -#include "wayland/surface_interface.h" +#include "wayland/shadow.h" +#include "wayland/surface.h" #include "wayland_server.h" #include "x11window.h" diff --git a/src/tablet_input.cpp b/src/tablet_input.cpp index 90a479715e..5f8de839ac 100644 --- a/src/tablet_input.cpp +++ b/src/tablet_input.cpp @@ -11,8 +11,8 @@ #include "input_event.h" #include "input_event_spy.h" #include "pointer_input.h" -#include "wayland/seat_interface.h" -#include "wayland/surface_interface.h" +#include "wayland/seat.h" +#include "wayland/surface.h" #include "wayland_server.h" #include "window.h" #include "workspace.h" diff --git a/src/touch_input.cpp b/src/touch_input.cpp index de4f013a81..6795907d82 100644 --- a/src/touch_input.cpp +++ b/src/touch_input.cpp @@ -14,7 +14,7 @@ #include "decorations/decoratedclient.h" #include "input_event_spy.h" #include "pointer_input.h" -#include "wayland/seat_interface.h" +#include "wayland/seat.h" #include "wayland_server.h" #include "window.h" #include "workspace.h" diff --git a/src/utils/subsurfacemonitor.cpp b/src/utils/subsurfacemonitor.cpp index 1ee3137aed..6bd041445a 100644 --- a/src/utils/subsurfacemonitor.cpp +++ b/src/utils/subsurfacemonitor.cpp @@ -9,8 +9,8 @@ #include "subsurfacemonitor.h" -#include "wayland/subcompositor_interface.h" -#include "wayland/surface_interface.h" +#include "wayland/subcompositor.h" +#include "wayland/surface.h" using namespace KWaylandServer; diff --git a/src/virtualdesktops.cpp b/src/virtualdesktops.cpp index 754a388858..9e787d88f1 100644 --- a/src/virtualdesktops.cpp +++ b/src/virtualdesktops.cpp @@ -9,7 +9,7 @@ */ #include "virtualdesktops.h" #include "input.h" -#include "wayland/plasmavirtualdesktop_interface.h" +#include "wayland/plasmavirtualdesktop.h" // KDE #include #include diff --git a/src/wayland/CMakeLists.txt b/src/wayland/CMakeLists.txt index c0d8a5a390..3d2f2ae600 100644 --- a/src/wayland/CMakeLists.txt +++ b/src/wayland/CMakeLists.txt @@ -225,81 +225,81 @@ ecm_add_qtwayland_server_protocol_kde(WaylandProtocols_xml target_sources(kwin PRIVATE abstract_data_source.cpp abstract_drop_handler.cpp - appmenu_interface.cpp - blur_interface.cpp + appmenu.cpp + blur.cpp clientconnection.cpp - compositor_interface.cpp - contenttype_v1_interface.cpp - contrast_interface.cpp - cursorshape_v1_interface.cpp - datacontroldevice_v1_interface.cpp - datacontroldevicemanager_v1_interface.cpp - datacontroloffer_v1_interface.cpp - datacontrolsource_v1_interface.cpp - datadevice_interface.cpp - datadevicemanager_interface.cpp - dataoffer_interface.cpp - datasource_interface.cpp + compositor.cpp + contenttype_v1.cpp + contrast.cpp + cursorshape_v1.cpp + datacontroldevice_v1.cpp + datacontroldevicemanager_v1.cpp + datacontroloffer_v1.cpp + datacontrolsource_v1.cpp + datadevice.cpp + datadevicemanager.cpp + dataoffer.cpp + datasource.cpp display.cpp - dpms_interface.cpp + dpms.cpp drmclientbuffer.cpp - drmlease_v1_interface.cpp - fakeinput_interface.cpp - fractionalscale_v1_interface.cpp + drmlease_v1.cpp + fakeinput.cpp + fractionalscale_v1.cpp filtered_display.cpp - idle_interface.cpp - idleinhibit_v1_interface.cpp - idlenotify_v1_interface.cpp - inputmethod_v1_interface.cpp - keyboard_interface.cpp - keyboard_shortcuts_inhibit_v1_interface.cpp - keystate_interface.cpp - layershell_v1_interface.cpp + idle.cpp + idleinhibit_v1.cpp + idlenotify_v1.cpp + inputmethod_v1.cpp + keyboard.cpp + keyboard_shortcuts_inhibit_v1.cpp + keystate.cpp + layershell_v1.cpp linuxdmabufv1clientbuffer.cpp - lockscreen_overlay_v1_interface.cpp - output_interface.cpp - output_order_v1_interface.cpp - outputdevice_v2_interface.cpp - outputmanagement_v2_interface.cpp - plasmashell_interface.cpp - plasmavirtualdesktop_interface.cpp - plasmawindowmanagement_interface.cpp - pointer_interface.cpp - pointerconstraints_v1_interface.cpp - pointergestures_v1_interface.cpp - primaryselectiondevice_v1_interface.cpp - primaryselectiondevicemanager_v1_interface.cpp - primaryselectionoffer_v1_interface.cpp - primaryselectionsource_v1_interface.cpp - region_interface.cpp - relativepointer_v1_interface.cpp - screencast_v1_interface.cpp - screenedge_v1_interface.cpp - seat_interface.cpp - server_decoration_interface.cpp - server_decoration_palette_interface.cpp - shadow_interface.cpp + lockscreen_overlay_v1.cpp + output.cpp + output_order_v1.cpp + outputdevice_v2.cpp + outputmanagement_v2.cpp + plasmashell.cpp + plasmavirtualdesktop.cpp + plasmawindowmanagement.cpp + pointer.cpp + pointerconstraints_v1.cpp + pointergestures_v1.cpp + primaryselectiondevice_v1.cpp + primaryselectiondevicemanager_v1.cpp + primaryselectionoffer_v1.cpp + primaryselectionsource_v1.cpp + region.cpp + relativepointer_v1.cpp + screencast_v1.cpp + screenedge_v1.cpp + seat.cpp + server_decoration.cpp + server_decoration_palette.cpp + shadow.cpp shmclientbuffer.cpp - slide_interface.cpp - subcompositor_interface.cpp - surface_interface.cpp - tablet_v2_interface.cpp - tearingcontrol_v1_interface.cpp + slide.cpp + subcompositor.cpp + surface.cpp + tablet_v2.cpp + tearingcontrol_v1.cpp textinput.cpp - textinput_v1_interface.cpp - textinput_v2_interface.cpp - textinput_v3_interface.cpp - touch_interface.cpp + textinput_v1.cpp + textinput_v2.cpp + textinput_v3.cpp + touch.cpp transaction.cpp - viewporter_interface.cpp - xdgactivation_v1_interface.cpp - xdgdecoration_v1_interface.cpp - xdgforeign_v2_interface.cpp - xdgoutput_v1_interface.cpp - xdgshell_interface.cpp - xdgtopleveldrag_v1_interface.cpp - xwaylandkeyboardgrab_v1_interface.cpp - xwaylandshell_v1_interface.cpp + viewporter.cpp + xdgactivation_v1.cpp + xdgdecoration_v1.cpp + xdgforeign_v2.cpp + xdgoutput_v1.cpp + xdgshell.cpp + xdgtopleveldrag_v1.cpp + xwaylandkeyboardgrab_v1.cpp + xwaylandshell_v1.cpp ) if(CMAKE_SYSTEM_NAME MATCHES "Linux") @@ -311,70 +311,70 @@ else() endif() install(FILES - appmenu_interface.h - blur_interface.h - compositor_interface.h - contenttype_v1_interface.h - contrast_interface.h - cursorshape_v1_interface.h - datacontroldevice_v1_interface.h - datacontroldevicemanager_v1_interface.h - datacontroloffer_v1_interface.h - datacontrolsource_v1_interface.h - datadevice_interface.h - datadevicemanager_interface.h - dataoffer_interface.h - datasource_interface.h - dpms_interface.h - drmlease_v1_interface.h - fakeinput_interface.h - fractionalscale_v1_interface.h - idle_interface.h - idleinhibit_v1_interface.h - idlenotify_v1_interface.h - inputmethod_v1_interface.h - keyboard_interface.h - keyboard_shortcuts_inhibit_v1_interface.h - keystate_interface.h - layershell_v1_interface.h - lockscreen_overlay_v1_interface.h - output_interface.h - output_order_v1_interface.h - outputdevice_v2_interface.h - outputmanagement_v2_interface.h - plasmashell_interface.h - plasmavirtualdesktop_interface.h - plasmawindowmanagement_interface.h - pointer_interface.h - pointerconstraints_v1_interface.h - pointergestures_v1_interface.h - primaryselectiondevice_v1_interface.h - primaryselectiondevicemanager_v1_interface.h - primaryselectionoffer_v1_interface.h - primaryselectionsource_v1_interface.h - relativepointer_v1_interface.h - screencast_v1_interface.h - screenedge_v1_interface.h - seat_interface.h - server_decoration_interface.h - server_decoration_palette_interface.h - shadow_interface.h - slide_interface.h - subcompositor_interface.h - surface_interface.h - tablet_v2_interface.h - tearingcontrol_v1_interface.h - textinput_v1_interface.h - textinput_v2_interface.h - textinput_v3_interface.h - touch_interface.h - viewporter_interface.h - xdgactivation_v1_interface.h - xdgdecoration_v1_interface.h - xdgforeign_v2_interface.h - xdgoutput_v1_interface.h - xdgshell_interface.h - xwaylandkeyboardgrab_v1_interface.h - xwaylandshell_v1_interface.h + appmenu.h + blur.h + compositor.h + contenttype_v1.h + contrast.h + cursorshape_v1.h + datacontroldevice_v1.h + datacontroldevicemanager_v1.h + datacontroloffer_v1.h + datacontrolsource_v1.h + datadevice.h + datadevicemanager.h + dataoffer.h + datasource.h + dpms.h + drmlease_v1.h + fakeinput.h + fractionalscale_v1.h + idle.h + idleinhibit_v1.h + idlenotify_v1.h + inputmethod_v1.h + keyboard.h + keyboard_shortcuts_inhibit_v1.h + keystate.h + layershell_v1.h + lockscreen_overlay_v1.h + output.h + output_order_v1.h + outputdevice_v2.h + outputmanagement_v2.h + plasmashell.h + plasmavirtualdesktop.h + plasmawindowmanagement.h + pointer.h + pointerconstraints_v1.h + pointergestures_v1.h + primaryselectiondevice_v1.h + primaryselectiondevicemanager_v1.h + primaryselectionoffer_v1.h + primaryselectionsource_v1.h + relativepointer_v1.h + screencast_v1.h + screenedge_v1.h + seat.h + server_decoration.h + server_decoration_palette.h + shadow.h + slide.h + subcompositor.h + surface.h + tablet_v2.h + tearingcontrol_v1.h + textinput_v1.h + textinput_v2.h + textinput_v3.h + touch.h + viewporter.h + xdgactivation_v1.h + xdgdecoration_v1.h + xdgforeign_v2.h + xdgoutput_v1.h + xdgshell.h + xwaylandkeyboardgrab_v1.h + xwaylandshell_v1.h DESTINATION ${KDE_INSTALL_INCLUDEDIR}/kwin/wayland COMPONENT Devel) diff --git a/src/wayland/abstract_data_source.h b/src/wayland/abstract_data_source.h index e077b91ef4..4a42807157 100644 --- a/src/wayland/abstract_data_source.h +++ b/src/wayland/abstract_data_source.h @@ -9,7 +9,7 @@ #include "kwin_export.h" #include "clientconnection.h" -#include "datadevicemanager_interface.h" +#include "datadevicemanager.h" struct wl_client; diff --git a/src/wayland/appmenu_interface.cpp b/src/wayland/appmenu.cpp similarity index 98% rename from src/wayland/appmenu_interface.cpp rename to src/wayland/appmenu.cpp index f01787e27a..63ed44902f 100644 --- a/src/wayland/appmenu_interface.cpp +++ b/src/wayland/appmenu.cpp @@ -3,9 +3,9 @@ SPDX-License-Identifier: LGPL-2.1-only OR LGPL-3.0-only OR LicenseRef-KDE-Accepted-LGPL */ -#include "appmenu_interface.h" +#include "appmenu.h" #include "display.h" -#include "surface_interface.h" +#include "surface.h" #include #include diff --git a/src/wayland/appmenu_interface.h b/src/wayland/appmenu.h similarity index 100% rename from src/wayland/appmenu_interface.h rename to src/wayland/appmenu.h diff --git a/src/wayland/autotests/client/test_datadevice.cpp b/src/wayland/autotests/client/test_datadevice.cpp index 0b0dd29415..84018e71fa 100644 --- a/src/wayland/autotests/client/test_datadevice.cpp +++ b/src/wayland/autotests/client/test_datadevice.cpp @@ -8,13 +8,13 @@ #include #include -#include "wayland/compositor_interface.h" -#include "wayland/datadevicemanager_interface.h" -#include "wayland/datasource_interface.h" +#include "wayland/compositor.h" +#include "wayland/datadevicemanager.h" +#include "wayland/datasource.h" #include "wayland/display.h" -#include "wayland/pointer_interface.h" -#include "wayland/seat_interface.h" -#include "wayland/surface_interface.h" +#include "wayland/pointer.h" +#include "wayland/seat.h" +#include "wayland/surface.h" // KWayland #include "KWayland/Client/compositor.h" diff --git a/src/wayland/autotests/client/test_datasource.cpp b/src/wayland/autotests/client/test_datasource.cpp index 77ed29ecdf..54d48c1d80 100644 --- a/src/wayland/autotests/client/test_datasource.cpp +++ b/src/wayland/autotests/client/test_datasource.cpp @@ -9,8 +9,8 @@ #include #include -#include "wayland/datadevicemanager_interface.h" -#include "wayland/datasource_interface.h" +#include "wayland/datadevicemanager.h" +#include "wayland/datasource.h" #include "wayland/display.h" // KWayland diff --git a/src/wayland/autotests/client/test_drag_drop.cpp b/src/wayland/autotests/client/test_drag_drop.cpp index d9a99d7664..c2871fdde4 100644 --- a/src/wayland/autotests/client/test_drag_drop.cpp +++ b/src/wayland/autotests/client/test_drag_drop.cpp @@ -8,12 +8,12 @@ #include #include // KWin -#include "wayland/compositor_interface.h" -#include "wayland/datadevicemanager_interface.h" -#include "wayland/datasource_interface.h" +#include "wayland/compositor.h" +#include "wayland/datadevicemanager.h" +#include "wayland/datasource.h" #include "wayland/display.h" -#include "wayland/seat_interface.h" -#include "wayland/seat_interface_p.h" +#include "wayland/seat.h" +#include "wayland/seat_p.h" #include "KWayland/Client/compositor.h" #include "KWayland/Client/connection_thread.h" diff --git a/src/wayland/autotests/client/test_error.cpp b/src/wayland/autotests/client/test_error.cpp index 654929f96b..9ef1111fcb 100644 --- a/src/wayland/autotests/client/test_error.cpp +++ b/src/wayland/autotests/client/test_error.cpp @@ -8,9 +8,9 @@ #include // server -#include "wayland/compositor_interface.h" +#include "wayland/compositor.h" #include "wayland/display.h" -#include "wayland/plasmashell_interface.h" +#include "wayland/plasmashell.h" // client #include "KWayland/Client/compositor.h" diff --git a/src/wayland/autotests/client/test_fake_input.cpp b/src/wayland/autotests/client/test_fake_input.cpp index 6e0707066b..87101ec0e9 100644 --- a/src/wayland/autotests/client/test_fake_input.cpp +++ b/src/wayland/autotests/client/test_fake_input.cpp @@ -13,7 +13,7 @@ #include "KWayland/Client/registry.h" // server #include "wayland/display.h" -#include "wayland/fakeinput_interface.h" +#include "wayland/fakeinput.h" #include diff --git a/src/wayland/autotests/client/test_plasma_activities.cpp b/src/wayland/autotests/client/test_plasma_activities.cpp index ef64e069e5..526ee9c1ab 100644 --- a/src/wayland/autotests/client/test_plasma_activities.cpp +++ b/src/wayland/autotests/client/test_plasma_activities.cpp @@ -7,9 +7,9 @@ #include #include // KWin -#include "wayland/compositor_interface.h" +#include "wayland/compositor.h" #include "wayland/display.h" -#include "wayland/plasmawindowmanagement_interface.h" +#include "wayland/plasmawindowmanagement.h" #include "KWayland/Client/compositor.h" #include "KWayland/Client/connection_thread.h" diff --git a/src/wayland/autotests/client/test_plasma_virtual_desktop.cpp b/src/wayland/autotests/client/test_plasma_virtual_desktop.cpp index f2991ce807..49c635128a 100644 --- a/src/wayland/autotests/client/test_plasma_virtual_desktop.cpp +++ b/src/wayland/autotests/client/test_plasma_virtual_desktop.cpp @@ -7,10 +7,10 @@ #include #include // KWin -#include "wayland/compositor_interface.h" +#include "wayland/compositor.h" #include "wayland/display.h" -#include "wayland/plasmavirtualdesktop_interface.h" -#include "wayland/plasmawindowmanagement_interface.h" +#include "wayland/plasmavirtualdesktop.h" +#include "wayland/plasmawindowmanagement.h" #include "KWayland/Client/compositor.h" #include "KWayland/Client/connection_thread.h" diff --git a/src/wayland/autotests/client/test_plasmashell.cpp b/src/wayland/autotests/client/test_plasmashell.cpp index f83c1a12ca..dbffb546da 100644 --- a/src/wayland/autotests/client/test_plasmashell.cpp +++ b/src/wayland/autotests/client/test_plasmashell.cpp @@ -7,9 +7,9 @@ #include #include // KWayland -#include "wayland/compositor_interface.h" +#include "wayland/compositor.h" #include "wayland/display.h" -#include "wayland/plasmashell_interface.h" +#include "wayland/plasmashell.h" #include "KWayland/Client/compositor.h" #include "KWayland/Client/connection_thread.h" diff --git a/src/wayland/autotests/client/test_pointer_constraints.cpp b/src/wayland/autotests/client/test_pointer_constraints.cpp index aeef4a3e4e..cc9cc0bbf5 100644 --- a/src/wayland/autotests/client/test_pointer_constraints.cpp +++ b/src/wayland/autotests/client/test_pointer_constraints.cpp @@ -17,11 +17,11 @@ #include "KWayland/Client/shm_pool.h" #include "KWayland/Client/surface.h" // server -#include "wayland/compositor_interface.h" +#include "wayland/compositor.h" #include "wayland/display.h" -#include "wayland/pointerconstraints_v1_interface.h" -#include "wayland/seat_interface.h" -#include "wayland/surface_interface.h" +#include "wayland/pointerconstraints_v1.h" +#include "wayland/seat.h" +#include "wayland/surface.h" using namespace KWaylandServer; diff --git a/src/wayland/autotests/client/test_selection.cpp b/src/wayland/autotests/client/test_selection.cpp index 3ca6bebb62..d81dd3850a 100644 --- a/src/wayland/autotests/client/test_selection.cpp +++ b/src/wayland/autotests/client/test_selection.cpp @@ -18,10 +18,10 @@ #include "KWayland/Client/seat.h" #include "KWayland/Client/surface.h" // server -#include "wayland/compositor_interface.h" -#include "wayland/datadevicemanager_interface.h" +#include "wayland/compositor.h" +#include "wayland/datadevicemanager.h" #include "wayland/display.h" -#include "wayland/seat_interface.h" +#include "wayland/seat.h" using namespace KWaylandServer; diff --git a/src/wayland/autotests/client/test_server_side_decoration.cpp b/src/wayland/autotests/client/test_server_side_decoration.cpp index f92ba83f58..5fafe55333 100644 --- a/src/wayland/autotests/client/test_server_side_decoration.cpp +++ b/src/wayland/autotests/client/test_server_side_decoration.cpp @@ -7,9 +7,9 @@ #include #include // KWin -#include "wayland/compositor_interface.h" +#include "wayland/compositor.h" #include "wayland/display.h" -#include "wayland/server_decoration_interface.h" +#include "wayland/server_decoration.h" #include "KWayland/Client/compositor.h" #include "KWayland/Client/connection_thread.h" diff --git a/src/wayland/autotests/client/test_server_side_decoration_palette.cpp b/src/wayland/autotests/client/test_server_side_decoration_palette.cpp index 824e8693b3..1065324e60 100644 --- a/src/wayland/autotests/client/test_server_side_decoration_palette.cpp +++ b/src/wayland/autotests/client/test_server_side_decoration_palette.cpp @@ -8,9 +8,9 @@ #include #include // KWin -#include "wayland/compositor_interface.h" +#include "wayland/compositor.h" #include "wayland/display.h" -#include "wayland/server_decoration_palette_interface.h" +#include "wayland/server_decoration_palette.h" #include "KWayland/Client/compositor.h" #include "KWayland/Client/connection_thread.h" diff --git a/src/wayland/autotests/client/test_shadow.cpp b/src/wayland/autotests/client/test_shadow.cpp index 6c96358a48..da74007349 100644 --- a/src/wayland/autotests/client/test_shadow.cpp +++ b/src/wayland/autotests/client/test_shadow.cpp @@ -16,9 +16,9 @@ #include "KWayland/Client/surface.h" // server #include "core/graphicsbufferview.h" -#include "wayland/compositor_interface.h" +#include "wayland/compositor.h" #include "wayland/display.h" -#include "wayland/shadow_interface.h" +#include "wayland/shadow.h" using namespace KWaylandServer; diff --git a/src/wayland/autotests/client/test_shm_pool.cpp b/src/wayland/autotests/client/test_shm_pool.cpp index 16011c9a89..452d4033cc 100644 --- a/src/wayland/autotests/client/test_shm_pool.cpp +++ b/src/wayland/autotests/client/test_shm_pool.cpp @@ -8,9 +8,9 @@ #include #include // KWin -#include "wayland/compositor_interface.h" +#include "wayland/compositor.h" #include "wayland/display.h" -#include "wayland/surface_interface.h" +#include "wayland/surface.h" #include "KWayland/Client/compositor.h" #include "KWayland/Client/connection_thread.h" diff --git a/src/wayland/autotests/client/test_text_input_v2.cpp b/src/wayland/autotests/client/test_text_input_v2.cpp index 0dac76342b..1d33bd2360 100644 --- a/src/wayland/autotests/client/test_text_input_v2.cpp +++ b/src/wayland/autotests/client/test_text_input_v2.cpp @@ -16,11 +16,11 @@ #include "KWayland/Client/surface.h" #include "KWayland/Client/textinput.h" // server -#include "wayland/compositor_interface.h" +#include "wayland/compositor.h" #include "wayland/display.h" -#include "wayland/seat_interface.h" +#include "wayland/seat.h" #include "wayland/textinput.h" -#include "wayland/textinput_v2_interface.h" +#include "wayland/textinput_v2.h" using namespace KWaylandServer; using namespace std::literals; diff --git a/src/wayland/autotests/client/test_wayland_appmenu.cpp b/src/wayland/autotests/client/test_wayland_appmenu.cpp index 13495f0d97..5e8f16b29b 100644 --- a/src/wayland/autotests/client/test_wayland_appmenu.cpp +++ b/src/wayland/autotests/client/test_wayland_appmenu.cpp @@ -8,8 +8,8 @@ #include #include // KWin -#include "wayland/appmenu_interface.h" -#include "wayland/compositor_interface.h" +#include "wayland/appmenu.h" +#include "wayland/compositor.h" #include "wayland/display.h" #include "KWayland/Client/appmenu.h" diff --git a/src/wayland/autotests/client/test_wayland_blur.cpp b/src/wayland/autotests/client/test_wayland_blur.cpp index 8865c41a00..c18b28bdb0 100644 --- a/src/wayland/autotests/client/test_wayland_blur.cpp +++ b/src/wayland/autotests/client/test_wayland_blur.cpp @@ -7,8 +7,8 @@ #include #include // KWin -#include "wayland/blur_interface.h" -#include "wayland/compositor_interface.h" +#include "wayland/blur.h" +#include "wayland/compositor.h" #include "wayland/display.h" #include "KWayland/Client/blur.h" diff --git a/src/wayland/autotests/client/test_wayland_contrast.cpp b/src/wayland/autotests/client/test_wayland_contrast.cpp index 3661466e6b..d9ae7a84af 100644 --- a/src/wayland/autotests/client/test_wayland_contrast.cpp +++ b/src/wayland/autotests/client/test_wayland_contrast.cpp @@ -8,8 +8,8 @@ #include #include // KWin -#include "wayland/compositor_interface.h" -#include "wayland/contrast_interface.h" +#include "wayland/compositor.h" +#include "wayland/contrast.h" #include "wayland/display.h" #include "KWayland/Client/compositor.h" diff --git a/src/wayland/autotests/client/test_wayland_filter.cpp b/src/wayland/autotests/client/test_wayland_filter.cpp index c378f0a3aa..0b1f1e2ae2 100644 --- a/src/wayland/autotests/client/test_wayland_filter.cpp +++ b/src/wayland/autotests/client/test_wayland_filter.cpp @@ -7,8 +7,8 @@ #include #include // KWin -#include "wayland/blur_interface.h" -#include "wayland/compositor_interface.h" +#include "wayland/blur.h" +#include "wayland/compositor.h" #include "wayland/display.h" #include "wayland/filtered_display.h" diff --git a/src/wayland/autotests/client/test_wayland_output.cpp b/src/wayland/autotests/client/test_wayland_output.cpp index 14e95f7830..1a22d77013 100644 --- a/src/wayland/autotests/client/test_wayland_output.cpp +++ b/src/wayland/autotests/client/test_wayland_output.cpp @@ -8,7 +8,7 @@ #include // KWin #include "wayland/display.h" -#include "wayland/output_interface.h" +#include "wayland/output.h" #include "KWayland/Client/connection_thread.h" #include "KWayland/Client/event_queue.h" diff --git a/src/wayland/autotests/client/test_wayland_seat.cpp b/src/wayland/autotests/client/test_wayland_seat.cpp index a2aaa845ba..d4c3766506 100644 --- a/src/wayland/autotests/client/test_wayland_seat.cpp +++ b/src/wayland/autotests/client/test_wayland_seat.cpp @@ -8,17 +8,17 @@ #include #include // KWin -#include "wayland/compositor_interface.h" -#include "wayland/datadevicemanager_interface.h" -#include "wayland/datasource_interface.h" +#include "wayland/compositor.h" +#include "wayland/datadevicemanager.h" +#include "wayland/datasource.h" #include "wayland/display.h" -#include "wayland/keyboard_interface.h" -#include "wayland/pointer_interface.h" -#include "wayland/pointergestures_v1_interface.h" -#include "wayland/relativepointer_v1_interface.h" -#include "wayland/seat_interface.h" -#include "wayland/subcompositor_interface.h" -#include "wayland/surface_interface.h" +#include "wayland/keyboard.h" +#include "wayland/pointer.h" +#include "wayland/pointergestures_v1.h" +#include "wayland/relativepointer_v1.h" +#include "wayland/seat.h" +#include "wayland/subcompositor.h" +#include "wayland/surface.h" #include "KWayland/Client/compositor.h" #include "KWayland/Client/connection_thread.h" diff --git a/src/wayland/autotests/client/test_wayland_slide.cpp b/src/wayland/autotests/client/test_wayland_slide.cpp index 293b2d68f8..44345590b6 100644 --- a/src/wayland/autotests/client/test_wayland_slide.cpp +++ b/src/wayland/autotests/client/test_wayland_slide.cpp @@ -7,9 +7,9 @@ #include #include // KWin -#include "wayland/compositor_interface.h" +#include "wayland/compositor.h" #include "wayland/display.h" -#include "wayland/slide_interface.h" +#include "wayland/slide.h" #include "KWayland/Client/compositor.h" #include "KWayland/Client/connection_thread.h" diff --git a/src/wayland/autotests/client/test_wayland_subsurface.cpp b/src/wayland/autotests/client/test_wayland_subsurface.cpp index 73e0a18058..8e727a4f67 100644 --- a/src/wayland/autotests/client/test_wayland_subsurface.cpp +++ b/src/wayland/autotests/client/test_wayland_subsurface.cpp @@ -7,10 +7,10 @@ #include #include // KWin -#include "wayland/compositor_interface.h" +#include "wayland/compositor.h" #include "wayland/display.h" -#include "wayland/subcompositor_interface.h" -#include "wayland/surface_interface.h" +#include "wayland/subcompositor.h" +#include "wayland/surface.h" #include "KWayland/Client/compositor.h" #include "KWayland/Client/connection_thread.h" diff --git a/src/wayland/autotests/client/test_wayland_surface.cpp b/src/wayland/autotests/client/test_wayland_surface.cpp index 35e9af41ee..bd2a33305b 100644 --- a/src/wayland/autotests/client/test_wayland_surface.cpp +++ b/src/wayland/autotests/client/test_wayland_surface.cpp @@ -11,11 +11,11 @@ // KWin #include "core/graphicsbuffer.h" #include "core/graphicsbufferview.h" -#include "wayland/compositor_interface.h" +#include "wayland/compositor.h" #include "wayland/display.h" -#include "wayland/idleinhibit_v1_interface.h" -#include "wayland/output_interface.h" -#include "wayland/surface_interface.h" +#include "wayland/idleinhibit_v1.h" +#include "wayland/output.h" +#include "wayland/surface.h" #include "KWayland/Client/compositor.h" #include "KWayland/Client/connection_thread.h" diff --git a/src/wayland/autotests/client/test_wayland_windowmanagement.cpp b/src/wayland/autotests/client/test_wayland_windowmanagement.cpp index 6a308d05d6..6d75c83597 100644 --- a/src/wayland/autotests/client/test_wayland_windowmanagement.cpp +++ b/src/wayland/autotests/client/test_wayland_windowmanagement.cpp @@ -7,10 +7,10 @@ #include #include // KWin -#include "wayland/compositor_interface.h" +#include "wayland/compositor.h" #include "wayland/display.h" -#include "wayland/plasmawindowmanagement_interface.h" -#include "wayland/surface_interface.h" +#include "wayland/plasmawindowmanagement.h" +#include "wayland/surface.h" #include #include "KWayland/Client/compositor.h" diff --git a/src/wayland/autotests/client/test_xdg_decoration.cpp b/src/wayland/autotests/client/test_xdg_decoration.cpp index 37d1976006..a99cb107d5 100644 --- a/src/wayland/autotests/client/test_xdg_decoration.cpp +++ b/src/wayland/autotests/client/test_xdg_decoration.cpp @@ -7,10 +7,10 @@ #include #include // KWin -#include "wayland/compositor_interface.h" +#include "wayland/compositor.h" #include "wayland/display.h" -#include "wayland/xdgdecoration_v1_interface.h" -#include "wayland/xdgshell_interface.h" +#include "wayland/xdgdecoration_v1.h" +#include "wayland/xdgshell.h" #include "KWayland/Client/compositor.h" #include "KWayland/Client/connection_thread.h" diff --git a/src/wayland/autotests/client/test_xdg_foreign.cpp b/src/wayland/autotests/client/test_xdg_foreign.cpp index 38dfb15f9c..aade23c16e 100644 --- a/src/wayland/autotests/client/test_xdg_foreign.cpp +++ b/src/wayland/autotests/client/test_xdg_foreign.cpp @@ -8,10 +8,10 @@ #include #include // KWin -#include "wayland/compositor_interface.h" +#include "wayland/compositor.h" #include "wayland/display.h" -#include "wayland/surface_interface.h" -#include "wayland/xdgforeign_v2_interface.h" +#include "wayland/surface.h" +#include "wayland/xdgforeign_v2.h" #include "KWayland/Client/compositor.h" #include "KWayland/Client/connection_thread.h" diff --git a/src/wayland/autotests/client/test_xdg_output.cpp b/src/wayland/autotests/client/test_xdg_output.cpp index 230d2a5cb3..b11626704a 100644 --- a/src/wayland/autotests/client/test_xdg_output.cpp +++ b/src/wayland/autotests/client/test_xdg_output.cpp @@ -8,8 +8,8 @@ #include // KWin #include "wayland/display.h" -#include "wayland/output_interface.h" -#include "wayland/xdgoutput_v1_interface.h" +#include "wayland/output.h" +#include "wayland/xdgoutput_v1.h" #include "KWayland/Client/connection_thread.h" #include "KWayland/Client/event_queue.h" diff --git a/src/wayland/autotests/client/test_xdg_shell.cpp b/src/wayland/autotests/client/test_xdg_shell.cpp index 5f930b3ec7..559cc0a875 100644 --- a/src/wayland/autotests/client/test_xdg_shell.cpp +++ b/src/wayland/autotests/client/test_xdg_shell.cpp @@ -19,12 +19,12 @@ #include "KWayland/Client/surface.h" #include "KWayland/Client/xdgshell.h" // server -#include "wayland/compositor_interface.h" +#include "wayland/compositor.h" #include "wayland/display.h" -#include "wayland/output_interface.h" -#include "wayland/seat_interface.h" -#include "wayland/surface_interface.h" -#include "wayland/xdgshell_interface.h" +#include "wayland/output.h" +#include "wayland/seat.h" +#include "wayland/surface.h" +#include "wayland/xdgshell.h" #include "../../tests/fakeoutput.h" diff --git a/src/wayland/autotests/server/test_datacontrol_interface.cpp b/src/wayland/autotests/server/test_datacontrol_interface.cpp index dff519c9a3..bb7d1046b6 100644 --- a/src/wayland/autotests/server/test_datacontrol_interface.cpp +++ b/src/wayland/autotests/server/test_datacontrol_interface.cpp @@ -12,12 +12,12 @@ #include // WaylandServer -#include "wayland/compositor_interface.h" -#include "wayland/datacontroldevice_v1_interface.h" -#include "wayland/datacontroldevicemanager_v1_interface.h" -#include "wayland/datacontrolsource_v1_interface.h" +#include "wayland/compositor.h" +#include "wayland/datacontroldevice_v1.h" +#include "wayland/datacontroldevicemanager_v1.h" +#include "wayland/datacontrolsource_v1.h" #include "wayland/display.h" -#include "wayland/seat_interface.h" +#include "wayland/seat.h" #include #include diff --git a/src/wayland/autotests/server/test_inputmethod_interface.cpp b/src/wayland/autotests/server/test_inputmethod_interface.cpp index 19935ac796..73b577a4c3 100644 --- a/src/wayland/autotests/server/test_inputmethod_interface.cpp +++ b/src/wayland/autotests/server/test_inputmethod_interface.cpp @@ -13,11 +13,11 @@ #include "../../tests/fakeoutput.h" // WaylandServer -#include "wayland/compositor_interface.h" +#include "wayland/compositor.h" #include "wayland/display.h" -#include "wayland/inputmethod_v1_interface.h" -#include "wayland/output_interface.h" -#include "wayland/seat_interface.h" +#include "wayland/inputmethod_v1.h" +#include "wayland/output.h" +#include "wayland/seat.h" #include "KWayland/Client/compositor.h" #include "KWayland/Client/connection_thread.h" diff --git a/src/wayland/autotests/server/test_keyboard_shortcuts_inhibitor_interface.cpp b/src/wayland/autotests/server/test_keyboard_shortcuts_inhibitor_interface.cpp index 0a40bf9e14..c1834ff02e 100644 --- a/src/wayland/autotests/server/test_keyboard_shortcuts_inhibitor_interface.cpp +++ b/src/wayland/autotests/server/test_keyboard_shortcuts_inhibitor_interface.cpp @@ -10,10 +10,10 @@ #include #include // WaylandServer -#include "wayland/compositor_interface.h" +#include "wayland/compositor.h" #include "wayland/display.h" -#include "wayland/keyboard_shortcuts_inhibit_v1_interface.h" -#include "wayland/seat_interface.h" +#include "wayland/keyboard_shortcuts_inhibit_v1.h" +#include "wayland/seat.h" #include "KWayland/Client/compositor.h" #include "KWayland/Client/connection_thread.h" diff --git a/src/wayland/autotests/server/test_layershellv1_interface.cpp b/src/wayland/autotests/server/test_layershellv1_interface.cpp index fd612a03d4..02d04d72a4 100644 --- a/src/wayland/autotests/server/test_layershellv1_interface.cpp +++ b/src/wayland/autotests/server/test_layershellv1_interface.cpp @@ -8,11 +8,11 @@ #include #include -#include "wayland/compositor_interface.h" +#include "wayland/compositor.h" #include "wayland/display.h" -#include "wayland/layershell_v1_interface.h" -#include "wayland/surface_interface.h" -#include "wayland/xdgshell_interface.h" +#include "wayland/layershell_v1.h" +#include "wayland/surface.h" +#include "wayland/xdgshell.h" #include "KWayland/Client/compositor.h" #include "KWayland/Client/connection_thread.h" diff --git a/src/wayland/autotests/server/test_screencast.cpp b/src/wayland/autotests/server/test_screencast.cpp index 2bbcd453da..a844aac823 100644 --- a/src/wayland/autotests/server/test_screencast.cpp +++ b/src/wayland/autotests/server/test_screencast.cpp @@ -13,10 +13,10 @@ #include // WaylandServer -#include "wayland/compositor_interface.h" +#include "wayland/compositor.h" #include "wayland/display.h" -#include "wayland/screencast_v1_interface.h" -#include "wayland/seat_interface.h" +#include "wayland/screencast_v1.h" +#include "wayland/seat.h" #include #include diff --git a/src/wayland/autotests/server/test_seat.cpp b/src/wayland/autotests/server/test_seat.cpp index 7a34386f70..fe928fd1a9 100644 --- a/src/wayland/autotests/server/test_seat.cpp +++ b/src/wayland/autotests/server/test_seat.cpp @@ -8,9 +8,9 @@ #include // WaylandServer #include "wayland/display.h" -#include "wayland/keyboard_interface.h" -#include "wayland/pointer_interface.h" -#include "wayland/seat_interface.h" +#include "wayland/keyboard.h" +#include "wayland/pointer.h" +#include "wayland/seat.h" using namespace KWaylandServer; diff --git a/src/wayland/autotests/server/test_tablet_interface.cpp b/src/wayland/autotests/server/test_tablet_interface.cpp index 4695a4f11f..538b30e600 100644 --- a/src/wayland/autotests/server/test_tablet_interface.cpp +++ b/src/wayland/autotests/server/test_tablet_interface.cpp @@ -9,10 +9,10 @@ #include #include // WaylandServer -#include "wayland/compositor_interface.h" +#include "wayland/compositor.h" #include "wayland/display.h" -#include "wayland/seat_interface.h" -#include "wayland/tablet_v2_interface.h" +#include "wayland/seat.h" +#include "wayland/tablet_v2.h" #include "KWayland/Client/compositor.h" #include "KWayland/Client/connection_thread.h" diff --git a/src/wayland/autotests/server/test_textinputv1_interface.cpp b/src/wayland/autotests/server/test_textinputv1_interface.cpp index a61280cebb..1e96799de1 100644 --- a/src/wayland/autotests/server/test_textinputv1_interface.cpp +++ b/src/wayland/autotests/server/test_textinputv1_interface.cpp @@ -8,11 +8,11 @@ #include #include -#include "wayland/compositor_interface.h" +#include "wayland/compositor.h" #include "wayland/display.h" -#include "wayland/seat_interface.h" -#include "wayland/surface_interface.h" -#include "wayland/textinput_v1_interface.h" +#include "wayland/seat.h" +#include "wayland/surface.h" +#include "wayland/textinput_v1.h" #include "KWayland/Client/compositor.h" #include "KWayland/Client/connection_thread.h" diff --git a/src/wayland/autotests/server/test_textinputv3_interface.cpp b/src/wayland/autotests/server/test_textinputv3_interface.cpp index daa6cc7e5f..3139bb4911 100644 --- a/src/wayland/autotests/server/test_textinputv3_interface.cpp +++ b/src/wayland/autotests/server/test_textinputv3_interface.cpp @@ -8,11 +8,11 @@ #include #include -#include "wayland/compositor_interface.h" +#include "wayland/compositor.h" #include "wayland/display.h" -#include "wayland/seat_interface.h" -#include "wayland/surface_interface.h" -#include "wayland/textinput_v3_interface.h" +#include "wayland/seat.h" +#include "wayland/surface.h" +#include "wayland/textinput_v3.h" #include "KWayland/Client/compositor.h" #include "KWayland/Client/connection_thread.h" diff --git a/src/wayland/autotests/server/test_viewporter_interface.cpp b/src/wayland/autotests/server/test_viewporter_interface.cpp index 8fd10c1fdb..8dd9df9ff2 100644 --- a/src/wayland/autotests/server/test_viewporter_interface.cpp +++ b/src/wayland/autotests/server/test_viewporter_interface.cpp @@ -8,10 +8,10 @@ #include #include -#include "wayland/compositor_interface.h" +#include "wayland/compositor.h" #include "wayland/display.h" -#include "wayland/surface_interface.h" -#include "wayland/viewporter_interface.h" +#include "wayland/surface.h" +#include "wayland/viewporter.h" #include "KWayland/Client/compositor.h" #include "KWayland/Client/connection_thread.h" diff --git a/src/wayland/blur_interface.cpp b/src/wayland/blur.cpp similarity index 96% rename from src/wayland/blur_interface.cpp rename to src/wayland/blur.cpp index 2b9994d5c0..c0bc7dd336 100644 --- a/src/wayland/blur_interface.cpp +++ b/src/wayland/blur.cpp @@ -5,10 +5,10 @@ SPDX-License-Identifier: LGPL-2.1-only OR LGPL-3.0-only OR LicenseRef-KDE-Accepted-LGPL */ -#include "blur_interface.h" +#include "blur.h" #include "display.h" -#include "region_interface_p.h" -#include "surface_interface_p.h" +#include "region_p.h" +#include "surface_p.h" #include "qwayland-server-blur.h" @@ -144,4 +144,4 @@ QRegion BlurInterface::region() } -#include "moc_blur_interface.cpp" +#include "moc_blur.cpp" diff --git a/src/wayland/blur_interface.h b/src/wayland/blur.h similarity index 100% rename from src/wayland/blur_interface.h rename to src/wayland/blur.h diff --git a/src/wayland/compositor_interface.cpp b/src/wayland/compositor.cpp similarity index 93% rename from src/wayland/compositor_interface.cpp rename to src/wayland/compositor.cpp index ad9f8d3f10..92812c61d5 100644 --- a/src/wayland/compositor_interface.cpp +++ b/src/wayland/compositor.cpp @@ -4,10 +4,10 @@ SPDX-License-Identifier: LGPL-2.1-only OR LGPL-3.0-only OR LicenseRef-KDE-Accepted-LGPL */ -#include "compositor_interface.h" +#include "compositor.h" #include "display.h" -#include "region_interface_p.h" -#include "surface_interface.h" +#include "region_p.h" +#include "surface.h" #include "qwayland-server-wayland.h" @@ -72,4 +72,4 @@ Display *CompositorInterface::display() const } // namespace KWaylandServer -#include "moc_compositor_interface.cpp" +#include "wayland/moc_compositor.cpp" diff --git a/src/wayland/compositor_interface.h b/src/wayland/compositor.h similarity index 97% rename from src/wayland/compositor_interface.h rename to src/wayland/compositor.h index c33553a2ba..5f70d3ae79 100644 --- a/src/wayland/compositor_interface.h +++ b/src/wayland/compositor.h @@ -8,7 +8,7 @@ #include "kwin_export.h" -#include "surface_interface.h" +#include "surface.h" #include diff --git a/src/wayland/contenttype_v1_interface.cpp b/src/wayland/contenttype_v1.cpp similarity index 95% rename from src/wayland/contenttype_v1_interface.cpp rename to src/wayland/contenttype_v1.cpp index 6ef7fbff7f..f8a9d47ec3 100644 --- a/src/wayland/contenttype_v1_interface.cpp +++ b/src/wayland/contenttype_v1.cpp @@ -3,10 +3,10 @@ SPDX-License-Identifier: LGPL-2.1-only OR LGPL-3.0-only OR LicenseRef-KDE-Accepted-LGPL */ -#include "contenttype_v1_interface.h" +#include "contenttype_v1.h" #include "display.h" -#include "surface_interface_p.h" +#include "surface_p.h" namespace KWaylandServer { @@ -83,4 +83,4 @@ void ContentTypeV1Interface::wp_content_type_v1_destroy_resource(Resource *) } -#include "moc_contenttype_v1_interface.cpp" +#include "moc_contenttype_v1.cpp" diff --git a/src/wayland/contenttype_v1_interface.h b/src/wayland/contenttype_v1.h similarity index 97% rename from src/wayland/contenttype_v1_interface.h rename to src/wayland/contenttype_v1.h index 6b8d66148d..e5cf3627ab 100644 --- a/src/wayland/contenttype_v1_interface.h +++ b/src/wayland/contenttype_v1.h @@ -5,7 +5,7 @@ */ #pragma once -#include "surface_interface.h" +#include "surface.h" #include "qwayland-server-content-type-v1.h" diff --git a/src/wayland/contrast_interface.cpp b/src/wayland/contrast.cpp similarity index 97% rename from src/wayland/contrast_interface.cpp rename to src/wayland/contrast.cpp index a721c0874d..b80cc9342f 100644 --- a/src/wayland/contrast_interface.cpp +++ b/src/wayland/contrast.cpp @@ -4,10 +4,10 @@ SPDX-License-Identifier: LGPL-2.1-only OR LGPL-3.0-only OR LicenseRef-KDE-Accepted-LGPL */ -#include "contrast_interface.h" +#include "contrast.h" #include "display.h" -#include "region_interface_p.h" -#include "surface_interface_p.h" +#include "region_p.h" +#include "surface_p.h" #include @@ -207,4 +207,4 @@ QColor ContrastInterface::frost() const } -#include "moc_contrast_interface.cpp" +#include "moc_contrast.cpp" diff --git a/src/wayland/contrast_interface.h b/src/wayland/contrast.h similarity index 100% rename from src/wayland/contrast_interface.h rename to src/wayland/contrast.h diff --git a/src/wayland/cursorshape_v1_interface.cpp b/src/wayland/cursorshape_v1.cpp similarity index 98% rename from src/wayland/cursorshape_v1_interface.cpp rename to src/wayland/cursorshape_v1.cpp index bc374f65a6..cc986d7c53 100644 --- a/src/wayland/cursorshape_v1_interface.cpp +++ b/src/wayland/cursorshape_v1.cpp @@ -4,11 +4,11 @@ SPDX-License-Identifier: LGPL-2.1-only OR LGPL-3.0-only OR LicenseRef-KDE-Accepted-LGPL */ -#include "wayland/cursorshape_v1_interface.h" +#include "wayland/cursorshape_v1.h" #include "wayland/display.h" -#include "wayland/pointer_interface.h" -#include "wayland/surface_interface.h" -#include "wayland/tablet_v2_interface.h" +#include "wayland/pointer.h" +#include "wayland/surface.h" +#include "wayland/tablet_v2.h" #include diff --git a/src/wayland/cursorshape_v1_interface.h b/src/wayland/cursorshape_v1.h similarity index 100% rename from src/wayland/cursorshape_v1_interface.h rename to src/wayland/cursorshape_v1.h diff --git a/src/wayland/datacontroldevice_v1_interface.cpp b/src/wayland/datacontroldevice_v1.cpp similarity index 94% rename from src/wayland/datacontroldevice_v1_interface.cpp rename to src/wayland/datacontroldevice_v1.cpp index 2446674862..d6081d739f 100644 --- a/src/wayland/datacontroldevice_v1_interface.cpp +++ b/src/wayland/datacontroldevice_v1.cpp @@ -4,14 +4,14 @@ SPDX-License-Identifier: LGPL-2.1-only OR LGPL-3.0-only OR LicenseRef-KDE-Accepted-LGPL */ -#include "datacontroldevice_v1_interface.h" -#include "datacontroldevicemanager_v1_interface.h" -#include "datacontroloffer_v1_interface.h" -#include "datacontrolsource_v1_interface.h" +#include "datacontroldevice_v1.h" +#include "datacontroldevicemanager_v1.h" +#include "datacontroloffer_v1.h" +#include "datacontrolsource_v1.h" #include "display.h" -#include "seat_interface.h" -#include "seat_interface_p.h" -#include "surface_interface.h" +#include "seat.h" +#include "seat_p.h" +#include "surface.h" // Wayland #include @@ -150,4 +150,4 @@ void DataControlDeviceV1Interface::sendPrimarySelection(KWaylandServer::Abstract } } -#include "moc_datacontroldevice_v1_interface.cpp" +#include "moc_datacontroldevice_v1.cpp" diff --git a/src/wayland/datacontroldevice_v1_interface.h b/src/wayland/datacontroldevice_v1.h similarity index 100% rename from src/wayland/datacontroldevice_v1_interface.h rename to src/wayland/datacontroldevice_v1.h diff --git a/src/wayland/datacontroldevicemanager_v1_interface.cpp b/src/wayland/datacontroldevicemanager_v1.cpp similarity index 92% rename from src/wayland/datacontroldevicemanager_v1_interface.cpp rename to src/wayland/datacontroldevicemanager_v1.cpp index dcee56d678..90cf610baf 100644 --- a/src/wayland/datacontroldevicemanager_v1_interface.cpp +++ b/src/wayland/datacontroldevicemanager_v1.cpp @@ -4,11 +4,11 @@ SPDX-License-Identifier: LGPL-2.1-only OR LGPL-3.0-only OR LicenseRef-KDE-Accepted-LGPL */ -#include "datacontroldevicemanager_v1_interface.h" -#include "datacontroldevice_v1_interface.h" -#include "datacontrolsource_v1_interface.h" +#include "datacontroldevicemanager_v1.h" +#include "datacontroldevice_v1.h" +#include "datacontrolsource_v1.h" #include "display.h" -#include "seat_interface_p.h" +#include "seat_p.h" // Wayland #include @@ -77,4 +77,4 @@ DataControlDeviceManagerV1Interface::~DataControlDeviceManagerV1Interface() = de } -#include "moc_datacontroldevicemanager_v1_interface.cpp" +#include "moc_datacontroldevicemanager_v1.cpp" diff --git a/src/wayland/datacontroldevicemanager_v1_interface.h b/src/wayland/datacontroldevicemanager_v1.h similarity index 100% rename from src/wayland/datacontroldevicemanager_v1_interface.h rename to src/wayland/datacontroldevicemanager_v1.h diff --git a/src/wayland/datacontroloffer_v1_interface.cpp b/src/wayland/datacontroloffer_v1.cpp similarity index 93% rename from src/wayland/datacontroloffer_v1_interface.cpp rename to src/wayland/datacontroloffer_v1.cpp index 97d1b9034c..c056977b85 100644 --- a/src/wayland/datacontroloffer_v1_interface.cpp +++ b/src/wayland/datacontroloffer_v1.cpp @@ -3,9 +3,9 @@ SPDX-License-Identifier: LGPL-2.1-only OR LGPL-3.0-only OR LicenseRef-KDE-Accepted-LGPL */ -#include "datacontroloffer_v1_interface.h" -#include "datacontroldevice_v1_interface.h" -#include "datacontrolsource_v1_interface.h" +#include "datacontroloffer_v1.h" +#include "datacontroldevice_v1.h" +#include "datacontrolsource_v1.h" // Qt #include #include @@ -83,4 +83,4 @@ wl_resource *DataControlOfferV1Interface::resource() const } -#include "moc_datacontroloffer_v1_interface.cpp" +#include "moc_datacontroloffer_v1.cpp" diff --git a/src/wayland/datacontroloffer_v1_interface.h b/src/wayland/datacontroloffer_v1.h similarity index 95% rename from src/wayland/datacontroloffer_v1_interface.h rename to src/wayland/datacontroloffer_v1.h index 69f855abc8..30bcd75957 100644 --- a/src/wayland/datacontroloffer_v1_interface.h +++ b/src/wayland/datacontroloffer_v1.h @@ -9,7 +9,7 @@ #include -#include "datacontroldevicemanager_v1_interface.h" +#include "datacontroldevicemanager_v1.h" struct wl_resource; diff --git a/src/wayland/datacontrolsource_v1_interface.cpp b/src/wayland/datacontrolsource_v1.cpp similarity index 94% rename from src/wayland/datacontrolsource_v1_interface.cpp rename to src/wayland/datacontrolsource_v1.cpp index a17c9365d4..ff8e444a31 100644 --- a/src/wayland/datacontrolsource_v1_interface.cpp +++ b/src/wayland/datacontrolsource_v1.cpp @@ -3,9 +3,9 @@ SPDX-License-Identifier: LGPL-2.1-only OR LGPL-3.0-only OR LicenseRef-KDE-Accepted-LGPL */ -#include "datacontrolsource_v1_interface.h" +#include "datacontrolsource_v1.h" #include "clientconnection.h" -#include "datacontroldevicemanager_v1_interface.h" +#include "datacontroldevicemanager_v1.h" #include "utils.h" // Qt #include @@ -92,4 +92,4 @@ DataControlSourceV1Interface *DataControlSourceV1Interface::get(wl_resource *nat } -#include "moc_datacontrolsource_v1_interface.cpp" +#include "moc_datacontrolsource_v1.cpp" diff --git a/src/wayland/datacontrolsource_v1_interface.h b/src/wayland/datacontrolsource_v1.h similarity index 96% rename from src/wayland/datacontrolsource_v1_interface.h rename to src/wayland/datacontrolsource_v1.h index e9be834bf5..3723672548 100644 --- a/src/wayland/datacontrolsource_v1_interface.h +++ b/src/wayland/datacontrolsource_v1.h @@ -8,7 +8,7 @@ #include "kwin_export.h" #include "abstract_data_source.h" -#include "datacontroldevicemanager_v1_interface.h" +#include "datacontroldevicemanager_v1.h" namespace KWaylandServer { diff --git a/src/wayland/datadevice_interface.cpp b/src/wayland/datadevice.cpp similarity index 97% rename from src/wayland/datadevice_interface.cpp rename to src/wayland/datadevice.cpp index 40bae801f3..0e2bdd6d46 100644 --- a/src/wayland/datadevice_interface.cpp +++ b/src/wayland/datadevice.cpp @@ -6,16 +6,16 @@ SPDX-License-Identifier: LGPL-2.1-only OR LGPL-3.0-only OR LicenseRef-KDE-Accepted-LGPL */ -#include "datadevice_interface.h" -#include "datadevice_interface_p.h" -#include "datadevicemanager_interface.h" -#include "dataoffer_interface.h" -#include "datasource_interface.h" +#include "datadevice.h" +#include "datadevice_p.h" +#include "datadevicemanager.h" +#include "dataoffer.h" +#include "datasource.h" #include "display.h" -#include "pointer_interface.h" -#include "seat_interface.h" -#include "seat_interface_p.h" -#include "surface_interface.h" +#include "pointer.h" +#include "seat.h" +#include "seat_p.h" +#include "surface.h" namespace KWaylandServer { @@ -334,4 +334,4 @@ wl_client *DataDeviceInterface::client() } -#include "moc_datadevice_interface.cpp" +#include "moc_datadevice.cpp" diff --git a/src/wayland/datadevice_interface.h b/src/wayland/datadevice.h similarity index 100% rename from src/wayland/datadevice_interface.h rename to src/wayland/datadevice.h diff --git a/src/wayland/datadevice_interface_p.h b/src/wayland/datadevice_p.h similarity index 100% rename from src/wayland/datadevice_interface_p.h rename to src/wayland/datadevice_p.h diff --git a/src/wayland/datadevicemanager_interface.cpp b/src/wayland/datadevicemanager.cpp similarity index 94% rename from src/wayland/datadevicemanager_interface.cpp rename to src/wayland/datadevicemanager.cpp index 60a88490e7..1906e5925b 100644 --- a/src/wayland/datadevicemanager_interface.cpp +++ b/src/wayland/datadevicemanager.cpp @@ -4,10 +4,10 @@ SPDX-License-Identifier: LGPL-2.1-only OR LGPL-3.0-only OR LicenseRef-KDE-Accepted-LGPL */ -#include "datadevicemanager_interface.h" -#include "datasource_interface.h" +#include "datadevicemanager.h" +#include "datasource.h" #include "display.h" -#include "seat_interface_p.h" +#include "seat_p.h" // Wayland #include @@ -75,4 +75,4 @@ DataDeviceManagerInterface::~DataDeviceManagerInterface() = default; } -#include "moc_datadevicemanager_interface.cpp" +#include "moc_datadevicemanager.cpp" diff --git a/src/wayland/datadevicemanager_interface.h b/src/wayland/datadevicemanager.h similarity index 97% rename from src/wayland/datadevicemanager_interface.h rename to src/wayland/datadevicemanager.h index 6da053e0ab..cba0024e35 100644 --- a/src/wayland/datadevicemanager_interface.h +++ b/src/wayland/datadevicemanager.h @@ -11,7 +11,7 @@ #include #include -#include "datadevice_interface.h" +#include "datadevice.h" namespace KWaylandServer { diff --git a/src/wayland/dataoffer_interface.cpp b/src/wayland/dataoffer.cpp similarity index 98% rename from src/wayland/dataoffer_interface.cpp rename to src/wayland/dataoffer.cpp index df37a40d0f..aa01760943 100644 --- a/src/wayland/dataoffer_interface.cpp +++ b/src/wayland/dataoffer.cpp @@ -4,9 +4,9 @@ SPDX-License-Identifier: LGPL-2.1-only OR LGPL-3.0-only OR LicenseRef-KDE-Accepted-LGPL */ -#include "dataoffer_interface.h" -#include "datadevice_interface.h" -#include "datasource_interface.h" +#include "dataoffer.h" +#include "datadevice.h" +#include "datasource.h" // Qt #include @@ -204,4 +204,4 @@ void DataOfferInterface::dndAction(DataDeviceManagerInterface::DnDAction action) } } -#include "moc_dataoffer_interface.cpp" +#include "moc_dataoffer.cpp" diff --git a/src/wayland/dataoffer_interface.h b/src/wayland/dataoffer.h similarity index 97% rename from src/wayland/dataoffer_interface.h rename to src/wayland/dataoffer.h index d33c151e55..54dd4401d5 100644 --- a/src/wayland/dataoffer_interface.h +++ b/src/wayland/dataoffer.h @@ -10,7 +10,7 @@ #include -#include "datadevicemanager_interface.h" +#include "datadevicemanager.h" #include diff --git a/src/wayland/datasource_interface.cpp b/src/wayland/datasource.cpp similarity index 97% rename from src/wayland/datasource_interface.cpp rename to src/wayland/datasource.cpp index 2c7355b7ca..a30c888144 100644 --- a/src/wayland/datasource_interface.cpp +++ b/src/wayland/datasource.cpp @@ -4,10 +4,10 @@ SPDX-License-Identifier: LGPL-2.1-only OR LGPL-3.0-only OR LicenseRef-KDE-Accepted-LGPL */ -#include "datasource_interface.h" +#include "datasource.h" #include "clientconnection.h" -#include "datadevicemanager_interface.h" -#include "datasource_interface_p.h" +#include "datadevicemanager.h" +#include "datasource_p.h" #include "utils.h" // Qt #include @@ -209,4 +209,4 @@ XdgToplevelDragV1Interface *DataSourceInterface::xdgToplevelDrag() const } -#include "moc_datasource_interface.cpp" +#include "moc_datasource.cpp" diff --git a/src/wayland/datasource_interface.h b/src/wayland/datasource.h similarity index 97% rename from src/wayland/datasource_interface.h rename to src/wayland/datasource.h index 823ebc5854..a449c8f09c 100644 --- a/src/wayland/datasource_interface.h +++ b/src/wayland/datasource.h @@ -9,7 +9,7 @@ #include "kwin_export.h" #include "abstract_data_source.h" -#include "datadevicemanager_interface.h" +#include "datadevicemanager.h" namespace KWaylandServer { diff --git a/src/wayland/datasource_interface_p.h b/src/wayland/datasource_p.h similarity index 97% rename from src/wayland/datasource_interface_p.h rename to src/wayland/datasource_p.h index e4fa701a07..5cdad2c5ff 100644 --- a/src/wayland/datasource_interface_p.h +++ b/src/wayland/datasource_p.h @@ -9,7 +9,7 @@ #include -#include "datadevicemanager_interface.h" +#include "datadevicemanager.h" namespace KWaylandServer { diff --git a/src/wayland/display.cpp b/src/wayland/display.cpp index da9d016cc0..738e9b95d3 100644 --- a/src/wayland/display.cpp +++ b/src/wayland/display.cpp @@ -7,7 +7,7 @@ #include "display.h" #include "display_p.h" #include "linuxdmabufv1clientbuffer_p.h" -#include "output_interface.h" +#include "output.h" #include "shmclientbuffer_p.h" #include "utils/common.h" diff --git a/src/wayland/dpms_interface.cpp b/src/wayland/dpms.cpp similarity index 97% rename from src/wayland/dpms_interface.cpp rename to src/wayland/dpms.cpp index 00cc89c088..2cec63af22 100644 --- a/src/wayland/dpms_interface.cpp +++ b/src/wayland/dpms.cpp @@ -3,9 +3,9 @@ SPDX-License-Identifier: LGPL-2.1-only OR LGPL-3.0-only OR LicenseRef-KDE-Accepted-LGPL */ -#include "dpms_interface.h" +#include "dpms.h" #include "display.h" -#include "output_interface.h" +#include "output.h" #include @@ -174,6 +174,6 @@ void DpmsInterface::sendDone() } -#include "dpms_interface.moc" +#include "dpms.moc" -#include "moc_dpms_interface.cpp" +#include "moc_dpms.cpp" diff --git a/src/wayland/dpms_interface.h b/src/wayland/dpms.h similarity index 100% rename from src/wayland/dpms_interface.h rename to src/wayland/dpms.h diff --git a/src/wayland/drmlease_v1_interface.cpp b/src/wayland/drmlease_v1.cpp similarity index 98% rename from src/wayland/drmlease_v1_interface.cpp rename to src/wayland/drmlease_v1.cpp index 8f81d2507e..80c975a11d 100644 --- a/src/wayland/drmlease_v1_interface.cpp +++ b/src/wayland/drmlease_v1.cpp @@ -3,9 +3,9 @@ SPDX-License-Identifier: LGPL-2.1-only OR LGPL-3.0-only OR LicenseRef-KDE-Accepted-LGPL */ -#include "drmlease_v1_interface.h" +#include "drmlease_v1.h" #include "display.h" -#include "drmlease_v1_interface_p.h" +#include "drmlease_v1_p.h" #include "utils.h" #include "utils/common.h" @@ -447,6 +447,5 @@ QVector DrmLeaseV1Interface::connectors() const } -#include "moc_drmlease_v1_interface.cpp" - -#include "moc_drmlease_v1_interface_p.cpp" +#include "moc_drmlease_v1.cpp" +#include "moc_drmlease_v1_p.cpp" diff --git a/src/wayland/drmlease_v1_interface.h b/src/wayland/drmlease_v1.h similarity index 100% rename from src/wayland/drmlease_v1_interface.h rename to src/wayland/drmlease_v1.h diff --git a/src/wayland/drmlease_v1_interface_p.h b/src/wayland/drmlease_v1_p.h similarity index 100% rename from src/wayland/drmlease_v1_interface_p.h rename to src/wayland/drmlease_v1_p.h diff --git a/src/wayland/fakeinput_interface.cpp b/src/wayland/fakeinput.cpp similarity index 99% rename from src/wayland/fakeinput_interface.cpp rename to src/wayland/fakeinput.cpp index 8874d53fa0..a831299253 100644 --- a/src/wayland/fakeinput_interface.cpp +++ b/src/wayland/fakeinput.cpp @@ -3,7 +3,7 @@ SPDX-License-Identifier: LGPL-2.1-only OR LGPL-3.0-only OR LicenseRef-KDE-Accepted-LGPL */ -#include "fakeinput_interface.h" +#include "fakeinput.h" #include "display.h" #include @@ -263,4 +263,4 @@ bool FakeInputDevice::isAuthenticated() const } -#include "moc_fakeinput_interface.cpp" +#include "moc_fakeinput.cpp" diff --git a/src/wayland/fakeinput_interface.h b/src/wayland/fakeinput.h similarity index 100% rename from src/wayland/fakeinput_interface.h rename to src/wayland/fakeinput.h diff --git a/src/wayland/fractionalscale_v1_interface.cpp b/src/wayland/fractionalscale_v1.cpp similarity index 94% rename from src/wayland/fractionalscale_v1_interface.cpp rename to src/wayland/fractionalscale_v1.cpp index 45da57b9d9..c6beaa13d5 100644 --- a/src/wayland/fractionalscale_v1_interface.cpp +++ b/src/wayland/fractionalscale_v1.cpp @@ -4,11 +4,11 @@ SPDX-License-Identifier: LGPL-2.1-only OR LGPL-3.0-only OR LicenseRef-KDE-Accepted-LGPL */ -#include "fractionalscale_v1_interface.h" +#include "fractionalscale_v1.h" #include "display.h" -#include "fractionalscale_v1_interface_p.h" -#include "surface_interface_p.h" +#include "fractionalscale_v1_p.h" +#include "surface_p.h" #include @@ -95,4 +95,4 @@ FractionalScaleManagerV1Interface::~FractionalScaleManagerV1Interface() } // namespace KWaylandServer -#include "moc_fractionalscale_v1_interface.cpp" +#include "moc_fractionalscale_v1.cpp" diff --git a/src/wayland/fractionalscale_v1_interface.h b/src/wayland/fractionalscale_v1.h similarity index 100% rename from src/wayland/fractionalscale_v1_interface.h rename to src/wayland/fractionalscale_v1.h diff --git a/src/wayland/fractionalscale_v1_interface_p.h b/src/wayland/fractionalscale_v1_p.h similarity index 100% rename from src/wayland/fractionalscale_v1_interface_p.h rename to src/wayland/fractionalscale_v1_p.h diff --git a/src/wayland/idle_interface.cpp b/src/wayland/idle.cpp similarity index 93% rename from src/wayland/idle_interface.cpp rename to src/wayland/idle.cpp index 1e94a23b0d..066238a1ee 100644 --- a/src/wayland/idle_interface.cpp +++ b/src/wayland/idle.cpp @@ -4,8 +4,8 @@ SPDX-License-Identifier: LGPL-2.1-only OR LGPL-3.0-only OR LicenseRef-KDE-Accepted-LGPL */ #include "display.h" -#include "idle_interface_p.h" -#include "seat_interface.h" +#include "idle_p.h" +#include "seat.h" #include "idledetector.h" #include "input.h" @@ -73,6 +73,5 @@ void IdleTimeoutInterface::org_kde_kwin_idle_timeout_simulate_user_activity(Reso } -#include "moc_idle_interface_p.cpp" - -#include "moc_idle_interface.cpp" +#include "moc_idle.cpp" +#include "moc_idle_p.cpp" diff --git a/src/wayland/idle_interface.h b/src/wayland/idle.h similarity index 100% rename from src/wayland/idle_interface.h rename to src/wayland/idle.h diff --git a/src/wayland/idle_interface_p.h b/src/wayland/idle_p.h similarity index 97% rename from src/wayland/idle_interface_p.h rename to src/wayland/idle_p.h index 3a57adb375..d26f1fb4e7 100644 --- a/src/wayland/idle_interface_p.h +++ b/src/wayland/idle_p.h @@ -5,7 +5,7 @@ */ #pragma once -#include "idle_interface.h" +#include "idle.h" #include diff --git a/src/wayland/idleinhibit_v1_interface.cpp b/src/wayland/idleinhibit_v1.cpp similarity index 92% rename from src/wayland/idleinhibit_v1_interface.cpp rename to src/wayland/idleinhibit_v1.cpp index a01b982a8c..13214a5dc1 100644 --- a/src/wayland/idleinhibit_v1_interface.cpp +++ b/src/wayland/idleinhibit_v1.cpp @@ -4,8 +4,8 @@ SPDX-License-Identifier: LGPL-2.1-only OR LGPL-3.0-only OR LicenseRef-KDE-Accepted-LGPL */ #include "display.h" -#include "idleinhibit_v1_interface_p.h" -#include "surface_interface_p.h" +#include "idleinhibit_v1_p.h" +#include "surface_p.h" namespace KWaylandServer { @@ -69,6 +69,5 @@ void IdleInhibitorV1Interface::zwp_idle_inhibitor_v1_destroy_resource(Resource * } -#include "moc_idleinhibit_v1_interface_p.cpp" - -#include "moc_idleinhibit_v1_interface.cpp" +#include "moc_idleinhibit_v1.cpp" +#include "moc_idleinhibit_v1_p.cpp" diff --git a/src/wayland/idleinhibit_v1_interface.h b/src/wayland/idleinhibit_v1.h similarity index 100% rename from src/wayland/idleinhibit_v1_interface.h rename to src/wayland/idleinhibit_v1.h diff --git a/src/wayland/idleinhibit_v1_interface_p.h b/src/wayland/idleinhibit_v1_p.h similarity index 96% rename from src/wayland/idleinhibit_v1_interface_p.h rename to src/wayland/idleinhibit_v1_p.h index 932b9afe7b..ae25719987 100644 --- a/src/wayland/idleinhibit_v1_interface_p.h +++ b/src/wayland/idleinhibit_v1_p.h @@ -5,7 +5,7 @@ */ #pragma once -#include "idleinhibit_v1_interface.h" +#include "idleinhibit_v1.h" #include diff --git a/src/wayland/idlenotify_v1_interface.cpp b/src/wayland/idlenotify_v1.cpp similarity index 95% rename from src/wayland/idlenotify_v1_interface.cpp rename to src/wayland/idlenotify_v1.cpp index 19104033b0..6a01f07f39 100644 --- a/src/wayland/idlenotify_v1_interface.cpp +++ b/src/wayland/idlenotify_v1.cpp @@ -4,7 +4,7 @@ SPDX-License-Identifier: LGPL-2.1-only OR LGPL-3.0-only OR LicenseRef-KDE-Accepted-LGPL */ -#include "idlenotify_v1_interface.h" +#include "idlenotify_v1.h" #include "display.h" #include "idledetector.h" @@ -89,6 +89,6 @@ IdleNotifyV1Interface::~IdleNotifyV1Interface() } -#include "idlenotify_v1_interface.moc" +#include "idlenotify_v1.moc" -#include "moc_idlenotify_v1_interface.cpp" +#include "moc_idlenotify_v1.cpp" diff --git a/src/wayland/idlenotify_v1_interface.h b/src/wayland/idlenotify_v1.h similarity index 100% rename from src/wayland/idlenotify_v1_interface.h rename to src/wayland/idlenotify_v1.h diff --git a/src/wayland/inputmethod_v1_interface.cpp b/src/wayland/inputmethod_v1.cpp similarity index 98% rename from src/wayland/inputmethod_v1_interface.cpp rename to src/wayland/inputmethod_v1.cpp index a158511e1b..1f8156dce5 100644 --- a/src/wayland/inputmethod_v1_interface.cpp +++ b/src/wayland/inputmethod_v1.cpp @@ -4,13 +4,13 @@ SPDX-License-Identifier: LGPL-2.1-only OR LGPL-3.0-only OR LicenseRef-KDE-Accepted-LGPL */ -#include "inputmethod_v1_interface.h" +#include "inputmethod_v1.h" #include "display.h" -#include "keyboard_interface.h" -#include "keyboard_interface_p.h" -#include "output_interface.h" -#include "seat_interface.h" -#include "surface_interface.h" +#include "keyboard.h" +#include "keyboard_p.h" +#include "output.h" +#include "seat.h" +#include "surface.h" #include "utils/common.h" #include "utils/ramfile.h" @@ -465,4 +465,4 @@ InputMethodContextV1Interface *InputMethodV1Interface::context() const } -#include "moc_inputmethod_v1_interface.cpp" +#include "moc_inputmethod_v1.cpp" diff --git a/src/wayland/inputmethod_v1_interface.h b/src/wayland/inputmethod_v1.h similarity index 100% rename from src/wayland/inputmethod_v1_interface.h rename to src/wayland/inputmethod_v1.h diff --git a/src/wayland/keyboard_interface.cpp b/src/wayland/keyboard.cpp similarity index 98% rename from src/wayland/keyboard_interface.cpp rename to src/wayland/keyboard.cpp index 594407e462..505442b9b6 100644 --- a/src/wayland/keyboard_interface.cpp +++ b/src/wayland/keyboard.cpp @@ -4,10 +4,10 @@ SPDX-License-Identifier: LGPL-2.1-only OR LGPL-3.0-only OR LicenseRef-KDE-Accepted-LGPL */ #include "display.h" -#include "keyboard_interface_p.h" -#include "seat_interface.h" -#include "seat_interface_p.h" -#include "surface_interface.h" +#include "keyboard_p.h" +#include "seat.h" +#include "seat_p.h" +#include "surface.h" #include "utils/common.h" // Qt #include @@ -265,4 +265,4 @@ qint32 KeyboardInterface::keyRepeatRate() const } -#include "moc_keyboard_interface.cpp" +#include "moc_keyboard.cpp" diff --git a/src/wayland/keyboard_interface.h b/src/wayland/keyboard.h similarity index 100% rename from src/wayland/keyboard_interface.h rename to src/wayland/keyboard.h diff --git a/src/wayland/keyboard_interface_p.h b/src/wayland/keyboard_p.h similarity index 98% rename from src/wayland/keyboard_interface_p.h rename to src/wayland/keyboard_p.h index 11e5da4999..17e985dea0 100644 --- a/src/wayland/keyboard_interface_p.h +++ b/src/wayland/keyboard_p.h @@ -5,7 +5,7 @@ */ #pragma once -#include "keyboard_interface.h" +#include "keyboard.h" #include "utils/ramfile.h" #include diff --git a/src/wayland/keyboard_shortcuts_inhibit_v1_interface.cpp b/src/wayland/keyboard_shortcuts_inhibit_v1.cpp similarity index 97% rename from src/wayland/keyboard_shortcuts_inhibit_v1_interface.cpp rename to src/wayland/keyboard_shortcuts_inhibit_v1.cpp index 56c0a228fa..682ff8c57f 100644 --- a/src/wayland/keyboard_shortcuts_inhibit_v1_interface.cpp +++ b/src/wayland/keyboard_shortcuts_inhibit_v1.cpp @@ -4,10 +4,10 @@ SPDX-License-Identifier: LGPL-2.1-only OR LGPL-3.0-only OR LicenseRef-KDE-Accepted-LGPL */ -#include "keyboard_shortcuts_inhibit_v1_interface.h" +#include "keyboard_shortcuts_inhibit_v1.h" #include "display.h" -#include "seat_interface.h" -#include "surface_interface.h" +#include "seat.h" +#include "surface.h" #include @@ -189,4 +189,4 @@ void KeyboardShortcutsInhibitManagerV1Interface::removeInhibitor(SurfaceInterfac } -#include "moc_keyboard_shortcuts_inhibit_v1_interface.cpp" +#include "moc_keyboard_shortcuts_inhibit_v1.cpp" diff --git a/src/wayland/keyboard_shortcuts_inhibit_v1_interface.h b/src/wayland/keyboard_shortcuts_inhibit_v1.h similarity index 97% rename from src/wayland/keyboard_shortcuts_inhibit_v1_interface.h rename to src/wayland/keyboard_shortcuts_inhibit_v1.h index f69e6723ad..caed5a0768 100644 --- a/src/wayland/keyboard_shortcuts_inhibit_v1_interface.h +++ b/src/wayland/keyboard_shortcuts_inhibit_v1.h @@ -6,8 +6,8 @@ #pragma once -#include "seat_interface.h" -#include "surface_interface.h" +#include "seat.h" +#include "surface.h" #include diff --git a/src/wayland/keystate_interface.cpp b/src/wayland/keystate.cpp similarity index 95% rename from src/wayland/keystate_interface.cpp rename to src/wayland/keystate.cpp index f5a0699bee..b8ac499a5c 100644 --- a/src/wayland/keystate_interface.cpp +++ b/src/wayland/keystate.cpp @@ -4,7 +4,7 @@ SPDX-License-Identifier: LGPL-2.1-only OR LGPL-3.0-only OR LicenseRef-KDE-Accepted-LGPL */ -#include "keystate_interface.h" +#include "keystate.h" #include "display.h" #include "keyboard_input.h" @@ -55,4 +55,4 @@ KeyStateInterface::~KeyStateInterface() = default; } -#include "moc_keystate_interface.cpp" +#include "moc_keystate.cpp" diff --git a/src/wayland/keystate_interface.h b/src/wayland/keystate.h similarity index 100% rename from src/wayland/keystate_interface.h rename to src/wayland/keystate.h diff --git a/src/wayland/layershell_v1_interface.cpp b/src/wayland/layershell_v1.cpp similarity index 98% rename from src/wayland/layershell_v1_interface.cpp rename to src/wayland/layershell_v1.cpp index 54a124592a..86091b30f0 100644 --- a/src/wayland/layershell_v1_interface.cpp +++ b/src/wayland/layershell_v1.cpp @@ -4,12 +4,12 @@ SPDX-License-Identifier: LGPL-2.1-only OR LGPL-3.0-only OR LicenseRef-KDE-Accepted-LGPL */ -#include "layershell_v1_interface.h" +#include "layershell_v1.h" #include "display.h" -#include "output_interface.h" -#include "surface_interface.h" +#include "output.h" +#include "surface.h" #include "utils/common.h" -#include "xdgshell_interface_p.h" +#include "xdgshell_p.h" #include #include @@ -500,4 +500,4 @@ void LayerSurfaceV1Interface::sendClosed() } // namespace KWaylandServer -#include "moc_layershell_v1_interface.cpp" +#include "moc_layershell_v1.cpp" diff --git a/src/wayland/layershell_v1_interface.h b/src/wayland/layershell_v1.h similarity index 100% rename from src/wayland/layershell_v1_interface.h rename to src/wayland/layershell_v1.h diff --git a/src/wayland/linuxdmabufv1clientbuffer.cpp b/src/wayland/linuxdmabufv1clientbuffer.cpp index 6e5687e358..4c1631ab25 100644 --- a/src/wayland/linuxdmabufv1clientbuffer.cpp +++ b/src/wayland/linuxdmabufv1clientbuffer.cpp @@ -13,7 +13,7 @@ #include "linuxdmabufv1clientbuffer.h" #include "core/renderbackend.h" #include "linuxdmabufv1clientbuffer_p.h" -#include "surface_interface_p.h" +#include "surface_p.h" #include "utils/common.h" #include diff --git a/src/wayland/lockscreen_overlay_v1_interface.cpp b/src/wayland/lockscreen_overlay_v1.cpp similarity index 90% rename from src/wayland/lockscreen_overlay_v1_interface.cpp rename to src/wayland/lockscreen_overlay_v1.cpp index c79d2b9fb5..50b08f5edb 100644 --- a/src/wayland/lockscreen_overlay_v1_interface.cpp +++ b/src/wayland/lockscreen_overlay_v1.cpp @@ -4,10 +4,10 @@ SPDX-License-Identifier: LGPL-2.1-only OR LGPL-3.0-only OR LicenseRef-KDE-Accepted-LGPL */ -#include "lockscreen_overlay_v1_interface.h" +#include "lockscreen_overlay_v1.h" #include "display.h" -#include "seat_interface.h" -#include "surface_interface.h" +#include "seat.h" +#include "surface.h" #include "qwayland-server-kde-lockscreen-overlay-v1.h" @@ -53,4 +53,4 @@ LockscreenOverlayV1Interface::LockscreenOverlayV1Interface(Display *display, QOb } -#include "moc_lockscreen_overlay_v1_interface.cpp" +#include "moc_lockscreen_overlay_v1.cpp" diff --git a/src/wayland/lockscreen_overlay_v1_interface.h b/src/wayland/lockscreen_overlay_v1.h similarity index 100% rename from src/wayland/lockscreen_overlay_v1_interface.h rename to src/wayland/lockscreen_overlay_v1.h diff --git a/src/wayland/output_interface.cpp b/src/wayland/output.cpp similarity index 99% rename from src/wayland/output_interface.cpp rename to src/wayland/output.cpp index fab83d562e..0cc28c73e5 100644 --- a/src/wayland/output_interface.cpp +++ b/src/wayland/output.cpp @@ -4,7 +4,7 @@ SPDX-License-Identifier: LGPL-2.1-only OR LGPL-3.0-only OR LicenseRef-KDE-Accepted-LGPL */ -#include "output_interface.h" +#include "output.h" #include "display.h" #include "display_p.h" #include "utils.h" @@ -327,4 +327,4 @@ OutputInterface *OutputInterface::get(wl_resource *native) } // namespace KWaylandServer -#include "moc_output_interface.cpp" +#include "wayland/moc_output.cpp" diff --git a/src/wayland/output_interface.h b/src/wayland/output.h similarity index 100% rename from src/wayland/output_interface.h rename to src/wayland/output.h diff --git a/src/wayland/output_order_v1_interface.cpp b/src/wayland/output_order_v1.cpp similarity index 95% rename from src/wayland/output_order_v1_interface.cpp rename to src/wayland/output_order_v1.cpp index 19788fc478..2eef3d7eee 100644 --- a/src/wayland/output_order_v1_interface.cpp +++ b/src/wayland/output_order_v1.cpp @@ -3,7 +3,7 @@ SPDX-License-Identifier: LGPL-2.1-only OR LGPL-3.0-only OR LicenseRef-KDE-Accepted-LGPL */ -#include "output_order_v1_interface.h" +#include "output_order_v1.h" #include "core/output.h" #include "display.h" @@ -68,4 +68,4 @@ void OutputOrderV1InterfacePrivate::kde_output_order_v1_destroy(Resource *resour } } -#include "moc_output_order_v1_interface.cpp" +#include "moc_output_order_v1.cpp" diff --git a/src/wayland/output_order_v1_interface.h b/src/wayland/output_order_v1.h similarity index 100% rename from src/wayland/output_order_v1_interface.h rename to src/wayland/output_order_v1.h diff --git a/src/wayland/outputdevice_v2_interface.cpp b/src/wayland/outputdevice_v2.cpp similarity index 99% rename from src/wayland/outputdevice_v2_interface.cpp rename to src/wayland/outputdevice_v2.cpp index 309b3b34b9..cfdbb4c9ba 100644 --- a/src/wayland/outputdevice_v2_interface.cpp +++ b/src/wayland/outputdevice_v2.cpp @@ -4,7 +4,7 @@ SPDX-License-Identifier: LGPL-2.1-only OR LGPL-3.0-only OR LicenseRef-KDE-Accepted-LGPL */ -#include "outputdevice_v2_interface.h" +#include "outputdevice_v2.h" #include "display.h" #include "display_p.h" @@ -731,4 +731,4 @@ OutputDeviceModeV2Interface *OutputDeviceModeV2Interface::get(wl_resource *nativ } -#include "moc_outputdevice_v2_interface.cpp" +#include "moc_outputdevice_v2.cpp" diff --git a/src/wayland/outputdevice_v2_interface.h b/src/wayland/outputdevice_v2.h similarity index 100% rename from src/wayland/outputdevice_v2_interface.h rename to src/wayland/outputdevice_v2.h diff --git a/src/wayland/outputmanagement_v2_interface.cpp b/src/wayland/outputmanagement_v2.cpp similarity index 98% rename from src/wayland/outputmanagement_v2_interface.cpp rename to src/wayland/outputmanagement_v2.cpp index 1744bbc36a..aae66b5156 100644 --- a/src/wayland/outputmanagement_v2_interface.cpp +++ b/src/wayland/outputmanagement_v2.cpp @@ -4,10 +4,10 @@ SPDX-License-Identifier: LGPL-2.1-only OR LGPL-3.0-only OR LicenseRef-KDE-Accepted-LGPL */ -#include "outputmanagement_v2_interface.h" +#include "outputmanagement_v2.h" #include "display.h" -#include "outputdevice_v2_interface.h" -#include "outputmanagement_v2_interface.h" +#include "outputdevice_v2.h" +#include "outputmanagement_v2.h" #include "utils/common.h" #include "core/outputbackend.h" @@ -358,6 +358,6 @@ void OutputConfigurationV2Interface::kde_output_configuration_v2_apply(Resource } } -#include "outputmanagement_v2_interface.moc" +#include "outputmanagement_v2.moc" -#include "moc_outputmanagement_v2_interface.cpp" +#include "moc_outputmanagement_v2.cpp" diff --git a/src/wayland/outputmanagement_v2_interface.h b/src/wayland/outputmanagement_v2.h similarity index 100% rename from src/wayland/outputmanagement_v2_interface.h rename to src/wayland/outputmanagement_v2.h diff --git a/src/wayland/plasmashell_interface.cpp b/src/wayland/plasmashell.cpp similarity index 99% rename from src/wayland/plasmashell_interface.cpp rename to src/wayland/plasmashell.cpp index 49b4f5d594..17b4de7bd1 100644 --- a/src/wayland/plasmashell_interface.cpp +++ b/src/wayland/plasmashell.cpp @@ -4,9 +4,9 @@ SPDX-License-Identifier: LGPL-2.1-only OR LGPL-3.0-only OR LicenseRef-KDE-Accepted-LGPL */ -#include "plasmashell_interface.h" +#include "plasmashell.h" #include "display.h" -#include "surface_interface.h" +#include "surface.h" #include "utils.h" #include @@ -329,4 +329,4 @@ PlasmaShellSurfaceInterface *PlasmaShellSurfaceInterface::get(SurfaceInterface * } -#include "moc_plasmashell_interface.cpp" +#include "moc_plasmashell.cpp" diff --git a/src/wayland/plasmashell_interface.h b/src/wayland/plasmashell.h similarity index 100% rename from src/wayland/plasmashell_interface.h rename to src/wayland/plasmashell.h diff --git a/src/wayland/plasmavirtualdesktop_interface.cpp b/src/wayland/plasmavirtualdesktop.cpp similarity index 99% rename from src/wayland/plasmavirtualdesktop_interface.cpp rename to src/wayland/plasmavirtualdesktop.cpp index 04ab61599e..42f0b70dc0 100644 --- a/src/wayland/plasmavirtualdesktop_interface.cpp +++ b/src/wayland/plasmavirtualdesktop.cpp @@ -3,7 +3,7 @@ SPDX-License-Identifier: LGPL-2.1-only OR LGPL-3.0-only OR LicenseRef-KDE-Accepted-LGPL */ -#include "plasmavirtualdesktop_interface.h" +#include "plasmavirtualdesktop.h" #include "display.h" #include @@ -316,4 +316,4 @@ void PlasmaVirtualDesktopInterface::sendDone() } -#include "moc_plasmavirtualdesktop_interface.cpp" +#include "moc_plasmavirtualdesktop.cpp" diff --git a/src/wayland/plasmavirtualdesktop_interface.h b/src/wayland/plasmavirtualdesktop.h similarity index 100% rename from src/wayland/plasmavirtualdesktop_interface.h rename to src/wayland/plasmavirtualdesktop.h diff --git a/src/wayland/plasmawindowmanagement_interface.cpp b/src/wayland/plasmawindowmanagement.cpp similarity index 99% rename from src/wayland/plasmawindowmanagement_interface.cpp rename to src/wayland/plasmawindowmanagement.cpp index 88f365b7b8..b17a6046bd 100644 --- a/src/wayland/plasmawindowmanagement_interface.cpp +++ b/src/wayland/plasmawindowmanagement.cpp @@ -3,11 +3,11 @@ SPDX-License-Identifier: LGPL-2.1-only OR LGPL-3.0-only OR LicenseRef-KDE-Accepted-LGPL */ -#include "plasmawindowmanagement_interface.h" +#include "plasmawindowmanagement.h" #include "display.h" -#include "output_interface.h" -#include "plasmavirtualdesktop_interface.h" -#include "surface_interface.h" +#include "output.h" +#include "plasmavirtualdesktop.h" +#include "surface.h" #include "utils/common.h" #include @@ -1118,4 +1118,4 @@ void PlasmaWindowActivationInterface::sendAppId(const QString &appid) } -#include "moc_plasmawindowmanagement_interface.cpp" +#include "moc_plasmawindowmanagement.cpp" diff --git a/src/wayland/plasmawindowmanagement_interface.h b/src/wayland/plasmawindowmanagement.h similarity index 100% rename from src/wayland/plasmawindowmanagement_interface.h rename to src/wayland/plasmawindowmanagement.h diff --git a/src/wayland/pointer_interface.cpp b/src/wayland/pointer.cpp similarity index 98% rename from src/wayland/pointer_interface.cpp rename to src/wayland/pointer.cpp index 3c827317a4..5e6f2a4911 100644 --- a/src/wayland/pointer_interface.cpp +++ b/src/wayland/pointer.cpp @@ -6,14 +6,14 @@ SPDX-License-Identifier: LGPL-2.1-only OR LGPL-3.0-only OR LicenseRef-KDE-Accepted-LGPL */ -#include "pointer_interface.h" +#include "pointer.h" #include "clientconnection.h" #include "display.h" -#include "pointer_interface_p.h" -#include "pointergestures_v1_interface_p.h" -#include "relativepointer_v1_interface_p.h" -#include "seat_interface.h" -#include "surface_interface.h" +#include "pointer_p.h" +#include "pointergestures_v1_p.h" +#include "relativepointer_v1_p.h" +#include "seat.h" +#include "surface.h" #include "utils.h" #include "utils/common.h" @@ -391,4 +391,4 @@ SurfaceInterface *Cursor::surface() const } // namespace KWaylandServer -#include "moc_pointer_interface.cpp" +#include "moc_pointer.cpp" diff --git a/src/wayland/pointer_interface.h b/src/wayland/pointer.h similarity index 100% rename from src/wayland/pointer_interface.h rename to src/wayland/pointer.h diff --git a/src/wayland/pointer_interface_p.h b/src/wayland/pointer_p.h similarity index 98% rename from src/wayland/pointer_interface_p.h rename to src/wayland/pointer_p.h index df566627c3..fd39ec4367 100644 --- a/src/wayland/pointer_interface_p.h +++ b/src/wayland/pointer_p.h @@ -7,7 +7,7 @@ */ #pragma once -#include "pointer_interface.h" +#include "pointer.h" #include #include diff --git a/src/wayland/pointerconstraints_v1_interface.cpp b/src/wayland/pointerconstraints_v1.cpp similarity index 97% rename from src/wayland/pointerconstraints_v1_interface.cpp rename to src/wayland/pointerconstraints_v1.cpp index 3909dfbb90..96cc1409a3 100644 --- a/src/wayland/pointerconstraints_v1_interface.cpp +++ b/src/wayland/pointerconstraints_v1.cpp @@ -5,12 +5,12 @@ SPDX-License-Identifier: LGPL-2.1-only OR LGPL-3.0-only OR LicenseRef-KDE-Accepted-LGPL */ -#include "pointerconstraints_v1_interface.h" +#include "pointerconstraints_v1.h" #include "display.h" -#include "pointer_interface.h" -#include "pointerconstraints_v1_interface_p.h" -#include "region_interface_p.h" -#include "surface_interface_p.h" +#include "pointer.h" +#include "pointerconstraints_v1_p.h" +#include "region_p.h" +#include "surface_p.h" namespace KWaylandServer { @@ -346,4 +346,4 @@ void ConfinedPointerV1Interface::setConfined(bool confined) } // namespace KWaylandServer -#include "moc_pointerconstraints_v1_interface.cpp" +#include "moc_pointerconstraints_v1.cpp" diff --git a/src/wayland/pointerconstraints_v1_interface.h b/src/wayland/pointerconstraints_v1.h similarity index 100% rename from src/wayland/pointerconstraints_v1_interface.h rename to src/wayland/pointerconstraints_v1.h diff --git a/src/wayland/pointerconstraints_v1_interface_p.h b/src/wayland/pointerconstraints_v1_p.h similarity index 98% rename from src/wayland/pointerconstraints_v1_interface_p.h rename to src/wayland/pointerconstraints_v1_p.h index ad05837d53..5716538c58 100644 --- a/src/wayland/pointerconstraints_v1_interface_p.h +++ b/src/wayland/pointerconstraints_v1_p.h @@ -7,8 +7,8 @@ #pragma once -#include "pointerconstraints_v1_interface.h" -#include "surface_interface.h" +#include "pointerconstraints_v1.h" +#include "surface.h" #include diff --git a/src/wayland/pointergestures_v1_interface.cpp b/src/wayland/pointergestures_v1.cpp similarity index 97% rename from src/wayland/pointergestures_v1_interface.cpp rename to src/wayland/pointergestures_v1.cpp index 32e96d81b6..e721f31e3e 100644 --- a/src/wayland/pointergestures_v1_interface.cpp +++ b/src/wayland/pointergestures_v1.cpp @@ -5,13 +5,13 @@ SPDX-License-Identifier: LGPL-2.1-only OR LGPL-3.0-only OR LicenseRef-KDE-Accepted-LGPL */ -#include "pointergestures_v1_interface.h" +#include "pointergestures_v1.h" #include "clientconnection.h" #include "display.h" -#include "pointer_interface_p.h" -#include "pointergestures_v1_interface_p.h" -#include "seat_interface.h" -#include "surface_interface.h" +#include "pointer_p.h" +#include "pointergestures_v1_p.h" +#include "seat.h" +#include "surface.h" namespace KWaylandServer { @@ -325,4 +325,4 @@ void PointerHoldGestureV1Interface::sendCancel(quint32 serial) } // namespace KWaylandServer -#include "moc_pointergestures_v1_interface.cpp" +#include "moc_pointergestures_v1.cpp" diff --git a/src/wayland/pointergestures_v1_interface.h b/src/wayland/pointergestures_v1.h similarity index 100% rename from src/wayland/pointergestures_v1_interface.h rename to src/wayland/pointergestures_v1.h diff --git a/src/wayland/pointergestures_v1_interface_p.h b/src/wayland/pointergestures_v1_p.h similarity index 100% rename from src/wayland/pointergestures_v1_interface_p.h rename to src/wayland/pointergestures_v1_p.h diff --git a/src/wayland/primaryselectiondevice_v1_interface.cpp b/src/wayland/primaryselectiondevice_v1.cpp similarity index 92% rename from src/wayland/primaryselectiondevice_v1_interface.cpp rename to src/wayland/primaryselectiondevice_v1.cpp index 016cb025ea..c325b2e976 100644 --- a/src/wayland/primaryselectiondevice_v1_interface.cpp +++ b/src/wayland/primaryselectiondevice_v1.cpp @@ -3,13 +3,13 @@ SPDX-License-Identifier: LGPL-2.1-only OR LGPL-3.0-only OR LicenseRef-KDE-Accepted-LGPL */ -#include "primaryselectiondevice_v1_interface.h" +#include "primaryselectiondevice_v1.h" #include "display.h" -#include "primaryselectiondevicemanager_v1_interface.h" -#include "primaryselectionoffer_v1_interface.h" -#include "primaryselectionsource_v1_interface.h" -#include "seat_interface.h" -#include "seat_interface_p.h" +#include "primaryselectiondevicemanager_v1.h" +#include "primaryselectionoffer_v1.h" +#include "primaryselectionsource_v1.h" +#include "seat.h" +#include "seat_p.h" // Wayland #include @@ -129,4 +129,4 @@ wl_client *PrimarySelectionDeviceV1Interface::client() const } -#include "moc_primaryselectiondevice_v1_interface.cpp" +#include "moc_primaryselectiondevice_v1.cpp" diff --git a/src/wayland/primaryselectiondevice_v1_interface.h b/src/wayland/primaryselectiondevice_v1.h similarity index 100% rename from src/wayland/primaryselectiondevice_v1_interface.h rename to src/wayland/primaryselectiondevice_v1.h diff --git a/src/wayland/primaryselectiondevicemanager_v1_interface.cpp b/src/wayland/primaryselectiondevicemanager_v1.cpp similarity index 92% rename from src/wayland/primaryselectiondevicemanager_v1_interface.cpp rename to src/wayland/primaryselectiondevicemanager_v1.cpp index adbc488967..29f426288b 100644 --- a/src/wayland/primaryselectiondevicemanager_v1_interface.cpp +++ b/src/wayland/primaryselectiondevicemanager_v1.cpp @@ -4,11 +4,11 @@ SPDX-License-Identifier: LGPL-2.1-only OR LGPL-3.0-only OR LicenseRef-KDE-Accepted-LGPL */ -#include "primaryselectiondevicemanager_v1_interface.h" +#include "primaryselectiondevicemanager_v1.h" #include "display.h" -#include "primaryselectiondevice_v1_interface.h" -#include "primaryselectionsource_v1_interface.h" -#include "seat_interface_p.h" +#include "primaryselectiondevice_v1.h" +#include "primaryselectionsource_v1.h" +#include "seat_p.h" // Wayland #include @@ -76,4 +76,4 @@ PrimarySelectionDeviceManagerV1Interface::PrimarySelectionDeviceManagerV1Interfa PrimarySelectionDeviceManagerV1Interface::~PrimarySelectionDeviceManagerV1Interface() = default; } -#include "moc_primaryselectiondevicemanager_v1_interface.cpp" +#include "moc_primaryselectiondevicemanager_v1.cpp" diff --git a/src/wayland/primaryselectiondevicemanager_v1_interface.h b/src/wayland/primaryselectiondevicemanager_v1.h similarity index 100% rename from src/wayland/primaryselectiondevicemanager_v1_interface.h rename to src/wayland/primaryselectiondevicemanager_v1.h diff --git a/src/wayland/primaryselectionoffer_v1_interface.cpp b/src/wayland/primaryselectionoffer_v1.cpp similarity index 93% rename from src/wayland/primaryselectionoffer_v1_interface.cpp rename to src/wayland/primaryselectionoffer_v1.cpp index 9338d156f8..21757c0772 100644 --- a/src/wayland/primaryselectionoffer_v1_interface.cpp +++ b/src/wayland/primaryselectionoffer_v1.cpp @@ -3,9 +3,9 @@ SPDX-License-Identifier: LGPL-2.1-only OR LGPL-3.0-only OR LicenseRef-KDE-Accepted-LGPL */ -#include "primaryselectionoffer_v1_interface.h" -#include "primaryselectiondevice_v1_interface.h" -#include "primaryselectionsource_v1_interface.h" +#include "primaryselectionoffer_v1.h" +#include "primaryselectiondevice_v1.h" +#include "primaryselectionsource_v1.h" // Qt #include #include @@ -84,4 +84,4 @@ wl_resource *PrimarySelectionOfferV1Interface::resource() const } -#include "moc_primaryselectionoffer_v1_interface.cpp" +#include "moc_primaryselectionoffer_v1.cpp" diff --git a/src/wayland/primaryselectionoffer_v1_interface.h b/src/wayland/primaryselectionoffer_v1.h similarity index 95% rename from src/wayland/primaryselectionoffer_v1_interface.h rename to src/wayland/primaryselectionoffer_v1.h index 343cd80049..88eddf2e04 100644 --- a/src/wayland/primaryselectionoffer_v1_interface.h +++ b/src/wayland/primaryselectionoffer_v1.h @@ -10,7 +10,7 @@ #include #include -#include "primaryselectiondevicemanager_v1_interface.h" +#include "primaryselectiondevicemanager_v1.h" struct wl_resource; namespace KWaylandServer diff --git a/src/wayland/primaryselectionsource_v1_interface.cpp b/src/wayland/primaryselectionsource_v1.cpp similarity index 94% rename from src/wayland/primaryselectionsource_v1_interface.cpp rename to src/wayland/primaryselectionsource_v1.cpp index b4467ad7c7..d6323ed5c5 100644 --- a/src/wayland/primaryselectionsource_v1_interface.cpp +++ b/src/wayland/primaryselectionsource_v1.cpp @@ -3,9 +3,9 @@ SPDX-License-Identifier: LGPL-2.1-only OR LGPL-3.0-only OR LicenseRef-KDE-Accepted-LGPL */ -#include "primaryselectionsource_v1_interface.h" +#include "primaryselectionsource_v1.h" #include "clientconnection.h" -#include "primaryselectiondevicemanager_v1_interface.h" +#include "primaryselectiondevicemanager_v1.h" #include "utils.h" // Qt #include @@ -92,4 +92,4 @@ PrimarySelectionSourceV1Interface *PrimarySelectionSourceV1Interface::get(wl_res } -#include "moc_primaryselectionsource_v1_interface.cpp" +#include "moc_primaryselectionsource_v1.cpp" diff --git a/src/wayland/primaryselectionsource_v1_interface.h b/src/wayland/primaryselectionsource_v1.h similarity index 95% rename from src/wayland/primaryselectionsource_v1_interface.h rename to src/wayland/primaryselectionsource_v1.h index b405016bf7..0fce3e2d57 100644 --- a/src/wayland/primaryselectionsource_v1_interface.h +++ b/src/wayland/primaryselectionsource_v1.h @@ -8,7 +8,7 @@ #include "kwin_export.h" #include "abstract_data_source.h" -#include "primaryselectiondevicemanager_v1_interface.h" +#include "primaryselectiondevicemanager_v1.h" namespace KWaylandServer { diff --git a/src/wayland/region_interface.cpp b/src/wayland/region.cpp similarity index 97% rename from src/wayland/region_interface.cpp rename to src/wayland/region.cpp index 1e0150546b..9eff5c42e5 100644 --- a/src/wayland/region_interface.cpp +++ b/src/wayland/region.cpp @@ -4,7 +4,7 @@ SPDX-License-Identifier: LGPL-2.1-only OR LGPL-3.0-only OR LicenseRef-KDE-Accepted-LGPL */ -#include "region_interface_p.h" +#include "region_p.h" #include "utils.h" namespace KWaylandServer diff --git a/src/wayland/region_interface_p.h b/src/wayland/region_p.h similarity index 100% rename from src/wayland/region_interface_p.h rename to src/wayland/region_p.h diff --git a/src/wayland/relativepointer_v1_interface.cpp b/src/wayland/relativepointer_v1.cpp similarity index 93% rename from src/wayland/relativepointer_v1_interface.cpp rename to src/wayland/relativepointer_v1.cpp index 49a78618fe..406868fd45 100644 --- a/src/wayland/relativepointer_v1_interface.cpp +++ b/src/wayland/relativepointer_v1.cpp @@ -5,13 +5,13 @@ SPDX-License-Identifier: LGPL-2.1-only OR LGPL-3.0-only OR LicenseRef-KDE-Accepted-LGPL */ -#include "relativepointer_v1_interface.h" +#include "relativepointer_v1.h" #include "clientconnection.h" #include "display.h" -#include "pointer_interface_p.h" -#include "relativepointer_v1_interface_p.h" -#include "seat_interface.h" -#include "surface_interface.h" +#include "pointer_p.h" +#include "relativepointer_v1_p.h" +#include "seat.h" +#include "surface.h" namespace KWaylandServer { @@ -95,4 +95,4 @@ void RelativePointerV1Interface::sendRelativeMotion(const QPointF &delta, const } // namespace KWaylandServer -#include "moc_relativepointer_v1_interface.cpp" +#include "moc_relativepointer_v1.cpp" diff --git a/src/wayland/relativepointer_v1_interface.h b/src/wayland/relativepointer_v1.h similarity index 100% rename from src/wayland/relativepointer_v1_interface.h rename to src/wayland/relativepointer_v1.h diff --git a/src/wayland/relativepointer_v1_interface_p.h b/src/wayland/relativepointer_v1_p.h similarity index 100% rename from src/wayland/relativepointer_v1_interface_p.h rename to src/wayland/relativepointer_v1_p.h diff --git a/src/wayland/screencast_v1_interface.cpp b/src/wayland/screencast_v1.cpp similarity index 97% rename from src/wayland/screencast_v1_interface.cpp rename to src/wayland/screencast_v1.cpp index 9671163ebb..7dfdef8a33 100644 --- a/src/wayland/screencast_v1_interface.cpp +++ b/src/wayland/screencast_v1.cpp @@ -4,9 +4,9 @@ SPDX-License-Identifier: LGPL-2.1-only OR LGPL-3.0-only OR LicenseRef-KDE-Accepted-LGPL */ -#include "screencast_v1_interface.h" +#include "screencast_v1.h" #include "display.h" -#include "output_interface.h" +#include "output.h" #include #include @@ -143,4 +143,4 @@ ScreencastV1Interface::~ScreencastV1Interface() = default; } // namespace KWaylandServer -#include "moc_screencast_v1_interface.cpp" +#include "moc_screencast_v1.cpp" diff --git a/src/wayland/screencast_v1_interface.h b/src/wayland/screencast_v1.h similarity index 100% rename from src/wayland/screencast_v1_interface.h rename to src/wayland/screencast_v1.h diff --git a/src/wayland/screenedge_v1_interface.cpp b/src/wayland/screenedge_v1.cpp similarity index 97% rename from src/wayland/screenedge_v1_interface.cpp rename to src/wayland/screenedge_v1.cpp index 03366c9d2e..e4349d4a85 100644 --- a/src/wayland/screenedge_v1_interface.cpp +++ b/src/wayland/screenedge_v1.cpp @@ -4,9 +4,9 @@ SPDX-License-Identifier: LGPL-2.1-only OR LGPL-3.0-only OR LicenseRef-KDE-Accepted-LGPL */ -#include "wayland/screenedge_v1_interface.h" +#include "wayland/screenedge_v1.h" #include "wayland/display.h" -#include "wayland/surface_interface.h" +#include "wayland/surface.h" #include "qwayland-server-kde-screen-edge-v1.h" @@ -149,4 +149,4 @@ ElectricBorder AutoHideScreenEdgeV1Interface::border() const } // namespace KWaylandServer -#include "moc_screenedge_v1_interface.cpp" +#include "moc_screenedge_v1.cpp" diff --git a/src/wayland/screenedge_v1_interface.h b/src/wayland/screenedge_v1.h similarity index 100% rename from src/wayland/screenedge_v1_interface.h rename to src/wayland/screenedge_v1.h diff --git a/src/wayland/seat_interface.cpp b/src/wayland/seat.cpp similarity index 97% rename from src/wayland/seat_interface.cpp rename to src/wayland/seat.cpp index 66618d7a15..bd2b704394 100644 --- a/src/wayland/seat_interface.cpp +++ b/src/wayland/seat.cpp @@ -5,33 +5,33 @@ SPDX-License-Identifier: LGPL-2.1-only OR LGPL-3.0-only OR LicenseRef-KDE-Accepted-LGPL */ -#include "seat_interface.h" +#include "seat.h" #include "abstract_data_source.h" -#include "datacontroldevice_v1_interface.h" -#include "datacontrolsource_v1_interface.h" -#include "datadevice_interface.h" -#include "datadevice_interface_p.h" -#include "datasource_interface.h" +#include "datacontroldevice_v1.h" +#include "datacontrolsource_v1.h" +#include "datadevice.h" +#include "datadevice_p.h" +#include "datasource.h" #include "display.h" #include "display_p.h" -#include "keyboard_interface.h" -#include "keyboard_interface_p.h" -#include "pointer_interface.h" -#include "pointer_interface_p.h" -#include "pointerconstraints_v1_interface.h" -#include "pointergestures_v1_interface_p.h" -#include "primaryselectiondevice_v1_interface.h" -#include "primaryselectionsource_v1_interface.h" -#include "relativepointer_v1_interface_p.h" -#include "seat_interface_p.h" -#include "surface_interface.h" -#include "textinput_v1_interface_p.h" -#include "textinput_v2_interface_p.h" -#include "textinput_v3_interface_p.h" -#include "touch_interface_p.h" +#include "keyboard.h" +#include "keyboard_p.h" +#include "pointer.h" +#include "pointer_p.h" +#include "pointerconstraints_v1.h" +#include "pointergestures_v1_p.h" +#include "primaryselectiondevice_v1.h" +#include "primaryselectionsource_v1.h" +#include "relativepointer_v1_p.h" +#include "seat_p.h" +#include "surface.h" +#include "textinput_v1_p.h" +#include "textinput_v2_p.h" +#include "textinput_v3_p.h" +#include "touch_p.h" #include "utils.h" #include "utils/common.h" -#include "xdgtopleveldrag_v1_interface.h" +#include "xdgtopleveldrag_v1.h" #include @@ -515,7 +515,6 @@ void SeatInterface::setDragTarget(AbstractDropHandler *dropTarget, notifyTouchMotion(d->globalTouch.ids.first(), globalPosition); } - if (d->drag.target) { QMatrix4x4 surfaceInputTransformation = inputTransformation; surfaceInputTransformation.scale(surface->scaleOverride()); @@ -1382,4 +1381,4 @@ DragAndDropIcon *SeatInterface::dragIcon() const } } -#include "moc_seat_interface.cpp" +#include "moc_seat.cpp" diff --git a/src/wayland/seat_interface.h b/src/wayland/seat.h similarity index 100% rename from src/wayland/seat_interface.h rename to src/wayland/seat.h diff --git a/src/wayland/seat_interface_p.h b/src/wayland/seat_p.h similarity index 99% rename from src/wayland/seat_interface_p.h rename to src/wayland/seat_p.h index 9a28ee17a4..12b51a0f4a 100644 --- a/src/wayland/seat_interface_p.h +++ b/src/wayland/seat_p.h @@ -7,7 +7,7 @@ #pragma once // KWayland -#include "seat_interface.h" +#include "seat.h" // Qt #include #include diff --git a/src/wayland/server_decoration_interface.cpp b/src/wayland/server_decoration.cpp similarity index 98% rename from src/wayland/server_decoration_interface.cpp rename to src/wayland/server_decoration.cpp index b575c1187a..ef82632dca 100644 --- a/src/wayland/server_decoration_interface.cpp +++ b/src/wayland/server_decoration.cpp @@ -3,9 +3,9 @@ SPDX-License-Identifier: LGPL-2.1-only OR LGPL-3.0-only OR LicenseRef-KDE-Accepted-LGPL */ -#include "server_decoration_interface.h" +#include "server_decoration.h" #include "display.h" -#include "surface_interface.h" +#include "surface.h" #include "utils/common.h" #include @@ -233,4 +233,4 @@ ServerSideDecorationInterface *ServerSideDecorationInterface::get(SurfaceInterfa } -#include "moc_server_decoration_interface.cpp" +#include "moc_server_decoration.cpp" diff --git a/src/wayland/server_decoration_interface.h b/src/wayland/server_decoration.h similarity index 100% rename from src/wayland/server_decoration_interface.h rename to src/wayland/server_decoration.h diff --git a/src/wayland/server_decoration_palette_interface.cpp b/src/wayland/server_decoration_palette.cpp similarity index 97% rename from src/wayland/server_decoration_palette_interface.cpp rename to src/wayland/server_decoration_palette.cpp index 1a33d23f9e..53a67cd9ad 100644 --- a/src/wayland/server_decoration_palette_interface.cpp +++ b/src/wayland/server_decoration_palette.cpp @@ -3,9 +3,9 @@ SPDX-License-Identifier: LGPL-2.1-only OR LGPL-3.0-only OR LicenseRef-KDE-Accepted-LGPL */ -#include "server_decoration_palette_interface.h" +#include "server_decoration_palette.h" #include "display.h" -#include "surface_interface.h" +#include "surface.h" #include "utils/common.h" #include @@ -141,4 +141,4 @@ SurfaceInterface *ServerSideDecorationPaletteInterface::surface() const } // namespace -#include "moc_server_decoration_palette_interface.cpp" +#include "moc_server_decoration_palette.cpp" diff --git a/src/wayland/server_decoration_palette_interface.h b/src/wayland/server_decoration_palette.h similarity index 100% rename from src/wayland/server_decoration_palette_interface.h rename to src/wayland/server_decoration_palette.h diff --git a/src/wayland/shadow_interface.cpp b/src/wayland/shadow.cpp similarity index 99% rename from src/wayland/shadow_interface.cpp rename to src/wayland/shadow.cpp index db40c204c5..da5719679a 100644 --- a/src/wayland/shadow_interface.cpp +++ b/src/wayland/shadow.cpp @@ -3,10 +3,10 @@ SPDX-License-Identifier: LGPL-2.1-only OR LGPL-3.0-only OR LicenseRef-KDE-Accepted-LGPL */ -#include "shadow_interface.h" +#include "shadow.h" #include "core/graphicsbuffer.h" #include "display.h" -#include "surface_interface_p.h" +#include "surface_p.h" #include @@ -326,4 +326,4 @@ BUFFER(bottomLeft) } -#include "moc_shadow_interface.cpp" +#include "wayland/moc_shadow.cpp" diff --git a/src/wayland/shadow_interface.h b/src/wayland/shadow.h similarity index 100% rename from src/wayland/shadow_interface.h rename to src/wayland/shadow.h diff --git a/src/wayland/slide_interface.cpp b/src/wayland/slide.cpp similarity index 97% rename from src/wayland/slide_interface.cpp rename to src/wayland/slide.cpp index 97bcf00fa7..6c9e14a11d 100644 --- a/src/wayland/slide_interface.cpp +++ b/src/wayland/slide.cpp @@ -3,9 +3,9 @@ SPDX-License-Identifier: LGPL-2.1-only OR LGPL-3.0-only OR LicenseRef-KDE-Accepted-LGPL */ -#include "slide_interface.h" +#include "slide.h" #include "display.h" -#include "surface_interface_p.h" +#include "surface_p.h" #include @@ -152,4 +152,4 @@ qint32 SlideInterface::offset() const } -#include "moc_slide_interface.cpp" +#include "moc_slide.cpp" diff --git a/src/wayland/slide_interface.h b/src/wayland/slide.h similarity index 100% rename from src/wayland/slide_interface.h rename to src/wayland/slide.h diff --git a/src/wayland/subcompositor_interface.cpp b/src/wayland/subcompositor.cpp similarity index 98% rename from src/wayland/subcompositor_interface.cpp rename to src/wayland/subcompositor.cpp index fa01a46012..654d6561be 100644 --- a/src/wayland/subcompositor_interface.cpp +++ b/src/wayland/subcompositor.cpp @@ -4,10 +4,10 @@ SPDX-License-Identifier: LGPL-2.1-only OR LGPL-3.0-only OR LicenseRef-KDE-Accepted-LGPL */ -#include "subcompositor_interface.h" +#include "subcompositor.h" #include "display.h" -#include "subsurface_interface_p.h" -#include "surface_interface_p.h" +#include "subsurface_p.h" +#include "surface_p.h" #include "transaction.h" namespace KWaylandServer @@ -292,4 +292,4 @@ void SubSurfaceInterface::parentApplyState(quint32 serial) } // namespace KWaylandServer -#include "moc_subcompositor_interface.cpp" +#include "moc_subcompositor.cpp" diff --git a/src/wayland/subcompositor_interface.h b/src/wayland/subcompositor.h similarity index 100% rename from src/wayland/subcompositor_interface.h rename to src/wayland/subcompositor.h diff --git a/src/wayland/subsurface_interface_p.h b/src/wayland/subsurface_p.h similarity index 98% rename from src/wayland/subsurface_interface_p.h rename to src/wayland/subsurface_p.h index 3bc0a0fdf2..263c8f42ac 100644 --- a/src/wayland/subsurface_interface_p.h +++ b/src/wayland/subsurface_p.h @@ -7,7 +7,7 @@ #pragma once -#include "subcompositor_interface.h" +#include "subcompositor.h" #include #include diff --git a/src/wayland/surface_interface.cpp b/src/wayland/surface.cpp similarity index 98% rename from src/wayland/surface_interface.cpp rename to src/wayland/surface.cpp index d0b4e7e1ea..3c78db411b 100644 --- a/src/wayland/surface_interface.cpp +++ b/src/wayland/surface.cpp @@ -4,22 +4,22 @@ SPDX-License-Identifier: LGPL-2.1-only OR LGPL-3.0-only OR LicenseRef-KDE-Accepted-LGPL */ -#include "surface_interface.h" -#include "blur_interface.h" +#include "surface.h" +#include "blur.h" #include "clientconnection.h" -#include "compositor_interface.h" -#include "contrast_interface.h" +#include "compositor.h" +#include "contrast.h" #include "display.h" -#include "fractionalscale_v1_interface_p.h" -#include "idleinhibit_v1_interface_p.h" +#include "fractionalscale_v1_p.h" +#include "idleinhibit_v1_p.h" #include "linuxdmabufv1clientbuffer.h" -#include "output_interface.h" -#include "pointerconstraints_v1_interface_p.h" -#include "region_interface_p.h" -#include "shadow_interface.h" -#include "slide_interface.h" -#include "subcompositor_interface.h" -#include "surface_interface_p.h" +#include "output.h" +#include "pointerconstraints_v1_p.h" +#include "region_p.h" +#include "shadow.h" +#include "slide.h" +#include "subcompositor.h" +#include "surface_p.h" #include "transaction.h" #include "utils.h" @@ -1188,4 +1188,4 @@ void SurfaceInterface::setLastTransaction(Transaction *transaction) } // namespace KWaylandServer -#include "moc_surface_interface.cpp" +#include "moc_surface.cpp" diff --git a/src/wayland/surface_interface.h b/src/wayland/surface.h similarity index 100% rename from src/wayland/surface_interface.h rename to src/wayland/surface.h diff --git a/src/wayland/surface_interface_p.h b/src/wayland/surface_p.h similarity index 99% rename from src/wayland/surface_interface_p.h rename to src/wayland/surface_p.h index bc0866b5c1..568c11c6f3 100644 --- a/src/wayland/surface_interface_p.h +++ b/src/wayland/surface_p.h @@ -7,7 +7,7 @@ #pragma once #include "core/graphicsbuffer.h" -#include "surface_interface.h" +#include "surface.h" #include "utils.h" // Qt #include diff --git a/src/wayland/tablet_v2_interface.cpp b/src/wayland/tablet_v2.cpp similarity index 99% rename from src/wayland/tablet_v2_interface.cpp rename to src/wayland/tablet_v2.cpp index 589e0356fe..8609d61ac6 100644 --- a/src/wayland/tablet_v2_interface.cpp +++ b/src/wayland/tablet_v2.cpp @@ -4,10 +4,10 @@ SPDX-License-Identifier: LGPL-2.1-only OR LGPL-3.0-only OR LicenseRef-KDE-Accepted-LGPL */ -#include "tablet_v2_interface.h" +#include "tablet_v2.h" #include "display.h" -#include "seat_interface.h" -#include "surface_interface.h" +#include "seat.h" +#include "surface.h" #include "utils.h" #include "qwayland-server-tablet-unstable-v2.h" @@ -902,4 +902,4 @@ TabletManagerV2Interface::~TabletManagerV2Interface() = default; } // namespace KWaylandServer -#include "moc_tablet_v2_interface.cpp" +#include "moc_tablet_v2.cpp" diff --git a/src/wayland/tablet_v2_interface.h b/src/wayland/tablet_v2.h similarity index 100% rename from src/wayland/tablet_v2_interface.h rename to src/wayland/tablet_v2.h diff --git a/src/wayland/tearingcontrol_v1_interface.cpp b/src/wayland/tearingcontrol_v1.cpp similarity index 96% rename from src/wayland/tearingcontrol_v1_interface.cpp rename to src/wayland/tearingcontrol_v1.cpp index 09eb3c5e3e..bee3aa6f9d 100644 --- a/src/wayland/tearingcontrol_v1_interface.cpp +++ b/src/wayland/tearingcontrol_v1.cpp @@ -3,9 +3,9 @@ SPDX-License-Identifier: LGPL-2.1-only OR LGPL-3.0-only OR LicenseRef-KDE-Accepted-LGPL */ -#include "tearingcontrol_v1_interface.h" +#include "tearingcontrol_v1.h" #include "display.h" -#include "surface_interface_p.h" +#include "surface_p.h" namespace KWaylandServer { @@ -104,4 +104,4 @@ void TearingControlV1Interface::wp_tearing_control_v1_destroy_resource(Resource } } -#include "moc_tearingcontrol_v1_interface.cpp" +#include "moc_tearingcontrol_v1.cpp" diff --git a/src/wayland/tearingcontrol_v1_interface.h b/src/wayland/tearingcontrol_v1.h similarity index 95% rename from src/wayland/tearingcontrol_v1_interface.h rename to src/wayland/tearingcontrol_v1.h index de2487ac6a..8f1e4e20be 100644 --- a/src/wayland/tearingcontrol_v1_interface.h +++ b/src/wayland/tearingcontrol_v1.h @@ -5,7 +5,7 @@ */ #pragma once -#include "surface_interface.h" +#include "surface.h" #include "qwayland-server-tearing-control-v1.h" diff --git a/src/wayland/tests/renderingservertest.cpp b/src/wayland/tests/renderingservertest.cpp index 3f1306d707..beeb203149 100644 --- a/src/wayland/tests/renderingservertest.cpp +++ b/src/wayland/tests/renderingservertest.cpp @@ -4,15 +4,15 @@ SPDX-License-Identifier: LGPL-2.1-only OR LGPL-3.0-only OR LicenseRef-KDE-Accepted-LGPL */ -#include "core/graphicsbufferview.h" -#include "../compositor_interface.h" -#include "../datadevicemanager_interface.h" +#include "../compositor.h" +#include "../datadevicemanager.h" #include "../display.h" -#include "../keyboard_interface.h" -#include "../output_interface.h" -#include "../pointer_interface.h" -#include "../seat_interface.h" -#include "../xdgshell_interface.h" +#include "../keyboard.h" +#include "../output.h" +#include "../pointer.h" +#include "../seat.h" +#include "../xdgshell.h" +#include "core/graphicsbufferview.h" #include "fakeoutput.h" diff --git a/src/wayland/tests/waylandservertest.cpp b/src/wayland/tests/waylandservertest.cpp index 6f97162a66..7886c3962a 100644 --- a/src/wayland/tests/waylandservertest.cpp +++ b/src/wayland/tests/waylandservertest.cpp @@ -3,11 +3,11 @@ SPDX-License-Identifier: LGPL-2.1-only OR LGPL-3.0-only OR LicenseRef-KDE-Accepted-LGPL */ -#include "../compositor_interface.h" +#include "../compositor.h" #include "../display.h" -#include "../output_interface.h" -#include "../seat_interface.h" -#include "../xdgshell_interface.h" +#include "../output.h" +#include "../seat.h" +#include "../xdgshell.h" #include "fakeoutput.h" diff --git a/src/wayland/textinput_v1_interface.cpp b/src/wayland/textinput_v1.cpp similarity index 98% rename from src/wayland/textinput_v1_interface.cpp rename to src/wayland/textinput_v1.cpp index 4eb2bc6beb..4542b19791 100644 --- a/src/wayland/textinput_v1_interface.cpp +++ b/src/wayland/textinput_v1.cpp @@ -3,14 +3,14 @@ SPDX-License-Identifier: LGPL-2.1-only OR LGPL-3.0-only OR LicenseRef-KDE-Accepted-LGPL */ -#include "wayland/textinput_v1_interface.h" +#include "wayland/textinput_v1.h" #include "display.h" -#include "seat_interface_p.h" -#include "surface_interface_p.h" -#include "textinput_v1_interface_p.h" +#include "seat_p.h" +#include "surface_p.h" +#include "textinput_v1_p.h" #include "wayland/display_p.h" -#include "wayland/seat_interface.h" -#include "wayland/surface_interface.h" +#include "wayland/seat.h" +#include "wayland/surface.h" #include namespace KWaylandServer @@ -548,4 +548,4 @@ bool TextInputV1Interface::clientSupportsTextInput(ClientConnection *client) con } } -#include "moc_textinput_v1_interface.cpp" +#include "moc_textinput_v1.cpp" diff --git a/src/wayland/textinput_v1_interface.h b/src/wayland/textinput_v1.h similarity index 100% rename from src/wayland/textinput_v1_interface.h rename to src/wayland/textinput_v1.h diff --git a/src/wayland/textinput_v1_interface_p.h b/src/wayland/textinput_v1_p.h similarity index 96% rename from src/wayland/textinput_v1_interface_p.h rename to src/wayland/textinput_v1_p.h index 417b0fac42..153e065b2a 100644 --- a/src/wayland/textinput_v1_interface_p.h +++ b/src/wayland/textinput_v1_p.h @@ -6,10 +6,10 @@ #pragma once #include "clientconnection.h" -#include "wayland/seat_interface.h" -#include "wayland/seat_interface_p.h" -#include "wayland/surface_interface.h" -#include "wayland/textinput_v1_interface.h" +#include "wayland/seat.h" +#include "wayland/seat_p.h" +#include "wayland/surface.h" +#include "wayland/textinput_v1.h" #include #include diff --git a/src/wayland/textinput_v2_interface.cpp b/src/wayland/textinput_v2.cpp similarity index 99% rename from src/wayland/textinput_v2_interface.cpp rename to src/wayland/textinput_v2.cpp index ff80127be6..2517f42dea 100644 --- a/src/wayland/textinput_v2_interface.cpp +++ b/src/wayland/textinput_v2.cpp @@ -4,9 +4,9 @@ SPDX-License-Identifier: LGPL-2.1-only OR LGPL-3.0-only OR LicenseRef-KDE-Accepted-LGPL */ #include "display.h" -#include "seat_interface_p.h" -#include "surface_interface_p.h" -#include "textinput_v2_interface_p.h" +#include "seat_p.h" +#include "surface_p.h" +#include "textinput_v2_p.h" namespace KWaylandServer { @@ -558,4 +558,4 @@ bool TextInputV2Interface::clientSupportsTextInput(ClientConnection *client) con } } -#include "moc_textinput_v2_interface.cpp" +#include "moc_textinput_v2.cpp" diff --git a/src/wayland/textinput_v2_interface.h b/src/wayland/textinput_v2.h similarity index 100% rename from src/wayland/textinput_v2_interface.h rename to src/wayland/textinput_v2.h diff --git a/src/wayland/textinput_v2_interface_p.h b/src/wayland/textinput_v2_p.h similarity index 98% rename from src/wayland/textinput_v2_interface_p.h rename to src/wayland/textinput_v2_p.h index 9fadba5585..bc76770abc 100644 --- a/src/wayland/textinput_v2_interface_p.h +++ b/src/wayland/textinput_v2_p.h @@ -6,7 +6,7 @@ #pragma once #include "clientconnection.h" -#include "textinput_v2_interface.h" +#include "textinput_v2.h" #include #include diff --git a/src/wayland/textinput_v3_interface.cpp b/src/wayland/textinput_v3.cpp similarity index 99% rename from src/wayland/textinput_v3_interface.cpp rename to src/wayland/textinput_v3.cpp index 7ddefc817d..7128c64d9f 100644 --- a/src/wayland/textinput_v3_interface.cpp +++ b/src/wayland/textinput_v3.cpp @@ -6,9 +6,9 @@ */ #include "display.h" -#include "seat_interface.h" -#include "surface_interface_p.h" -#include "textinput_v3_interface_p.h" +#include "seat.h" +#include "surface_p.h" +#include "textinput_v3_p.h" namespace KWaylandServer { @@ -492,4 +492,4 @@ bool TextInputV3Interface::clientSupportsTextInput(ClientConnection *client) con } } -#include "moc_textinput_v3_interface.cpp" +#include "moc_textinput_v3.cpp" diff --git a/src/wayland/textinput_v3_interface.h b/src/wayland/textinput_v3.h similarity index 100% rename from src/wayland/textinput_v3_interface.h rename to src/wayland/textinput_v3.h diff --git a/src/wayland/textinput_v3_interface_p.h b/src/wayland/textinput_v3_p.h similarity index 99% rename from src/wayland/textinput_v3_interface_p.h rename to src/wayland/textinput_v3_p.h index d18b7d6da7..88a182e98f 100644 --- a/src/wayland/textinput_v3_interface_p.h +++ b/src/wayland/textinput_v3_p.h @@ -6,7 +6,7 @@ #pragma once #include "clientconnection.h" -#include "textinput_v3_interface.h" +#include "textinput_v3.h" #include #include diff --git a/src/wayland/touch_interface.cpp b/src/wayland/touch.cpp similarity index 95% rename from src/wayland/touch_interface.cpp rename to src/wayland/touch.cpp index 4d76c8d417..6a1a92862c 100644 --- a/src/wayland/touch_interface.cpp +++ b/src/wayland/touch.cpp @@ -5,12 +5,12 @@ SPDX-License-Identifier: LGPL-2.1-only OR LGPL-3.0-only OR LicenseRef-KDE-Accepted-LGPL */ -#include "touch_interface.h" +#include "touch.h" #include "clientconnection.h" #include "display.h" -#include "seat_interface.h" -#include "surface_interface.h" -#include "touch_interface_p.h" +#include "seat.h" +#include "surface.h" +#include "touch_p.h" namespace KWaylandServer { @@ -128,4 +128,4 @@ void TouchInterface::sendDown(qint32 id, quint32 serial, const QPointF &localPos } // namespace KWaylandServer -#include "moc_touch_interface.cpp" +#include "moc_touch.cpp" diff --git a/src/wayland/touch_interface.h b/src/wayland/touch.h similarity index 100% rename from src/wayland/touch_interface.h rename to src/wayland/touch.h diff --git a/src/wayland/touch_interface_p.h b/src/wayland/touch_p.h similarity index 96% rename from src/wayland/touch_interface_p.h rename to src/wayland/touch_p.h index 9ab9c69c50..6f2e53b0c0 100644 --- a/src/wayland/touch_interface_p.h +++ b/src/wayland/touch_p.h @@ -6,7 +6,7 @@ #pragma once -#include "touch_interface.h" +#include "touch.h" #include "qwayland-server-wayland.h" diff --git a/src/wayland/transaction.cpp b/src/wayland/transaction.cpp index a564c1ce09..aeaaf7d16e 100644 --- a/src/wayland/transaction.cpp +++ b/src/wayland/transaction.cpp @@ -6,8 +6,8 @@ #include "wayland/transaction.h" #include "utils/filedescriptor.h" -#include "wayland/subcompositor_interface.h" -#include "wayland/surface_interface_p.h" +#include "wayland/subcompositor.h" +#include "wayland/surface_p.h" #include "wayland/transaction_p.h" using namespace KWin; diff --git a/src/wayland/viewporter_interface.cpp b/src/wayland/viewporter.cpp similarity index 97% rename from src/wayland/viewporter_interface.cpp rename to src/wayland/viewporter.cpp index dde62a32b8..a6cdae28db 100644 --- a/src/wayland/viewporter_interface.cpp +++ b/src/wayland/viewporter.cpp @@ -4,10 +4,10 @@ SPDX-License-Identifier: LGPL-2.1-only OR LGPL-3.0-only OR LicenseRef-KDE-Accepted-LGPL */ -#include "viewporter_interface.h" +#include "viewporter.h" #include "display.h" -#include "surface_interface_p.h" -#include "viewporter_interface_p.h" +#include "surface_p.h" +#include "viewporter_p.h" static const int s_version = 1; @@ -145,4 +145,4 @@ ViewporterInterface::~ViewporterInterface() } // namespace KWaylandServer -#include "moc_viewporter_interface.cpp" +#include "moc_viewporter.cpp" diff --git a/src/wayland/viewporter_interface.h b/src/wayland/viewporter.h similarity index 100% rename from src/wayland/viewporter_interface.h rename to src/wayland/viewporter.h diff --git a/src/wayland/viewporter_interface_p.h b/src/wayland/viewporter_p.h similarity index 100% rename from src/wayland/viewporter_interface_p.h rename to src/wayland/viewporter_p.h diff --git a/src/wayland/xdgactivation_v1_interface.cpp b/src/wayland/xdgactivation_v1.cpp similarity index 96% rename from src/wayland/xdgactivation_v1_interface.cpp rename to src/wayland/xdgactivation_v1.cpp index 8b16341b2c..ee19bc552e 100644 --- a/src/wayland/xdgactivation_v1_interface.cpp +++ b/src/wayland/xdgactivation_v1.cpp @@ -4,10 +4,10 @@ SPDX-License-Identifier: LGPL-2.1-only OR LGPL-3.0-only OR LicenseRef-KDE-Accepted-LGPL */ -#include "xdgactivation_v1_interface.h" +#include "xdgactivation_v1.h" #include "display.h" -#include "seat_interface.h" -#include "surface_interface.h" +#include "seat.h" +#include "surface.h" #include "qwayland-server-xdg-activation-v1.h" @@ -137,4 +137,4 @@ void XdgActivationV1Interface::setActivationTokenCreator(const CreatorFunction & } -#include "moc_xdgactivation_v1_interface.cpp" +#include "moc_xdgactivation_v1.cpp" diff --git a/src/wayland/xdgactivation_v1_interface.h b/src/wayland/xdgactivation_v1.h similarity index 100% rename from src/wayland/xdgactivation_v1_interface.h rename to src/wayland/xdgactivation_v1.h diff --git a/src/wayland/xdgdecoration_v1_interface.cpp b/src/wayland/xdgdecoration_v1.cpp similarity index 96% rename from src/wayland/xdgdecoration_v1_interface.cpp rename to src/wayland/xdgdecoration_v1.cpp index 8a15195626..7463bf1e07 100644 --- a/src/wayland/xdgdecoration_v1_interface.cpp +++ b/src/wayland/xdgdecoration_v1.cpp @@ -4,10 +4,10 @@ SPDX-License-Identifier: LGPL-2.1-only OR LGPL-3.0-only OR LicenseRef-KDE-Accepted-LGPL */ -#include "xdgdecoration_v1_interface.h" +#include "xdgdecoration_v1.h" #include "display.h" -#include "xdgdecoration_v1_interface_p.h" -#include "xdgshell_interface_p.h" +#include "xdgdecoration_v1_p.h" +#include "xdgshell_p.h" namespace KWaylandServer { @@ -141,4 +141,4 @@ XdgToplevelDecorationV1Interface *XdgToplevelDecorationV1Interface::get(XdgTople } // namespace KWaylandServer -#include "moc_xdgdecoration_v1_interface.cpp" +#include "moc_xdgdecoration_v1.cpp" diff --git a/src/wayland/xdgdecoration_v1_interface.h b/src/wayland/xdgdecoration_v1.h similarity index 100% rename from src/wayland/xdgdecoration_v1_interface.h rename to src/wayland/xdgdecoration_v1.h diff --git a/src/wayland/xdgdecoration_v1_interface_p.h b/src/wayland/xdgdecoration_v1_p.h similarity index 97% rename from src/wayland/xdgdecoration_v1_interface_p.h rename to src/wayland/xdgdecoration_v1_p.h index 432e794edb..cb2a32d017 100644 --- a/src/wayland/xdgdecoration_v1_interface_p.h +++ b/src/wayland/xdgdecoration_v1_p.h @@ -6,7 +6,7 @@ #pragma once -#include "xdgdecoration_v1_interface.h" +#include "xdgdecoration_v1.h" #include "qwayland-server-xdg-decoration-unstable-v1.h" diff --git a/src/wayland/xdgforeign_v2_interface.cpp b/src/wayland/xdgforeign_v2.cpp similarity index 98% rename from src/wayland/xdgforeign_v2_interface.cpp rename to src/wayland/xdgforeign_v2.cpp index 14780b1939..8166ec6508 100644 --- a/src/wayland/xdgforeign_v2_interface.cpp +++ b/src/wayland/xdgforeign_v2.cpp @@ -6,7 +6,7 @@ */ #include "display.h" -#include "xdgforeign_v2_interface_p.h" +#include "xdgforeign_v2_p.h" #include @@ -263,6 +263,5 @@ void XdgImportedV2Interface::handleExportedDestroyed() } -#include "moc_xdgforeign_v2_interface_p.cpp" - -#include "moc_xdgforeign_v2_interface.cpp" +#include "moc_xdgforeign_v2.cpp" +#include "moc_xdgforeign_v2_p.cpp" diff --git a/src/wayland/xdgforeign_v2_interface.h b/src/wayland/xdgforeign_v2.h similarity index 100% rename from src/wayland/xdgforeign_v2_interface.h rename to src/wayland/xdgforeign_v2.h diff --git a/src/wayland/xdgforeign_v2_interface_p.h b/src/wayland/xdgforeign_v2_p.h similarity index 98% rename from src/wayland/xdgforeign_v2_interface_p.h rename to src/wayland/xdgforeign_v2_p.h index f6bec3d78f..7054e40bb5 100644 --- a/src/wayland/xdgforeign_v2_interface_p.h +++ b/src/wayland/xdgforeign_v2_p.h @@ -6,8 +6,8 @@ */ #pragma once -#include "surface_interface_p.h" -#include "xdgforeign_v2_interface.h" +#include "surface_p.h" +#include "xdgforeign_v2.h" #include diff --git a/src/wayland/xdgoutput_v1_interface.cpp b/src/wayland/xdgoutput_v1.cpp similarity index 98% rename from src/wayland/xdgoutput_v1_interface.cpp rename to src/wayland/xdgoutput_v1.cpp index 8125ef3a10..993c6e4d40 100644 --- a/src/wayland/xdgoutput_v1_interface.cpp +++ b/src/wayland/xdgoutput_v1.cpp @@ -4,9 +4,9 @@ SPDX-License-Identifier: LGPL-2.1-only OR LGPL-3.0-only OR LicenseRef-KDE-Accepted-LGPL */ -#include "xdgoutput_v1_interface.h" +#include "xdgoutput_v1.h" #include "display.h" -#include "output_interface.h" +#include "output.h" #include "qwayland-server-xdg-output-unstable-v1.h" @@ -217,4 +217,4 @@ void XdgOutputV1Interface::resend() } } -#include "moc_xdgoutput_v1_interface.cpp" +#include "moc_xdgoutput_v1.cpp" diff --git a/src/wayland/xdgoutput_v1_interface.h b/src/wayland/xdgoutput_v1.h similarity index 100% rename from src/wayland/xdgoutput_v1_interface.h rename to src/wayland/xdgoutput_v1.h diff --git a/src/wayland/xdgshell_interface.cpp b/src/wayland/xdgshell.cpp similarity index 99% rename from src/wayland/xdgshell_interface.cpp rename to src/wayland/xdgshell.cpp index 19de818dd8..d77b6fbd65 100644 --- a/src/wayland/xdgshell_interface.cpp +++ b/src/wayland/xdgshell.cpp @@ -4,12 +4,12 @@ SPDX-License-Identifier: LGPL-2.1-only OR LGPL-3.0-only OR LicenseRef-KDE-Accepted-LGPL */ -#include "xdgshell_interface.h" -#include "xdgshell_interface_p.h" +#include "xdgshell.h" +#include "xdgshell_p.h" #include "display.h" -#include "output_interface.h" -#include "seat_interface.h" +#include "output.h" +#include "seat.h" #include "utils.h" #include "utils/common.h" @@ -1161,4 +1161,4 @@ XdgPositioner::XdgPositioner(const QSharedDataPointer &data) } // namespace KWaylandServer -#include "moc_xdgshell_interface.cpp" +#include "moc_xdgshell.cpp" diff --git a/src/wayland/xdgshell_interface.h b/src/wayland/xdgshell.h similarity index 100% rename from src/wayland/xdgshell_interface.h rename to src/wayland/xdgshell.h diff --git a/src/wayland/xdgshell_interface_p.h b/src/wayland/xdgshell_p.h similarity index 99% rename from src/wayland/xdgshell_interface_p.h rename to src/wayland/xdgshell_p.h index 99d2ea0d2c..62b0152078 100644 --- a/src/wayland/xdgshell_interface_p.h +++ b/src/wayland/xdgshell_p.h @@ -7,9 +7,9 @@ #pragma once #include "qwayland-server-xdg-shell.h" -#include "xdgshell_interface.h" +#include "xdgshell.h" -#include "surface_interface_p.h" +#include "surface_p.h" namespace KWaylandServer { diff --git a/src/wayland/xdgtopleveldrag_v1_interface.cpp b/src/wayland/xdgtopleveldrag_v1.cpp similarity index 94% rename from src/wayland/xdgtopleveldrag_v1_interface.cpp rename to src/wayland/xdgtopleveldrag_v1.cpp index 540ce06c3d..6f476fc8ac 100644 --- a/src/wayland/xdgtopleveldrag_v1_interface.cpp +++ b/src/wayland/xdgtopleveldrag_v1.cpp @@ -4,19 +4,17 @@ SPDX-License-Identifier: LGPL-2.1-only OR LGPL-3.0-only OR LicenseRef-KDE-Accepted-LGPL */ -#include "xdgtopleveldrag_v1_interface.h" +#include "xdgtopleveldrag_v1.h" +#include "dataoffer.h" +#include "datasource.h" +#include "datasource_p.h" +#include "display.h" +#include "surface.h" +#include "utils.h" +#include "xdgshell.h" #include -#include "dataoffer_interface.h" -#include "datasource_interface.h" -#include "datasource_interface_p.h" -#include "xdgshell_interface.h" - -#include "display.h" -#include "surface_interface.h" -#include "utils.h" - #include #include diff --git a/src/wayland/xdgtopleveldrag_v1_interface.h b/src/wayland/xdgtopleveldrag_v1.h similarity index 97% rename from src/wayland/xdgtopleveldrag_v1_interface.h rename to src/wayland/xdgtopleveldrag_v1.h index febd30d052..9b14f9d9b3 100644 --- a/src/wayland/xdgtopleveldrag_v1_interface.h +++ b/src/wayland/xdgtopleveldrag_v1.h @@ -10,7 +10,7 @@ #include -#include "datadevice_interface.h" +#include "datadevice.h" struct wl_resource; diff --git a/src/wayland/xwaylandkeyboardgrab_v1_interface.cpp b/src/wayland/xwaylandkeyboardgrab_v1.cpp similarity index 96% rename from src/wayland/xwaylandkeyboardgrab_v1_interface.cpp rename to src/wayland/xwaylandkeyboardgrab_v1.cpp index 38402194e7..f73993308d 100644 --- a/src/wayland/xwaylandkeyboardgrab_v1_interface.cpp +++ b/src/wayland/xwaylandkeyboardgrab_v1.cpp @@ -4,13 +4,13 @@ SPDX-License-Identifier: LGPL-2.1-only OR LGPL-3.0-only OR LicenseRef-KDE-Accepted-LGPL */ -#include "xwaylandkeyboardgrab_v1_interface.h" +#include "xwaylandkeyboardgrab_v1.h" #include #include "display.h" -#include "seat_interface.h" -#include "surface_interface.h" +#include "seat.h" +#include "surface.h" constexpr int version = 1; @@ -109,4 +109,4 @@ XWaylandKeyboardGrabV1Interface::~XWaylandKeyboardGrabV1Interface() } -#include "moc_xwaylandkeyboardgrab_v1_interface.cpp" +#include "moc_xwaylandkeyboardgrab_v1.cpp" diff --git a/src/wayland/xwaylandkeyboardgrab_v1_interface.h b/src/wayland/xwaylandkeyboardgrab_v1.h similarity index 100% rename from src/wayland/xwaylandkeyboardgrab_v1_interface.h rename to src/wayland/xwaylandkeyboardgrab_v1.h diff --git a/src/wayland/xwaylandshell_v1_interface.cpp b/src/wayland/xwaylandshell_v1.cpp similarity index 97% rename from src/wayland/xwaylandshell_v1_interface.cpp rename to src/wayland/xwaylandshell_v1.cpp index 3d6cccec50..5368b26257 100644 --- a/src/wayland/xwaylandshell_v1_interface.cpp +++ b/src/wayland/xwaylandshell_v1.cpp @@ -4,9 +4,9 @@ SPDX-License-Identifier: LGPL-2.1-only OR LGPL-3.0-only OR LicenseRef-KDE-Accepted-LGPL */ -#include "xwaylandshell_v1_interface.h" +#include "xwaylandshell_v1.h" #include "display.h" -#include "surface_interface.h" +#include "surface.h" #include "qwayland-server-xwayland-shell-v1.h" @@ -175,4 +175,4 @@ std::optional XwaylandSurfaceV1Interface::serial() const } // namespace KWaylandServer -#include "moc_xwaylandshell_v1_interface.cpp" +#include "moc_xwaylandshell_v1.cpp" diff --git a/src/wayland/xwaylandshell_v1_interface.h b/src/wayland/xwaylandshell_v1.h similarity index 100% rename from src/wayland/xwaylandshell_v1_interface.h rename to src/wayland/xwaylandshell_v1.h diff --git a/src/wayland_server.cpp b/src/wayland_server.cpp index fbf0aa3468..ea2578fec9 100644 --- a/src/wayland_server.cpp +++ b/src/wayland_server.cpp @@ -20,54 +20,54 @@ #include "main.h" #include "utils/serviceutils.h" #include "virtualdesktops.h" -#include "wayland/appmenu_interface.h" -#include "wayland/compositor_interface.h" -#include "wayland/contenttype_v1_interface.h" -#include "wayland/cursorshape_v1_interface.h" -#include "wayland/datacontroldevicemanager_v1_interface.h" -#include "wayland/datadevicemanager_interface.h" +#include "wayland/appmenu.h" +#include "wayland/compositor.h" +#include "wayland/contenttype_v1.h" +#include "wayland/cursorshape_v1.h" +#include "wayland/datacontroldevicemanager_v1.h" +#include "wayland/datadevicemanager.h" #include "wayland/display.h" -#include "wayland/dpms_interface.h" +#include "wayland/dpms.h" #include "wayland/drmclientbuffer.h" -#include "wayland/drmlease_v1_interface.h" +#include "wayland/drmlease_v1.h" #include "wayland/filtered_display.h" -#include "wayland/fractionalscale_v1_interface.h" -#include "wayland/idle_interface.h" -#include "wayland/idleinhibit_v1_interface.h" -#include "wayland/idlenotify_v1_interface.h" -#include "wayland/inputmethod_v1_interface.h" -#include "wayland/keyboard_shortcuts_inhibit_v1_interface.h" -#include "wayland/keystate_interface.h" +#include "wayland/fractionalscale_v1.h" +#include "wayland/idle.h" +#include "wayland/idleinhibit_v1.h" +#include "wayland/idlenotify_v1.h" +#include "wayland/inputmethod_v1.h" +#include "wayland/keyboard_shortcuts_inhibit_v1.h" +#include "wayland/keystate.h" #include "wayland/linuxdmabufv1clientbuffer.h" -#include "wayland/lockscreen_overlay_v1_interface.h" -#include "wayland/output_interface.h" -#include "wayland/output_order_v1_interface.h" -#include "wayland/outputdevice_v2_interface.h" -#include "wayland/outputmanagement_v2_interface.h" -#include "wayland/plasmashell_interface.h" -#include "wayland/plasmavirtualdesktop_interface.h" -#include "wayland/plasmawindowmanagement_interface.h" -#include "wayland/pointerconstraints_v1_interface.h" -#include "wayland/pointergestures_v1_interface.h" -#include "wayland/primaryselectiondevicemanager_v1_interface.h" -#include "wayland/relativepointer_v1_interface.h" -#include "wayland/screenedge_v1_interface.h" -#include "wayland/seat_interface.h" -#include "wayland/server_decoration_interface.h" -#include "wayland/server_decoration_palette_interface.h" -#include "wayland/shadow_interface.h" -#include "wayland/subcompositor_interface.h" -#include "wayland/tablet_v2_interface.h" -#include "wayland/tearingcontrol_v1_interface.h" -#include "wayland/viewporter_interface.h" -#include "wayland/xdgactivation_v1_interface.h" -#include "wayland/xdgdecoration_v1_interface.h" -#include "wayland/xdgforeign_v2_interface.h" -#include "wayland/xdgoutput_v1_interface.h" -#include "wayland/xdgshell_interface.h" -#include "wayland/xdgtopleveldrag_v1_interface.h" -#include "wayland/xwaylandkeyboardgrab_v1_interface.h" -#include "wayland/xwaylandshell_v1_interface.h" +#include "wayland/lockscreen_overlay_v1.h" +#include "wayland/output.h" +#include "wayland/output_order_v1.h" +#include "wayland/outputdevice_v2.h" +#include "wayland/outputmanagement_v2.h" +#include "wayland/plasmashell.h" +#include "wayland/plasmavirtualdesktop.h" +#include "wayland/plasmawindowmanagement.h" +#include "wayland/pointerconstraints_v1.h" +#include "wayland/pointergestures_v1.h" +#include "wayland/primaryselectiondevicemanager_v1.h" +#include "wayland/relativepointer_v1.h" +#include "wayland/screenedge_v1.h" +#include "wayland/seat.h" +#include "wayland/server_decoration.h" +#include "wayland/server_decoration_palette.h" +#include "wayland/shadow.h" +#include "wayland/subcompositor.h" +#include "wayland/tablet_v2.h" +#include "wayland/tearingcontrol_v1.h" +#include "wayland/viewporter.h" +#include "wayland/xdgactivation_v1.h" +#include "wayland/xdgdecoration_v1.h" +#include "wayland/xdgforeign_v2.h" +#include "wayland/xdgoutput_v1.h" +#include "wayland/xdgshell.h" +#include "wayland/xdgtopleveldrag_v1.h" +#include "wayland/xwaylandkeyboardgrab_v1.h" +#include "wayland/xwaylandshell_v1.h" #include "workspace.h" #include "x11window.h" #include "xdgactivationv1.h" diff --git a/src/waylandwindow.cpp b/src/waylandwindow.cpp index 1504f1e6aa..c083102461 100644 --- a/src/waylandwindow.cpp +++ b/src/waylandwindow.cpp @@ -10,7 +10,7 @@ #include "scene/windowitem.h" #include "wayland/clientconnection.h" #include "wayland/display.h" -#include "wayland/surface_interface.h" +#include "wayland/surface.h" #include "wayland_server.h" #include "workspace.h" diff --git a/src/window.cpp b/src/window.cpp index e8fb3511b6..11e831f570 100644 --- a/src/window.cpp +++ b/src/window.cpp @@ -32,9 +32,9 @@ #include "tiles/tilemanager.h" #include "useractions.h" #include "virtualdesktops.h" -#include "wayland/output_interface.h" -#include "wayland/plasmawindowmanagement_interface.h" -#include "wayland/surface_interface.h" +#include "wayland/output.h" +#include "wayland/plasmawindowmanagement.h" +#include "wayland/surface.h" #include "wayland_server.h" #include "workspace.h" diff --git a/src/x11window.cpp b/src/x11window.cpp index d58b2ec344..a5855dd22a 100644 --- a/src/x11window.cpp +++ b/src/x11window.cpp @@ -30,7 +30,7 @@ #include "screenedge.h" #include "shadow.h" #include "virtualdesktops.h" -#include "wayland/surface_interface.h" +#include "wayland/surface.h" #include "wayland_server.h" #include "workspace.h" #include diff --git a/src/xdgactivationv1.cpp b/src/xdgactivationv1.cpp index d64ecd8aca..55845f83c8 100644 --- a/src/xdgactivationv1.cpp +++ b/src/xdgactivationv1.cpp @@ -11,9 +11,9 @@ #include "effects.h" #include "utils/common.h" #include "wayland/display.h" -#include "wayland/plasmawindowmanagement_interface.h" -#include "wayland/surface_interface.h" -#include "wayland/xdgactivation_v1_interface.h" +#include "wayland/plasmawindowmanagement.h" +#include "wayland/surface.h" +#include "wayland/xdgactivation_v1.h" #include "wayland_server.h" #include "window.h" #include "workspace.h" diff --git a/src/xdgshellintegration.cpp b/src/xdgshellintegration.cpp index 03a7bbafba..8d5d0740c3 100644 --- a/src/xdgshellintegration.cpp +++ b/src/xdgshellintegration.cpp @@ -6,7 +6,7 @@ #include "xdgshellintegration.h" #include "wayland/display.h" -#include "wayland/xdgshell_interface.h" +#include "wayland/xdgshell.h" #include "wayland_server.h" #include "workspace.h" #include "xdgshellwindow.h" diff --git a/src/xdgshellwindow.cpp b/src/xdgshellwindow.cpp index c243f271ef..3ce7d19d1b 100644 --- a/src/xdgshellwindow.cpp +++ b/src/xdgshellwindow.cpp @@ -19,14 +19,14 @@ #include "touch_input.h" #include "utils/subsurfacemonitor.h" #include "virtualdesktops.h" -#include "wayland/appmenu_interface.h" -#include "wayland/output_interface.h" -#include "wayland/plasmashell_interface.h" -#include "wayland/seat_interface.h" -#include "wayland/server_decoration_interface.h" -#include "wayland/server_decoration_palette_interface.h" -#include "wayland/surface_interface.h" -#include "wayland/xdgdecoration_v1_interface.h" +#include "wayland/appmenu.h" +#include "wayland/output.h" +#include "wayland/plasmashell.h" +#include "wayland/seat.h" +#include "wayland/server_decoration.h" +#include "wayland/server_decoration_palette.h" +#include "wayland/surface.h" +#include "wayland/xdgdecoration_v1.h" #include "wayland_server.h" #include "workspace.h" diff --git a/src/xdgshellwindow.h b/src/xdgshellwindow.h index 07d99a5943..1a734c856e 100644 --- a/src/xdgshellwindow.h +++ b/src/xdgshellwindow.h @@ -11,7 +11,7 @@ #pragma once -#include "wayland/xdgshell_interface.h" +#include "wayland/xdgshell.h" #include "waylandwindow.h" #include diff --git a/src/xkb.cpp b/src/xkb.cpp index 2ce5d4d94b..5db8993853 100644 --- a/src/xkb.cpp +++ b/src/xkb.cpp @@ -11,9 +11,9 @@ #include "inputmethod.h" #include "utils/c_ptr.h" #include "utils/common.h" -#include "wayland/inputmethod_v1_interface.h" -#include "wayland/keyboard_interface.h" -#include "wayland/seat_interface.h" +#include "wayland/inputmethod_v1.h" +#include "wayland/keyboard.h" +#include "wayland/seat.h" // frameworks #include // Qt diff --git a/src/xwayland/clipboard.cpp b/src/xwayland/clipboard.cpp index 8e453f0f2d..c505305794 100644 --- a/src/xwayland/clipboard.cpp +++ b/src/xwayland/clipboard.cpp @@ -11,7 +11,7 @@ #include "datasource.h" #include "selection_source.h" -#include "wayland/seat_interface.h" +#include "wayland/seat.h" #include "wayland_server.h" #include "workspace.h" #include "x11window.h" diff --git a/src/xwayland/databridge.cpp b/src/xwayland/databridge.cpp index 265ebc31dd..fd6ed5ea25 100644 --- a/src/xwayland/databridge.cpp +++ b/src/xwayland/databridge.cpp @@ -15,9 +15,9 @@ #include "atoms.h" #include "wayland/clientconnection.h" -#include "wayland/datadevice_interface.h" -#include "wayland/datadevicemanager_interface.h" -#include "wayland/seat_interface.h" +#include "wayland/datadevice.h" +#include "wayland/datadevicemanager.h" +#include "wayland/seat.h" #include "wayland_server.h" #include "window.h" #include "workspace.h" diff --git a/src/xwayland/dnd.cpp b/src/xwayland/dnd.cpp index b195683a27..615f7d0f03 100644 --- a/src/xwayland/dnd.cpp +++ b/src/xwayland/dnd.cpp @@ -15,9 +15,9 @@ #include "selection_source.h" #include "atoms.h" -#include "wayland/compositor_interface.h" -#include "wayland/datasource_interface.h" -#include "wayland/seat_interface.h" +#include "wayland/compositor.h" +#include "wayland/datasource.h" +#include "wayland/seat.h" #include "wayland_server.h" #include "window.h" #include "workspace.h" diff --git a/src/xwayland/dnd.h b/src/xwayland/dnd.h index ccc78c9553..bd019b9512 100644 --- a/src/xwayland/dnd.h +++ b/src/xwayland/dnd.h @@ -10,7 +10,7 @@ #include "selection.h" -#include "wayland/datadevicemanager_interface.h" +#include "wayland/datadevicemanager.h" #include diff --git a/src/xwayland/drag_wl.cpp b/src/xwayland/drag_wl.cpp index 61a80c40e5..9ddb68d4b2 100644 --- a/src/xwayland/drag_wl.cpp +++ b/src/xwayland/drag_wl.cpp @@ -16,10 +16,10 @@ #include "xwldrophandler.h" #include "atoms.h" -#include "wayland/datadevice_interface.h" -#include "wayland/datasource_interface.h" -#include "wayland/seat_interface.h" -#include "wayland/surface_interface.h" +#include "wayland/datadevice.h" +#include "wayland/datasource.h" +#include "wayland/seat.h" +#include "wayland/surface.h" #include "wayland_server.h" #include "workspace.h" #include "x11window.h" diff --git a/src/xwayland/drag_wl.h b/src/xwayland/drag_wl.h index bf39698620..f24db20eb1 100644 --- a/src/xwayland/drag_wl.h +++ b/src/xwayland/drag_wl.h @@ -10,7 +10,7 @@ #include "drag.h" -#include "wayland/datadevicemanager_interface.h" +#include "wayland/datadevicemanager.h" #include #include diff --git a/src/xwayland/drag_x.cpp b/src/xwayland/drag_x.cpp index 1d81a834ce..a22a78e8bd 100644 --- a/src/xwayland/drag_x.cpp +++ b/src/xwayland/drag_x.cpp @@ -17,10 +17,10 @@ #include "xwayland.h" #include "atoms.h" -#include "wayland/datadevice_interface.h" -#include "wayland/datasource_interface.h" -#include "wayland/seat_interface.h" -#include "wayland/surface_interface.h" +#include "wayland/datadevice.h" +#include "wayland/datasource.h" +#include "wayland/seat.h" +#include "wayland/surface.h" #include "wayland_server.h" #include "window.h" #include "workspace.h" diff --git a/src/xwayland/drag_x.h b/src/xwayland/drag_x.h index cd39fb69aa..7abb77bde0 100644 --- a/src/xwayland/drag_x.h +++ b/src/xwayland/drag_x.h @@ -11,7 +11,7 @@ #include "datasource.h" #include "drag.h" -#include "wayland/datadevicemanager_interface.h" +#include "wayland/datadevicemanager.h" #include #include diff --git a/src/xwayland/primary.cpp b/src/xwayland/primary.cpp index e57dc10cbe..098f451174 100644 --- a/src/xwayland/primary.cpp +++ b/src/xwayland/primary.cpp @@ -12,7 +12,7 @@ #include "datasource.h" #include "selection_source.h" -#include "wayland/seat_interface.h" +#include "wayland/seat.h" #include "wayland_server.h" #include "workspace.h" #include "x11window.h" diff --git a/src/xwayland/selection_source.cpp b/src/xwayland/selection_source.cpp index 6cdb464968..d499cb7f99 100644 --- a/src/xwayland/selection_source.cpp +++ b/src/xwayland/selection_source.cpp @@ -11,9 +11,9 @@ #include "transfer.h" #include "atoms.h" -#include "wayland/datadevice_interface.h" -#include "wayland/datasource_interface.h" -#include "wayland/seat_interface.h" +#include "wayland/datadevice.h" +#include "wayland/datasource.h" +#include "wayland/seat.h" #include "wayland_server.h" #include diff --git a/src/xwayland/transfer.cpp b/src/xwayland/transfer.cpp index ede0de004d..4316873b4e 100644 --- a/src/xwayland/transfer.cpp +++ b/src/xwayland/transfer.cpp @@ -12,9 +12,9 @@ #include "xwayland.h" #include "atoms.h" -#include "wayland/datadevice_interface.h" -#include "wayland/datasource_interface.h" -#include "wayland/seat_interface.h" +#include "wayland/datadevice.h" +#include "wayland/datasource.h" +#include "wayland/seat.h" #include "wayland_server.h" #include "window.h" #include "workspace.h" diff --git a/src/xwayland/xwayland.cpp b/src/xwayland/xwayland.cpp index d79a3c4640..1f07cae7dc 100644 --- a/src/xwayland/xwayland.cpp +++ b/src/xwayland/xwayland.cpp @@ -32,9 +32,9 @@ #include "xwayland_logging.h" #include -#include -#include -#include +#include +#include +#include #include #include diff --git a/src/xwayland/xwldrophandler.cpp b/src/xwayland/xwldrophandler.cpp index 4d46b98b7c..f58c558601 100644 --- a/src/xwayland/xwldrophandler.cpp +++ b/src/xwayland/xwldrophandler.cpp @@ -12,7 +12,7 @@ #include "databridge.h" #include "dnd.h" #include "drag_wl.h" -#include "wayland/seat_interface.h" +#include "wayland/seat.h" #include "wayland_server.h" #include "workspace.h" #include "x11window.h" diff --git a/src/xwayland/xwldrophandler.h b/src/xwayland/xwldrophandler.h index 15f12a33d4..15c53f6698 100644 --- a/src/xwayland/xwldrophandler.h +++ b/src/xwayland/xwldrophandler.h @@ -10,7 +10,7 @@ #pragma once -#include "wayland/datadevice_interface.h" +#include "wayland/datadevice.h" #include