From 5d4cd7dcd32abc6b38e0e213b7e475ad0e735b5a Mon Sep 17 00:00:00 2001 From: Aleix Pol Date: Wed, 29 Apr 2020 15:59:23 +0200 Subject: [PATCH] Fix build --- src/wayland/CMakeLists.txt | 68 +++++++-------- src/wayland/KF5WaylandConfig.cmake.in | 14 ---- src/wayland/autotests/client/CMakeLists.txt | 82 +++++++++---------- .../autotests/client/test_compositor.cpp | 10 +-- .../autotests/client/test_datadevice.cpp | 22 ++--- .../autotests/client/test_datasource.cpp | 10 +-- .../autotests/client/test_drag_drop.cpp | 26 +++--- src/wayland/autotests/client/test_error.cpp | 14 ++-- .../autotests/client/test_fake_input.cpp | 8 +- src/wayland/autotests/client/test_idle.cpp | 10 +-- .../client/test_plasma_virtual_desktop.cpp | 16 ++-- .../client/test_plasma_window_model.cpp | 10 +-- .../autotests/client/test_plasmashell.cpp | 12 +-- .../client/test_pointer_constraints.cpp | 16 ++-- .../autotests/client/test_remote_access.cpp | 10 +-- .../autotests/client/test_selection.cpp | 20 ++--- .../client/test_server_side_decoration.cpp | 12 +-- .../test_server_side_decoration_palette.cpp | 14 ++-- src/wayland/autotests/client/test_shadow.cpp | 14 ++-- .../autotests/client/test_shm_pool.cpp | 10 +-- .../autotests/client/test_text_input.cpp | 16 ++-- .../autotests/client/test_wayland_appmenu.cpp | 14 ++-- .../autotests/client/test_wayland_blur.cpp | 14 ++-- .../client/test_wayland_connection_thread.cpp | 6 +- .../client/test_wayland_contrast.cpp | 14 ++-- .../autotests/client/test_wayland_filter.cpp | 14 ++-- .../client/test_wayland_fullscreen_shell.cpp | 6 +- .../autotests/client/test_wayland_output.cpp | 10 +-- .../client/test_wayland_outputdevice.cpp | 8 +- .../client/test_wayland_outputmanagement.cpp | 14 ++-- .../autotests/client/test_wayland_region.cpp | 10 +-- .../client/test_wayland_registry.cpp | 60 +++++--------- .../autotests/client/test_wayland_seat.cpp | 34 ++++---- .../autotests/client/test_wayland_shell.cpp | 16 ++-- .../autotests/client/test_wayland_slide.cpp | 14 ++-- .../client/test_wayland_subcompositor.cpp | 8 +- .../client/test_wayland_subsurface.cpp | 18 ++-- .../autotests/client/test_wayland_surface.cpp | 18 ++-- .../client/test_wayland_windowmanagement.cpp | 14 ++-- .../autotests/client/test_xdg_decoration.cpp | 14 ++-- .../autotests/client/test_xdg_foreign.cpp | 14 ++-- .../autotests/client/test_xdg_output.cpp | 12 +-- src/wayland/autotests/client/test_xdg_shell.h | 18 ++-- src/wayland/autotests/server/CMakeLists.txt | 10 +-- .../server/test_tablet_interface.cpp | 10 +-- src/wayland/seat_interface.cpp | 2 +- src/wayland/tests/CMakeLists.txt | 4 +- src/wayland/tests/copyclient.cpp | 26 +++--- src/wayland/tests/dpmstest.cpp | 8 +- src/wayland/tests/paneltest.cpp | 30 +++---- src/wayland/tests/pasteclient.cpp | 26 +++--- src/wayland/tests/plasmasurfacetest.cpp | 16 ++-- .../tests/qtwaylandintegrationtest.cpp | 18 ++-- src/wayland/tests/shadowtest.cpp | 16 ++-- src/wayland/tests/subsurfacetest.cpp | 26 +++--- src/wayland/tests/touchclienttest.cpp | 26 +++--- src/wayland/tests/xdgforeigntest.cpp | 18 ++-- src/wayland/tests/xdgtest.cpp | 22 ++--- 58 files changed, 492 insertions(+), 530 deletions(-) delete mode 100644 src/wayland/KF5WaylandConfig.cmake.in diff --git a/src/wayland/CMakeLists.txt b/src/wayland/CMakeLists.txt index 695df93300..b55a4b814b 100644 --- a/src/wayland/CMakeLists.txt +++ b/src/wayland/CMakeLists.txt @@ -76,61 +76,61 @@ ecm_qt_declare_logging_category(SERVER_LIB_SRCS ) ecm_add_wayland_server_protocol(SERVER_LIB_SRCS - PROTOCOL ${KWayland_SOURCE_DIR}/src/client/protocols/output-management.xml + PROTOCOL ${PLASMA_WAYLAND_PROTOCOLS_DIR}/output-management.xml BASENAME output-management ) ecm_add_wayland_server_protocol(SERVER_LIB_SRCS - PROTOCOL ${KWayland_SOURCE_DIR}/src/client/protocols/outputdevice.xml + PROTOCOL ${PLASMA_WAYLAND_PROTOCOLS_DIR}/outputdevice.xml BASENAME org_kde_kwin_outputdevice ) ecm_add_wayland_server_protocol(SERVER_LIB_SRCS - PROTOCOL ${KWayland_SOURCE_DIR}/src/client/protocols/plasma-shell.xml + PROTOCOL ${PLASMA_WAYLAND_PROTOCOLS_DIR}/plasma-shell.xml BASENAME plasma-shell ) ecm_add_wayland_server_protocol(SERVER_LIB_SRCS - PROTOCOL ${KWayland_SOURCE_DIR}/src/client/protocols/plasma-virtual-desktop.xml + PROTOCOL ${PLASMA_WAYLAND_PROTOCOLS_DIR}/plasma-virtual-desktop.xml BASENAME plasma-virtual-desktop ) ecm_add_wayland_server_protocol(SERVER_LIB_SRCS - PROTOCOL ${KWayland_SOURCE_DIR}/src/client/protocols/plasma-window-management.xml + PROTOCOL ${PLASMA_WAYLAND_PROTOCOLS_DIR}/plasma-window-management.xml BASENAME plasma-window-management ) ecm_add_wayland_server_protocol(SERVER_LIB_SRCS - PROTOCOL ${KWayland_SOURCE_DIR}/src/client/protocols/surface-extension.xml + PROTOCOL ${PLASMA_WAYLAND_PROTOCOLS_DIR}/surface-extension.xml BASENAME qt-surface-extension ) ecm_add_wayland_server_protocol(SERVER_LIB_SRCS - PROTOCOL ${KWayland_SOURCE_DIR}/src/client/protocols/idle.xml + PROTOCOL ${PLASMA_WAYLAND_PROTOCOLS_DIR}/idle.xml BASENAME idle ) ecm_add_wayland_server_protocol(SERVER_LIB_SRCS - PROTOCOL ${KWayland_SOURCE_DIR}/src/client/protocols/fake-input.xml + PROTOCOL ${PLASMA_WAYLAND_PROTOCOLS_DIR}/fake-input.xml BASENAME fake-input ) ecm_add_wayland_server_protocol(SERVER_LIB_SRCS - PROTOCOL ${KWayland_SOURCE_DIR}/src/client/protocols/shadow.xml + PROTOCOL ${PLASMA_WAYLAND_PROTOCOLS_DIR}/shadow.xml BASENAME shadow ) ecm_add_wayland_server_protocol(SERVER_LIB_SRCS - PROTOCOL ${KWayland_SOURCE_DIR}/src/client/protocols/dpms.xml + PROTOCOL ${PLASMA_WAYLAND_PROTOCOLS_DIR}/dpms.xml BASENAME dpms ) ecm_add_wayland_server_protocol(SERVER_LIB_SRCS - PROTOCOL ${KWayland_SOURCE_DIR}/src/client/protocols/blur.xml + PROTOCOL ${PLASMA_WAYLAND_PROTOCOLS_DIR}/blur.xml BASENAME blur ) ecm_add_wayland_server_protocol(SERVER_LIB_SRCS - PROTOCOL ${KWayland_SOURCE_DIR}/src/client/protocols/contrast.xml + PROTOCOL ${PLASMA_WAYLAND_PROTOCOLS_DIR}/contrast.xml BASENAME contrast ) @@ -140,22 +140,22 @@ ecm_add_wayland_server_protocol(SERVER_LIB_SRCS ) ecm_add_wayland_server_protocol(SERVER_LIB_SRCS - PROTOCOL ${KWayland_SOURCE_DIR}/src/client/protocols/slide.xml + PROTOCOL ${PLASMA_WAYLAND_PROTOCOLS_DIR}/slide.xml BASENAME slide ) ecm_add_wayland_server_protocol(SERVER_LIB_SRCS - PROTOCOL ${KWayland_SOURCE_DIR}/src/client/protocols/server-decoration.xml + PROTOCOL ${PLASMA_WAYLAND_PROTOCOLS_DIR}/server-decoration.xml BASENAME server_decoration ) ecm_add_wayland_server_protocol(SERVER_LIB_SRCS - PROTOCOL ${KWayland_SOURCE_DIR}/src/client/protocols/text-input.xml + PROTOCOL ${PLASMA_WAYLAND_PROTOCOLS_DIR}/text-input.xml BASENAME text ) ecm_add_wayland_server_protocol(SERVER_LIB_SRCS - PROTOCOL ${KWayland_SOURCE_DIR}/src/client/protocols/text-input-unstable-v2.xml + PROTOCOL ${PLASMA_WAYLAND_PROTOCOLS_DIR}/text-input-unstable-v2.xml BASENAME text-input-unstable-v2 ) @@ -185,17 +185,17 @@ ecm_add_wayland_server_protocol(SERVER_LIB_SRCS ) ecm_add_wayland_server_protocol(SERVER_LIB_SRCS - PROTOCOL ${KWayland_SOURCE_DIR}/src/client/protocols/appmenu.xml + PROTOCOL ${PLASMA_WAYLAND_PROTOCOLS_DIR}/appmenu.xml BASENAME appmenu ) ecm_add_wayland_server_protocol(SERVER_LIB_SRCS - PROTOCOL ${KWayland_SOURCE_DIR}/src/client/protocols/server-decoration-palette.xml + PROTOCOL ${PLASMA_WAYLAND_PROTOCOLS_DIR}/server-decoration-palette.xml BASENAME server_decoration_palette ) ecm_add_wayland_server_protocol(SERVER_LIB_SRCS - PROTOCOL ${KWayland_SOURCE_DIR}/src/client/protocols/remote-access.xml + PROTOCOL ${PLASMA_WAYLAND_PROTOCOLS_DIR}/remote-access.xml BASENAME remote-access ) @@ -215,12 +215,12 @@ ecm_add_wayland_server_protocol(SERVER_LIB_SRCS ) ecm_add_wayland_server_protocol(SERVER_LIB_SRCS - PROTOCOL ${KWayland_SOURCE_DIR}/src/client/protocols/wayland-eglstream-controller.xml + PROTOCOL ${PLASMA_WAYLAND_PROTOCOLS_DIR}/wayland-eglstream-controller.xml BASENAME eglstream-controller ) ecm_add_wayland_server_protocol(SERVER_LIB_SRCS - PROTOCOL ${KWayland_SOURCE_DIR}/src/client/protocols/keystate.xml + PROTOCOL ${PLASMA_WAYLAND_PROTOCOLS_DIR}/keystate.xml BASENAME keystate ) @@ -297,15 +297,15 @@ set(SERVER_GENERATED_SRCS set_source_files_properties(${SERVER_GENERATED_SRCS} PROPERTIES SKIP_AUTOMOC ON) -add_library(KF5WaylandServer ${SERVER_LIB_SRCS}) -add_library(KF5::WaylandServer ALIAS KF5WaylandServer) -ecm_generate_export_header(KF5WaylandServer +add_library(KWaylandServer ${SERVER_LIB_SRCS}) +add_library(Plasma::KWaylandServer ALIAS KWaylandServer) +ecm_generate_export_header(KWaylandServer BASE_NAME KWaylandServer EXPORT_FILE_NAME KWayland/Server/kwaylandserver_export.h GROUP_BASE_NAME KF - VERSION ${KF5_VERSION} + VERSION ${PROJECT_VERSION} DEPRECATED_BASE_VERSION 0 DEPRECATION_VERSIONS 5.5 5.28 5.50 5.52 5.69 ) @@ -313,9 +313,9 @@ ecm_generate_export_header(KF5WaylandServer # needs fixing of undeprecated API being still implemented using own deprecated API -target_include_directories(KF5WaylandServer INTERFACE "$") +target_include_directories(KWaylandServer INTERFACE "$") -target_link_libraries(KF5WaylandServer +target_link_libraries(KWaylandServer PUBLIC Qt5::Gui PRIVATE Wayland::Server @@ -323,12 +323,11 @@ target_link_libraries(KF5WaylandServer Qt5::Concurrent ) -set_target_properties(KF5WaylandServer PROPERTIES VERSION ${KWAYLAND_VERSION_STRING} - SOVERSION ${KWAYLAND_SOVERSION} - EXPORT_NAME WaylandServer +set_target_properties(KWaylandServer PROPERTIES VERSION ${KWAYLANDSERVER_VERSION_STRING} + SOVERSION ${KWAYLANDSERVER_SOVERSION} ) -install(TARGETS KF5WaylandServer EXPORT KF5WaylandTargets ${KF5_INSTALL_TARGETS_DEFAULT_ARGS}) +install(TARGETS KWaylandServer EXPORT KWaylandServerTargets ${KF5_INSTALL_TARGETS_DEFAULT_ARGS}) set(SERVER_LIB_HEADERS ${CMAKE_CURRENT_BINARY_DIR}/KWayland/Server/kwaylandserver_export.h @@ -388,14 +387,9 @@ set(SERVER_LIB_HEADERS install(FILES ${SERVER_LIB_HEADERS} - DESTINATION ${KF5_INCLUDE_INSTALL_DIR}/KWayland/Server COMPONENT Devel + DESTINATION ${KDE_INSTALL_INCLUDEDIR}/KWaylandServer COMPONENT Devel ) # make available to ecm_add_qch in parent folder set(KWaylandServer_APIDOX_SRCS ${SERVER_LIB_HEADERS} PARENT_SCOPE) set(KWaylandServer_APIDOX_BUILD_INCLUDE_DIRS ${CMAKE_CURRENT_BINARY_DIR} PARENT_SCOPE) - -include(ECMGeneratePriFile) -ecm_generate_pri_file(BASE_NAME KWaylandServer LIB_NAME KF5WaylandServer DEPS "core" FILENAME_VAR PRI_FILENAME INCLUDE_INSTALL_DIR ${KDE_INSTALL_INCLUDEDIR_KF5}) -install(FILES ${PRI_FILENAME} - DESTINATION ${ECM_MKSPECS_INSTALL_DIR}) diff --git a/src/wayland/KF5WaylandConfig.cmake.in b/src/wayland/KF5WaylandConfig.cmake.in deleted file mode 100644 index 963f5d77d6..0000000000 --- a/src/wayland/KF5WaylandConfig.cmake.in +++ /dev/null @@ -1,14 +0,0 @@ -@PACKAGE_INIT@ - -include(CMakeFindDependencyMacro) -find_dependency(Qt5Gui @REQUIRED_QT_VERSION@) - -include("${CMAKE_CURRENT_LIST_DIR}/KF5WaylandTargets.cmake") -@PACKAGE_INCLUDE_QCHTARGETS@ - -function(kwaylandtest testBinaryName) - - add_test(NAME ${testBinaryName}-kwayland-test COMMAND - @CMAKE_INSTALL_FULL_LIBEXECDIR@/org-kde-kf5-kwayland-testserver ${CMAKE_CURRENT_BINARY_DIR}/${testBinaryName} - ) -endfunction() diff --git a/src/wayland/autotests/client/CMakeLists.txt b/src/wayland/autotests/client/CMakeLists.txt index ad0e4575c9..39ceb6c26a 100644 --- a/src/wayland/autotests/client/CMakeLists.txt +++ b/src/wayland/autotests/client/CMakeLists.txt @@ -5,7 +5,7 @@ set( testWaylandConnectionThread_SRCS test_wayland_connection_thread.cpp ) add_executable(testWaylandConnectionThread ${testWaylandConnectionThread_SRCS}) -target_link_libraries( testWaylandConnectionThread Qt5::Test Qt5::Gui KF5::WaylandClient KF5::WaylandServer Wayland::Client Wayland::Server) +target_link_libraries( testWaylandConnectionThread Qt5::Test Qt5::Gui KF5::WaylandClient Plasma::KWaylandServer Wayland::Client Wayland::Server) add_test(NAME kwayland-testWaylandConnectionThread COMMAND testWaylandConnectionThread) ecm_mark_as_test(testWaylandConnectionThread) @@ -16,7 +16,7 @@ set( testWaylandRegistry_SRCS test_wayland_registry.cpp ) add_executable(testWaylandRegistry ${testWaylandRegistry_SRCS}) -target_link_libraries( testWaylandRegistry Qt5::Test Qt5::Gui KF5::WaylandClient KF5::WaylandServer Wayland::Client Wayland::Server) +target_link_libraries( testWaylandRegistry Qt5::Test Qt5::Gui KF5::WaylandClient Plasma::KWaylandServer Wayland::Client Wayland::Server) add_test(NAME kwayland-testWaylandRegistry COMMAND testWaylandRegistry) ecm_mark_as_test(testWaylandRegistry) @@ -45,7 +45,7 @@ set( testWaylandOutput_SRCS test_wayland_output.cpp ) add_executable(testWaylandOutput ${testWaylandOutput_SRCS}) -target_link_libraries( testWaylandOutput Qt5::Test Qt5::Gui KF5::WaylandClient KF5::WaylandServer Wayland::Client Wayland::Server) +target_link_libraries( testWaylandOutput Qt5::Test Qt5::Gui KF5::WaylandClient Plasma::KWaylandServer Wayland::Client Wayland::Server) add_test(NAME kwayland-testWaylandOutput COMMAND testWaylandOutput) ecm_mark_as_test(testWaylandOutput) @@ -56,7 +56,7 @@ set( testWaylandShell_SRCS test_wayland_shell.cpp ) add_executable(testWaylandShell ${testWaylandShell_SRCS}) -target_link_libraries( testWaylandShell Qt5::Test Qt5::Gui KF5::WaylandClient KF5::WaylandServer Wayland::Client Wayland::Server) +target_link_libraries( testWaylandShell Qt5::Test Qt5::Gui KF5::WaylandClient Plasma::KWaylandServer Wayland::Client Wayland::Server) add_test(NAME kwayland-testWaylandShell COMMAND testWaylandShell) ecm_mark_as_test(testWaylandShell) @@ -67,7 +67,7 @@ set( testWaylandSurface_SRCS test_wayland_surface.cpp ) add_executable(testWaylandSurface ${testWaylandSurface_SRCS}) -target_link_libraries( testWaylandSurface Qt5::Test Qt5::Gui KF5::WaylandClient KF5::WaylandServer Wayland::Client Wayland::Server) +target_link_libraries( testWaylandSurface Qt5::Test Qt5::Gui KF5::WaylandClient Plasma::KWaylandServer Wayland::Client Wayland::Server) add_test(NAME kwayland-testWaylandSurface COMMAND testWaylandSurface) ecm_mark_as_test(testWaylandSurface) @@ -79,7 +79,7 @@ if (HAVE_LINUX_INPUT_H) test_wayland_seat.cpp ) add_executable(testWaylandSeat ${testWaylandSeat_SRCS}) - target_link_libraries( testWaylandSeat Qt5::Test Qt5::Gui KF5::WaylandClient KF5::WaylandServer Wayland::Client Wayland::Server) + target_link_libraries( testWaylandSeat Qt5::Test Qt5::Gui KF5::WaylandClient Plasma::KWaylandServer Wayland::Client Wayland::Server) add_test(NAME kwayland-testWaylandSeat COMMAND testWaylandSeat) ecm_mark_as_test(testWaylandSeat) endif() @@ -91,7 +91,7 @@ set( testShmPool_SRCS test_shm_pool.cpp ) add_executable(testShmPool ${testShmPool_SRCS}) -target_link_libraries( testShmPool Qt5::Test Qt5::Gui KF5::WaylandClient KF5::WaylandServer) +target_link_libraries( testShmPool Qt5::Test Qt5::Gui KF5::WaylandClient Plasma::KWaylandServer) add_test(NAME kwayland-testShmPool COMMAND testShmPool) ecm_mark_as_test(testShmPool) @@ -102,7 +102,7 @@ set( test_wayland_outputmanagement_SRCS test_wayland_outputmanagement.cpp ) add_executable(testWaylandOutputManagement ${test_wayland_outputmanagement_SRCS}) -target_link_libraries( testWaylandOutputManagement Qt5::Test Qt5::Gui KF5::WaylandClient KF5::WaylandServer Wayland::Client) +target_link_libraries( testWaylandOutputManagement Qt5::Test Qt5::Gui KF5::WaylandClient Plasma::KWaylandServer Wayland::Client) add_test(NAME kwayland-testWaylandOutputManagement COMMAND testWaylandOutputManagement) ecm_mark_as_test(testWaylandOutputManagement) @@ -113,7 +113,7 @@ set( test_wayland_outputdevice_SRCS test_wayland_outputdevice.cpp ) add_executable(testWaylandOutputDevice ${test_wayland_outputdevice_SRCS}) -target_link_libraries( testWaylandOutputDevice Qt5::Test Qt5::Gui KF5::WaylandClient KF5::WaylandServer Wayland::Client) +target_link_libraries( testWaylandOutputDevice Qt5::Test Qt5::Gui KF5::WaylandClient Plasma::KWaylandServer Wayland::Client) add_test(NAME kwayland-testWaylandOutputDevice COMMAND testWaylandOutputDevice) ecm_mark_as_test(testWaylandOutputDevice) @@ -124,7 +124,7 @@ set( testCompositor_SRCS test_compositor.cpp ) add_executable(testCompositor ${testCompositor_SRCS}) -target_link_libraries( testCompositor Qt5::Test Qt5::Gui KF5::WaylandClient KF5::WaylandServer) +target_link_libraries( testCompositor Qt5::Test Qt5::Gui KF5::WaylandClient Plasma::KWaylandServer) add_test(NAME kwayland-testCompositor COMMAND testCompositor) ecm_mark_as_test(testCompositor) @@ -135,7 +135,7 @@ set( testSubCompositor_SRCS test_wayland_subcompositor.cpp ) add_executable(testSubCompositor ${testSubCompositor_SRCS}) -target_link_libraries( testSubCompositor Qt5::Test Qt5::Gui KF5::WaylandClient KF5::WaylandServer) +target_link_libraries( testSubCompositor Qt5::Test Qt5::Gui KF5::WaylandClient Plasma::KWaylandServer) add_test(NAME kwayland-testSubCompositor COMMAND testSubCompositor) ecm_mark_as_test(testSubCompositor) @@ -147,7 +147,7 @@ set( testSubSurface_SRCS test_wayland_subsurface.cpp ) add_executable(testSubSurface ${testSubSurface_SRCS}) -target_link_libraries( testSubSurface Qt5::Test Qt5::Gui KF5::WaylandClient KF5::WaylandServer Wayland::Client) +target_link_libraries( testSubSurface Qt5::Test Qt5::Gui KF5::WaylandClient Plasma::KWaylandServer Wayland::Client) add_test(NAME kwayland-testSubSurface COMMAND testSubSurface) ecm_mark_as_test(testSubSurface) @@ -158,7 +158,7 @@ set( testRegion_SRCS test_wayland_region.cpp ) add_executable(testRegion ${testRegion_SRCS}) -target_link_libraries( testRegion Qt5::Test Qt5::Gui KF5::WaylandClient KF5::WaylandServer) +target_link_libraries( testRegion Qt5::Test Qt5::Gui KF5::WaylandClient Plasma::KWaylandServer) add_test(NAME kwayland-testRegion COMMAND testRegion) ecm_mark_as_test(testRegion) @@ -169,7 +169,7 @@ set( testBlur_SRCS test_wayland_blur.cpp ) add_executable(testBlur ${testBlur_SRCS}) -target_link_libraries( testBlur Qt5::Test Qt5::Gui KF5::WaylandClient KF5::WaylandServer) +target_link_libraries( testBlur Qt5::Test Qt5::Gui KF5::WaylandClient Plasma::KWaylandServer) add_test(NAME kwayland-testBlur COMMAND testBlur) ecm_mark_as_test(testBlur) @@ -180,7 +180,7 @@ set( testContrast_SRCS test_wayland_contrast.cpp ) add_executable(testContrast ${testContrast_SRCS}) -target_link_libraries( testContrast Qt5::Test Qt5::Gui KF5::WaylandClient KF5::WaylandServer Wayland::Client) +target_link_libraries( testContrast Qt5::Test Qt5::Gui KF5::WaylandClient Plasma::KWaylandServer Wayland::Client) add_test(NAME kwayland-testContrast COMMAND testContrast) ecm_mark_as_test(testContrast) @@ -191,7 +191,7 @@ set( testSlide_SRCS test_wayland_slide.cpp ) add_executable(testSlide ${testSlide_SRCS}) -target_link_libraries( testSlide Qt5::Test Qt5::Gui KF5::WaylandClient KF5::WaylandServer Wayland::Client) +target_link_libraries( testSlide Qt5::Test Qt5::Gui KF5::WaylandClient Plasma::KWaylandServer Wayland::Client) add_test(NAME kwayland-testSlide COMMAND testSlide) ecm_mark_as_test(testSlide) @@ -202,7 +202,7 @@ set( testWindowmanagement_SRCS test_wayland_windowmanagement.cpp ) add_executable(testWindowmanagement ${testWindowmanagement_SRCS}) -target_link_libraries( testWindowmanagement Qt5::Test Qt5::Gui KF5::WaylandClient KF5::WaylandServer Wayland::Client) +target_link_libraries( testWindowmanagement Qt5::Test Qt5::Gui KF5::WaylandClient Plasma::KWaylandServer Wayland::Client) add_test(NAME kwayland-testWindowmanagement COMMAND testWindowmanagement) ecm_mark_as_test(testWindowmanagement) @@ -213,7 +213,7 @@ set( testDataSource_SRCS test_datasource.cpp ) add_executable(testDataSource ${testDataSource_SRCS}) -target_link_libraries( testDataSource Qt5::Test Qt5::Gui KF5::WaylandClient KF5::WaylandServer Wayland::Client) +target_link_libraries( testDataSource Qt5::Test Qt5::Gui KF5::WaylandClient Plasma::KWaylandServer Wayland::Client) add_test(NAME kwayland-testDataSource COMMAND testDataSource) ecm_mark_as_test(testDataSource) @@ -224,7 +224,7 @@ set( testDataDevice_SRCS test_datadevice.cpp ) add_executable(testDataDevice ${testDataDevice_SRCS}) -target_link_libraries( testDataDevice Qt5::Test Qt5::Gui KF5::WaylandClient KF5::WaylandServer Wayland::Client) +target_link_libraries( testDataDevice Qt5::Test Qt5::Gui KF5::WaylandClient Plasma::KWaylandServer Wayland::Client) add_test(NAME kwayland-testDataDevice COMMAND testDataDevice) ecm_mark_as_test(testDataDevice) @@ -235,7 +235,7 @@ set( testServerSideDecoration_SRCS test_server_side_decoration.cpp ) add_executable(testServerSideDecoration ${testServerSideDecoration_SRCS}) -target_link_libraries( testServerSideDecoration Qt5::Test Qt5::Gui KF5::WaylandClient KF5::WaylandServer Wayland::Client) +target_link_libraries( testServerSideDecoration Qt5::Test Qt5::Gui KF5::WaylandClient Plasma::KWaylandServer Wayland::Client) add_test(NAME kwayland-testServerSideDecoration COMMAND testServerSideDecoration) ecm_mark_as_test(testServerSideDecoration) @@ -246,7 +246,7 @@ set( testDragAndDrop_SRCS test_drag_drop.cpp ) add_executable(testDragAndDrop ${testDragAndDrop_SRCS}) -target_link_libraries( testDragAndDrop Qt5::Test Qt5::Gui KF5::WaylandClient KF5::WaylandServer Wayland::Client) +target_link_libraries( testDragAndDrop Qt5::Test Qt5::Gui KF5::WaylandClient Plasma::KWaylandServer Wayland::Client) add_test(NAME kwayland-testDragAndDrop COMMAND testDragAndDrop) ecm_mark_as_test(testDragAndDrop) @@ -257,7 +257,7 @@ set( testPlasmaShell_SRCS test_plasmashell.cpp ) add_executable(testPlasmaShell ${testPlasmaShell_SRCS}) -target_link_libraries( testPlasmaShell Qt5::Test Qt5::Gui KF5::WaylandClient KF5::WaylandServer Wayland::Client) +target_link_libraries( testPlasmaShell Qt5::Test Qt5::Gui KF5::WaylandClient Plasma::KWaylandServer Wayland::Client) add_test(NAME kwayland-testPlasmaShell COMMAND testPlasmaShell) ecm_mark_as_test(testPlasmaShell) @@ -268,7 +268,7 @@ set( testIdle_SRCS test_idle.cpp ) add_executable(testIdle ${testIdle_SRCS}) -target_link_libraries( testIdle Qt5::Test Qt5::Gui KF5::WaylandClient KF5::WaylandServer) +target_link_libraries( testIdle Qt5::Test Qt5::Gui KF5::WaylandClient Plasma::KWaylandServer) add_test(NAME kwayland-testIdle COMMAND testIdle) ecm_mark_as_test(testIdle) @@ -279,7 +279,7 @@ set( testShadow_SRCS test_shadow.cpp ) add_executable(testShadow ${testShadow_SRCS}) -target_link_libraries( testShadow Qt5::Test Qt5::Gui KF5::WaylandClient KF5::WaylandServer) +target_link_libraries( testShadow Qt5::Test Qt5::Gui KF5::WaylandClient Plasma::KWaylandServer) add_test(NAME kwayland-testShadow COMMAND testShadow) ecm_mark_as_test(testShadow) @@ -291,7 +291,7 @@ if (HAVE_LINUX_INPUT_H) test_fake_input.cpp ) add_executable(testFakeInput ${testFakeInput_SRCS}) - target_link_libraries( testFakeInput Qt5::Test Qt5::Gui KF5::WaylandClient KF5::WaylandServer) + target_link_libraries( testFakeInput Qt5::Test Qt5::Gui KF5::WaylandClient Plasma::KWaylandServer) add_test(NAME kwayland-testFakeInput COMMAND testFakeInput) ecm_mark_as_test(testFakeInput) endif() @@ -304,7 +304,7 @@ if (HAVE_LINUX_INPUT_H) test_plasma_window_model.cpp ) add_executable(testPlasmaWindowModel ${testPlasmaWindowModel_SRCS}) - target_link_libraries( testPlasmaWindowModel Qt5::Test Qt5::Gui KF5::WaylandClient KF5::WaylandServer) + target_link_libraries( testPlasmaWindowModel Qt5::Test Qt5::Gui KF5::WaylandClient Plasma::KWaylandServer) add_test(NAME kwayland-testPlasmaWindowModel COMMAND testPlasmaWindowModel) ecm_mark_as_test(testPlasmaWindowModel) endif() @@ -316,7 +316,7 @@ set( testTextInput_SRCS test_text_input.cpp ) add_executable(testTextInput ${testTextInput_SRCS}) -target_link_libraries( testTextInput Qt5::Test Qt5::Gui KF5::WaylandClient KF5::WaylandServer) +target_link_libraries( testTextInput Qt5::Test Qt5::Gui KF5::WaylandClient Plasma::KWaylandServer) add_test(NAME kwayland-testTextInput COMMAND testTextInput) ecm_mark_as_test(testTextInput) @@ -327,7 +327,7 @@ set( testError_SRCS test_error.cpp ) add_executable(testError ${testError_SRCS}) -target_link_libraries( testError Qt5::Test Qt5::Gui KF5::WaylandClient KF5::WaylandServer Wayland::Client) +target_link_libraries( testError Qt5::Test Qt5::Gui KF5::WaylandClient Plasma::KWaylandServer Wayland::Client) add_test(NAME kwayland-testError COMMAND testError) ecm_mark_as_test(testError) @@ -338,7 +338,7 @@ set( testSelection_SRCS test_selection.cpp ) add_executable(testSelection ${testSelection_SRCS}) -target_link_libraries( testSelection Qt5::Test Qt5::Gui KF5::WaylandClient KF5::WaylandServer Wayland::Client) +target_link_libraries( testSelection Qt5::Test Qt5::Gui KF5::WaylandClient Plasma::KWaylandServer Wayland::Client) add_test(NAME kwayland-testSelection COMMAND testSelection) ecm_mark_as_test(testSelection) @@ -350,7 +350,7 @@ set( testXdgShellV5_SRCS test_xdg_shell_v5.cpp ) add_executable(testXdgShellV5 ${testXdgShellV5_SRCS}) -target_link_libraries( testXdgShellV5 Qt5::Test Qt5::Gui KF5::WaylandServer KF5::WaylandClient Wayland::Client) +target_link_libraries( testXdgShellV5 Qt5::Test Qt5::Gui Plasma::KWaylandServer KF5::WaylandClient Wayland::Client) add_test(NAME kwayland-testXdgShellV5 COMMAND testXdgShellV5) ecm_mark_as_test(testXdgShellV5) @@ -361,7 +361,7 @@ set( testXdgForeign_SRCS test_xdg_foreign.cpp ) add_executable(testXdgForeign ${testXdgForeign_SRCS}) -target_link_libraries( testXdgForeign Qt5::Test Qt5::Gui KF5::WaylandServer KF5::WaylandClient Wayland::Client) +target_link_libraries( testXdgForeign Qt5::Test Qt5::Gui Plasma::KWaylandServer KF5::WaylandClient Wayland::Client) add_test(NAME kwayland-testXdgForeign COMMAND testXdgForeign) ecm_mark_as_test(testXdgForeign) @@ -373,7 +373,7 @@ set( testXdgShellV6_SRCS test_xdg_shell_v6.cpp ) add_executable(testXdgShellV6 ${testXdgShellV6_SRCS}) -target_link_libraries( testXdgShellV6 Qt5::Test Qt5::Gui KF5::WaylandServer KF5::WaylandClient Wayland::Client) +target_link_libraries( testXdgShellV6 Qt5::Test Qt5::Gui Plasma::KWaylandServer KF5::WaylandClient Wayland::Client) add_test(NAME kwayland-testXdgShellV6 COMMAND testXdgShellV6) ecm_mark_as_test(testXdgShellV6) ######################################################## @@ -384,7 +384,7 @@ set( testXdgShellStable_SRCS test_xdg_shell_stable.cpp ) add_executable(testXdgShellStable ${testXdgShellStable_SRCS}) -target_link_libraries( testXdgShellStable Qt5::Test Qt5::Gui KF5::WaylandServer KF5::WaylandClient Wayland::Client) +target_link_libraries( testXdgShellStable Qt5::Test Qt5::Gui Plasma::KWaylandServer KF5::WaylandClient Wayland::Client) add_test(NAME kwayland-testXdgShellStable COMMAND testXdgShellStable) ecm_mark_as_test(testXdgShellStable) @@ -392,7 +392,7 @@ ecm_mark_as_test(testXdgShellStable) # Test Pointer Constraints ######################################################## add_executable(testPointerConstraints test_pointer_constraints.cpp) -target_link_libraries( testPointerConstraints Qt5::Test Qt5::Gui KF5::WaylandServer KF5::WaylandClient Wayland::Client) +target_link_libraries( testPointerConstraints Qt5::Test Qt5::Gui Plasma::KWaylandServer KF5::WaylandClient Wayland::Client) add_test(NAME kwayland-testPointerConstraints COMMAND testPointerConstraints) ecm_mark_as_test(testPointerConstraints) @@ -404,7 +404,7 @@ set( testFilter_SRCS test_wayland_filter.cpp ) add_executable(testFilter ${testFilter_SRCS}) -target_link_libraries( testFilter Qt5::Test Qt5::Gui KF5::WaylandClient KF5::WaylandServer Wayland::Server) +target_link_libraries( testFilter Qt5::Test Qt5::Gui KF5::WaylandClient Plasma::KWaylandServer Wayland::Server) add_test(NAME kwayland-testFilter COMMAND testFilter) ecm_mark_as_test(testFilter) @@ -415,7 +415,7 @@ set( testAppmenu_SRCS test_wayland_appmenu.cpp ) add_executable(testAppmenu ${testAppmenu_SRCS}) -target_link_libraries( testAppmenu Qt5::Test Qt5::Gui KF5::WaylandClient KF5::WaylandServer) +target_link_libraries( testAppmenu Qt5::Test Qt5::Gui KF5::WaylandClient Plasma::KWaylandServer) add_test(NAME kwayland-testAppmenu COMMAND testAppmenu) ecm_mark_as_test(testAppmenu) @@ -426,7 +426,7 @@ set( testServerSideDecorationPalette_SRCS test_server_side_decoration_palette.cpp ) add_executable(testServerSideDecorationPalette ${testServerSideDecorationPalette_SRCS}) -target_link_libraries( testServerSideDecorationPalette Qt5::Test Qt5::Gui KF5::WaylandClient KF5::WaylandServer) +target_link_libraries( testServerSideDecorationPalette Qt5::Test Qt5::Gui KF5::WaylandClient Plasma::KWaylandServer) add_test(NAME kwayland-testServerSideDecorationPalette COMMAND testServerSideDecorationPalette) ecm_mark_as_test(testServerSideDecorationPalette) @@ -437,7 +437,7 @@ set( testRemoteAccess_SRCS test_remote_access.cpp ) add_executable(testRemoteAccess ${testRemoteAccess_SRCS}) -target_link_libraries( testRemoteAccess Qt5::Test Qt5::Gui KF5::WaylandClient KF5::WaylandServer) +target_link_libraries( testRemoteAccess Qt5::Test Qt5::Gui KF5::WaylandClient Plasma::KWaylandServer) add_test(NAME kwayland-testRemoteAccess COMMAND testRemoteAccess) ecm_mark_as_test(testRemoteAccess) @@ -448,7 +448,7 @@ set( testPlasmaVirtualDesktop_SRCS test_plasma_virtual_desktop.cpp ) add_executable(testPlasmaVirtualDesktop ${testPlasmaVirtualDesktop_SRCS}) -target_link_libraries( testPlasmaVirtualDesktop Qt5::Test Qt5::Gui KF5::WaylandClient KF5::WaylandServer) +target_link_libraries( testPlasmaVirtualDesktop Qt5::Test Qt5::Gui KF5::WaylandClient Plasma::KWaylandServer) add_test(NAME kwayland-testPlasmaVirtualDesktop COMMAND testPlasmaVirtualDesktop) ecm_mark_as_test(testPlasmaVirtualDesktop) @@ -459,7 +459,7 @@ set( testXdgOutput_SRCS test_xdg_output.cpp ) add_executable(testXdgOutput ${testXdgOutput_SRCS}) -target_link_libraries( testXdgOutput Qt5::Test Qt5::Gui KF5::WaylandClient KF5::WaylandServer Wayland::Client Wayland::Server) +target_link_libraries( testXdgOutput Qt5::Test Qt5::Gui KF5::WaylandClient Plasma::KWaylandServer Wayland::Client Wayland::Server) add_test(NAME kwayland-testXdgOutput COMMAND testXdgOutput) ecm_mark_as_test(testXdgOutput) @@ -470,7 +470,7 @@ set( testXdgdecoration_SRCS test_xdg_decoration.cpp ) add_executable(testXdgDecoration ${testXdgdecoration_SRCS}) -target_link_libraries( testXdgDecoration Qt5::Test Qt5::Gui KF5::WaylandClient KF5::WaylandServer Wayland::Client Wayland::Server) +target_link_libraries( testXdgDecoration Qt5::Test Qt5::Gui KF5::WaylandClient Plasma::KWaylandServer Wayland::Client Wayland::Server) add_test(NAME kwayland-testXdgDecoration COMMAND testXdgDecoration) ecm_mark_as_test(testXdgDecoration) diff --git a/src/wayland/autotests/client/test_compositor.cpp b/src/wayland/autotests/client/test_compositor.cpp index 67b587231d..6a0f8da5f5 100644 --- a/src/wayland/autotests/client/test_compositor.cpp +++ b/src/wayland/autotests/client/test_compositor.cpp @@ -6,11 +6,11 @@ // Qt #include // KWin -#include "../../src/client/compositor.h" -#include "../../src/client/connection_thread.h" -#include "../../src/client/surface.h" -#include "../../src/client/registry.h" -#include "../../src/client/shm_pool.h" +#include "KWayland/Client/compositor.h" +#include "KWayland/Client/connection_thread.h" +#include "KWayland/Client/surface.h" +#include "KWayland/Client/registry.h" +#include "KWayland/Client/shm_pool.h" #include "../../src/server/buffer_interface.h" #include "../../src/server/compositor_interface.h" #include "../../src/server/display.h" diff --git a/src/wayland/autotests/client/test_datadevice.cpp b/src/wayland/autotests/client/test_datadevice.cpp index 7aec560624..56fb9d86cd 100644 --- a/src/wayland/autotests/client/test_datadevice.cpp +++ b/src/wayland/autotests/client/test_datadevice.cpp @@ -6,17 +6,17 @@ // Qt #include // KWayland -#include "../../src/client/connection_thread.h" -#include "../../src/client/event_queue.h" -#include "../../src/client/datadevice.h" -#include "../../src/client/datadevicemanager.h" -#include "../../src/client/datasource.h" -#include "../../src/client/compositor.h" -#include "../../src/client/keyboard.h" -#include "../../src/client/pointer.h" -#include "../../src/client/registry.h" -#include "../../src/client/seat.h" -#include "../../src/client/surface.h" +#include "KWayland/Client/connection_thread.h" +#include "KWayland/Client/event_queue.h" +#include "KWayland/Client/datadevice.h" +#include "KWayland/Client/datadevicemanager.h" +#include "KWayland/Client/datasource.h" +#include "KWayland/Client/compositor.h" +#include "KWayland/Client/keyboard.h" +#include "KWayland/Client/pointer.h" +#include "KWayland/Client/registry.h" +#include "KWayland/Client/seat.h" +#include "KWayland/Client/surface.h" #include "../../src/server/display.h" #include "../../src/server/datadevicemanager_interface.h" #include "../../src/server/datasource_interface.h" diff --git a/src/wayland/autotests/client/test_datasource.cpp b/src/wayland/autotests/client/test_datasource.cpp index f373d68dc9..c238ac8eae 100644 --- a/src/wayland/autotests/client/test_datasource.cpp +++ b/src/wayland/autotests/client/test_datasource.cpp @@ -7,11 +7,11 @@ #include #include // KWayland -#include "../../src/client/connection_thread.h" -#include "../../src/client/event_queue.h" -#include "../../src/client/datadevicemanager.h" -#include "../../src/client/datasource.h" -#include "../../src/client/registry.h" +#include "KWayland/Client/connection_thread.h" +#include "KWayland/Client/event_queue.h" +#include "KWayland/Client/datadevicemanager.h" +#include "KWayland/Client/datasource.h" +#include "KWayland/Client/registry.h" #include "../../src/server/display.h" #include "../../src/server/datadevicemanager_interface.h" #include "../../src/server/datasource_interface.h" diff --git a/src/wayland/autotests/client/test_drag_drop.cpp b/src/wayland/autotests/client/test_drag_drop.cpp index 164eaec73b..6abadc37d3 100644 --- a/src/wayland/autotests/client/test_drag_drop.cpp +++ b/src/wayland/autotests/client/test_drag_drop.cpp @@ -6,19 +6,19 @@ // Qt #include // KWin -#include "../../src/client/compositor.h" -#include "../../src/client/connection_thread.h" -#include "../../src/client/datadevice.h" -#include "../../src/client/datadevicemanager.h" -#include "../../src/client/datasource.h" -#include "../../src/client/event_queue.h" -#include "../../src/client/pointer.h" -#include "../../src/client/touch.h" -#include "../../src/client/registry.h" -#include "../../src/client/seat.h" -#include "../../src/client/shell.h" -#include "../../src/client/shm_pool.h" -#include "../../src/client/surface.h" +#include "KWayland/Client/compositor.h" +#include "KWayland/Client/connection_thread.h" +#include "KWayland/Client/datadevice.h" +#include "KWayland/Client/datadevicemanager.h" +#include "KWayland/Client/datasource.h" +#include "KWayland/Client/event_queue.h" +#include "KWayland/Client/pointer.h" +#include "KWayland/Client/touch.h" +#include "KWayland/Client/registry.h" +#include "KWayland/Client/seat.h" +#include "KWayland/Client/shell.h" +#include "KWayland/Client/shm_pool.h" +#include "KWayland/Client/surface.h" #include "../../src/server/display.h" #include "../../src/server/compositor_interface.h" #include "../../src/server/datadevicemanager_interface.h" diff --git a/src/wayland/autotests/client/test_error.cpp b/src/wayland/autotests/client/test_error.cpp index 9f3eaae930..2a39a357d7 100644 --- a/src/wayland/autotests/client/test_error.cpp +++ b/src/wayland/autotests/client/test_error.cpp @@ -6,13 +6,13 @@ // Qt #include // client -#include "../../src/client/compositor.h" -#include "../../src/client/connection_thread.h" -#include "../../src/client/event_queue.h" -#include "../../src/client/plasmashell.h" -#include "../../src/client/registry.h" -#include "../../src/client/shell.h" -#include "../../src/client/surface.h" +#include "KWayland/Client/compositor.h" +#include "KWayland/Client/connection_thread.h" +#include "KWayland/Client/event_queue.h" +#include "KWayland/Client/plasmashell.h" +#include "KWayland/Client/registry.h" +#include "KWayland/Client/shell.h" +#include "KWayland/Client/surface.h" // server #include "../../src/server/display.h" #include "../../src/server/compositor_interface.h" diff --git a/src/wayland/autotests/client/test_fake_input.cpp b/src/wayland/autotests/client/test_fake_input.cpp index d4e2f5b45d..f818dfad39 100644 --- a/src/wayland/autotests/client/test_fake_input.cpp +++ b/src/wayland/autotests/client/test_fake_input.cpp @@ -6,10 +6,10 @@ // Qt #include // client -#include "../../src/client/connection_thread.h" -#include "../../src/client/event_queue.h" -#include "../../src/client/fakeinput.h" -#include "../../src/client/registry.h" +#include "KWayland/Client/connection_thread.h" +#include "KWayland/Client/event_queue.h" +#include "KWayland/Client/fakeinput.h" +#include "KWayland/Client/registry.h" // server #include "../../src/server/display.h" #include "../../src/server/fakeinput_interface.h" diff --git a/src/wayland/autotests/client/test_idle.cpp b/src/wayland/autotests/client/test_idle.cpp index 7882aac500..0bec042262 100644 --- a/src/wayland/autotests/client/test_idle.cpp +++ b/src/wayland/autotests/client/test_idle.cpp @@ -6,11 +6,11 @@ // Qt #include // client -#include "../../src/client/connection_thread.h" -#include "../../src/client/event_queue.h" -#include "../../src/client/idle.h" -#include "../../src/client/registry.h" -#include "../../src/client/seat.h" +#include "KWayland/Client/connection_thread.h" +#include "KWayland/Client/event_queue.h" +#include "KWayland/Client/idle.h" +#include "KWayland/Client/registry.h" +#include "KWayland/Client/seat.h" // server #include "../../src/server/display.h" #include "../../src/server/idle_interface.h" diff --git a/src/wayland/autotests/client/test_plasma_virtual_desktop.cpp b/src/wayland/autotests/client/test_plasma_virtual_desktop.cpp index d5fa3477a9..11e3e7e5dc 100644 --- a/src/wayland/autotests/client/test_plasma_virtual_desktop.cpp +++ b/src/wayland/autotests/client/test_plasma_virtual_desktop.cpp @@ -6,19 +6,19 @@ // Qt #include // KWin -#include "../../src/client/compositor.h" -#include "../../src/client/connection_thread.h" -#include "../../src/client/event_queue.h" -#include "../../src/client/region.h" -#include "../../src/client/registry.h" -#include "../../src/client/surface.h" -#include "../../src/client/plasmavirtualdesktop.h" +#include "KWayland/Client/compositor.h" +#include "KWayland/Client/connection_thread.h" +#include "KWayland/Client/event_queue.h" +#include "KWayland/Client/region.h" +#include "KWayland/Client/registry.h" +#include "KWayland/Client/surface.h" +#include "KWayland/Client/plasmavirtualdesktop.h" #include "../../src/server/display.h" #include "../../src/server/compositor_interface.h" #include "../../src/server/region_interface.h" #include "../../src/server/plasmavirtualdesktop_interface.h" #include "../../src/server/plasmawindowmanagement_interface.h" -#include "../../src/client/plasmawindowmanagement.h" +#include "KWayland/Client/plasmawindowmanagement.h" using namespace KWayland::Client; diff --git a/src/wayland/autotests/client/test_plasma_window_model.cpp b/src/wayland/autotests/client/test_plasma_window_model.cpp index d622c7413b..78cec83272 100644 --- a/src/wayland/autotests/client/test_plasma_window_model.cpp +++ b/src/wayland/autotests/client/test_plasma_window_model.cpp @@ -6,11 +6,11 @@ // Qt #include // client -#include "../../src/client/connection_thread.h" -#include "../../src/client/event_queue.h" -#include "../../src/client/registry.h" -#include "../../src/client/plasmawindowmanagement.h" -#include "../../src/client/plasmawindowmodel.h" +#include "KWayland/Client/connection_thread.h" +#include "KWayland/Client/event_queue.h" +#include "KWayland/Client/registry.h" +#include "KWayland/Client/plasmawindowmanagement.h" +#include "KWayland/Client/plasmawindowmodel.h" // server #include "../../src/server/display.h" #include "../../src/server/plasmawindowmanagement_interface.h" diff --git a/src/wayland/autotests/client/test_plasmashell.cpp b/src/wayland/autotests/client/test_plasmashell.cpp index e284fd2d41..8636b9fdc2 100644 --- a/src/wayland/autotests/client/test_plasmashell.cpp +++ b/src/wayland/autotests/client/test_plasmashell.cpp @@ -6,12 +6,12 @@ // Qt #include // KWayland -#include "../../src/client/connection_thread.h" -#include "../../src/client/compositor.h" -#include "../../src/client/event_queue.h" -#include "../../src/client/registry.h" -#include "../../src/client/surface.h" -#include "../../src/client/plasmashell.h" +#include "KWayland/Client/connection_thread.h" +#include "KWayland/Client/compositor.h" +#include "KWayland/Client/event_queue.h" +#include "KWayland/Client/registry.h" +#include "KWayland/Client/surface.h" +#include "KWayland/Client/plasmashell.h" #include "../../src/server/display.h" #include "../../src/server/compositor_interface.h" #include "../../src/server/plasmashell_interface.h" diff --git a/src/wayland/autotests/client/test_pointer_constraints.cpp b/src/wayland/autotests/client/test_pointer_constraints.cpp index 17c501d56f..fccc1faf30 100644 --- a/src/wayland/autotests/client/test_pointer_constraints.cpp +++ b/src/wayland/autotests/client/test_pointer_constraints.cpp @@ -6,14 +6,14 @@ // Qt #include // client -#include "../../src/client/connection_thread.h" -#include "../../src/client/compositor.h" -#include "../../src/client/event_queue.h" -#include "../../src/client/pointer.h" -#include "../../src/client/pointerconstraints.h" -#include "../../src/client/registry.h" -#include "../../src/client/seat.h" -#include "../../src/client/surface.h" +#include "KWayland/Client/connection_thread.h" +#include "KWayland/Client/compositor.h" +#include "KWayland/Client/event_queue.h" +#include "KWayland/Client/pointer.h" +#include "KWayland/Client/pointerconstraints.h" +#include "KWayland/Client/registry.h" +#include "KWayland/Client/seat.h" +#include "KWayland/Client/surface.h" // server #include "../../src/server/display.h" #include "../../src/server/compositor_interface.h" diff --git a/src/wayland/autotests/client/test_remote_access.cpp b/src/wayland/autotests/client/test_remote_access.cpp index 1dcc35fcf3..ff2a12e12e 100644 --- a/src/wayland/autotests/client/test_remote_access.cpp +++ b/src/wayland/autotests/client/test_remote_access.cpp @@ -7,11 +7,11 @@ // Qt #include // client -#include "../../src/client/connection_thread.h" -#include "../../src/client/event_queue.h" -#include "../../src/client/remote_access.h" -#include "../../src/client/registry.h" -#include "../../src/client/output.h" +#include "KWayland/Client/connection_thread.h" +#include "KWayland/Client/event_queue.h" +#include "KWayland/Client/remote_access.h" +#include "KWayland/Client/registry.h" +#include "KWayland/Client/output.h" // server #include "../../src/server/display.h" #include "../../src/server/output_interface.h" diff --git a/src/wayland/autotests/client/test_selection.cpp b/src/wayland/autotests/client/test_selection.cpp index 3610558147..f8c1fdf83d 100644 --- a/src/wayland/autotests/client/test_selection.cpp +++ b/src/wayland/autotests/client/test_selection.cpp @@ -6,16 +6,16 @@ // Qt #include // client -#include "../../src/client/connection_thread.h" -#include "../../src/client/compositor.h" -#include "../../src/client/datadevice.h" -#include "../../src/client/datadevicemanager.h" -#include "../../src/client/datasource.h" -#include "../../src/client/event_queue.h" -#include "../../src/client/keyboard.h" -#include "../../src/client/registry.h" -#include "../../src/client/seat.h" -#include "../../src/client/surface.h" +#include "KWayland/Client/connection_thread.h" +#include "KWayland/Client/compositor.h" +#include "KWayland/Client/datadevice.h" +#include "KWayland/Client/datadevicemanager.h" +#include "KWayland/Client/datasource.h" +#include "KWayland/Client/event_queue.h" +#include "KWayland/Client/keyboard.h" +#include "KWayland/Client/registry.h" +#include "KWayland/Client/seat.h" +#include "KWayland/Client/surface.h" // server #include "../../src/server/compositor_interface.h" #include "../../src/server/datadevicemanager_interface.h" diff --git a/src/wayland/autotests/client/test_server_side_decoration.cpp b/src/wayland/autotests/client/test_server_side_decoration.cpp index 20c8d45df0..75c64b9e45 100644 --- a/src/wayland/autotests/client/test_server_side_decoration.cpp +++ b/src/wayland/autotests/client/test_server_side_decoration.cpp @@ -6,12 +6,12 @@ // Qt #include // KWin -#include "../../src/client/compositor.h" -#include "../../src/client/connection_thread.h" -#include "../../src/client/event_queue.h" -#include "../../src/client/registry.h" -#include "../../src/client/server_decoration.h" -#include "../../src/client/surface.h" +#include "KWayland/Client/compositor.h" +#include "KWayland/Client/connection_thread.h" +#include "KWayland/Client/event_queue.h" +#include "KWayland/Client/registry.h" +#include "KWayland/Client/server_decoration.h" +#include "KWayland/Client/surface.h" #include "../../src/server/display.h" #include "../../src/server/compositor_interface.h" #include "../../src/server/server_decoration_interface.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 57576489f7..335d6d0778 100644 --- a/src/wayland/autotests/client/test_server_side_decoration_palette.cpp +++ b/src/wayland/autotests/client/test_server_side_decoration_palette.cpp @@ -7,13 +7,13 @@ // Qt #include // KWin -#include "../../src/client/compositor.h" -#include "../../src/client/connection_thread.h" -#include "../../src/client/event_queue.h" -#include "../../src/client/region.h" -#include "../../src/client/registry.h" -#include "../../src/client/surface.h" -#include "../../src/client/server_decoration_palette.h" +#include "KWayland/Client/compositor.h" +#include "KWayland/Client/connection_thread.h" +#include "KWayland/Client/event_queue.h" +#include "KWayland/Client/region.h" +#include "KWayland/Client/registry.h" +#include "KWayland/Client/surface.h" +#include "KWayland/Client/server_decoration_palette.h" #include "../../src/server/display.h" #include "../../src/server/compositor_interface.h" #include "../../src/server/region_interface.h" diff --git a/src/wayland/autotests/client/test_shadow.cpp b/src/wayland/autotests/client/test_shadow.cpp index 21c169a64e..dfb2feeb24 100644 --- a/src/wayland/autotests/client/test_shadow.cpp +++ b/src/wayland/autotests/client/test_shadow.cpp @@ -6,13 +6,13 @@ // Qt #include // client -#include "../../src/client/connection_thread.h" -#include "../../src/client/compositor.h" -#include "../../src/client/event_queue.h" -#include "../../src/client/registry.h" -#include "../../src/client/shadow.h" -#include "../../src/client/shm_pool.h" -#include "../../src/client/surface.h" +#include "KWayland/Client/connection_thread.h" +#include "KWayland/Client/compositor.h" +#include "KWayland/Client/event_queue.h" +#include "KWayland/Client/registry.h" +#include "KWayland/Client/shadow.h" +#include "KWayland/Client/shm_pool.h" +#include "KWayland/Client/surface.h" // server #include "../../src/server/buffer_interface.h" #include "../../src/server/display.h" diff --git a/src/wayland/autotests/client/test_shm_pool.cpp b/src/wayland/autotests/client/test_shm_pool.cpp index 2f544f47ed..0cb84bd8da 100644 --- a/src/wayland/autotests/client/test_shm_pool.cpp +++ b/src/wayland/autotests/client/test_shm_pool.cpp @@ -7,11 +7,11 @@ #include #include // KWin -#include "../../src/client/compositor.h" -#include "../../src/client/connection_thread.h" -#include "../../src/client/surface.h" -#include "../../src/client/registry.h" -#include "../../src/client/shm_pool.h" +#include "KWayland/Client/compositor.h" +#include "KWayland/Client/connection_thread.h" +#include "KWayland/Client/surface.h" +#include "KWayland/Client/registry.h" +#include "KWayland/Client/shm_pool.h" #include "../../src/server/buffer_interface.h" #include "../../src/server/compositor_interface.h" #include "../../src/server/display.h" diff --git a/src/wayland/autotests/client/test_text_input.cpp b/src/wayland/autotests/client/test_text_input.cpp index c81299f7a4..3436df3ed5 100644 --- a/src/wayland/autotests/client/test_text_input.cpp +++ b/src/wayland/autotests/client/test_text_input.cpp @@ -6,14 +6,14 @@ // Qt #include // client -#include "../../src/client/compositor.h" -#include "../../src/client/connection_thread.h" -#include "../../src/client/event_queue.h" -#include "../../src/client/keyboard.h" -#include "../../src/client/registry.h" -#include "../../src/client/seat.h" -#include "../../src/client/surface.h" -#include "../../src/client/textinput.h" +#include "KWayland/Client/compositor.h" +#include "KWayland/Client/connection_thread.h" +#include "KWayland/Client/event_queue.h" +#include "KWayland/Client/keyboard.h" +#include "KWayland/Client/registry.h" +#include "KWayland/Client/seat.h" +#include "KWayland/Client/surface.h" +#include "KWayland/Client/textinput.h" // server #include "../../src/server/compositor_interface.h" #include "../../src/server/display.h" diff --git a/src/wayland/autotests/client/test_wayland_appmenu.cpp b/src/wayland/autotests/client/test_wayland_appmenu.cpp index bac5c45438..889e31ef1f 100644 --- a/src/wayland/autotests/client/test_wayland_appmenu.cpp +++ b/src/wayland/autotests/client/test_wayland_appmenu.cpp @@ -7,13 +7,13 @@ // Qt #include // KWin -#include "../../src/client/compositor.h" -#include "../../src/client/connection_thread.h" -#include "../../src/client/event_queue.h" -#include "../../src/client/region.h" -#include "../../src/client/registry.h" -#include "../../src/client/surface.h" -#include "../../src/client/appmenu.h" +#include "KWayland/Client/compositor.h" +#include "KWayland/Client/connection_thread.h" +#include "KWayland/Client/event_queue.h" +#include "KWayland/Client/region.h" +#include "KWayland/Client/registry.h" +#include "KWayland/Client/surface.h" +#include "KWayland/Client/appmenu.h" #include "../../src/server/display.h" #include "../../src/server/compositor_interface.h" #include "../../src/server/region_interface.h" diff --git a/src/wayland/autotests/client/test_wayland_blur.cpp b/src/wayland/autotests/client/test_wayland_blur.cpp index b2010a17fc..232f6ec1ca 100644 --- a/src/wayland/autotests/client/test_wayland_blur.cpp +++ b/src/wayland/autotests/client/test_wayland_blur.cpp @@ -6,13 +6,13 @@ // Qt #include // KWin -#include "../../src/client/compositor.h" -#include "../../src/client/connection_thread.h" -#include "../../src/client/event_queue.h" -#include "../../src/client/region.h" -#include "../../src/client/registry.h" -#include "../../src/client/surface.h" -#include "../../src/client/blur.h" +#include "KWayland/Client/compositor.h" +#include "KWayland/Client/connection_thread.h" +#include "KWayland/Client/event_queue.h" +#include "KWayland/Client/region.h" +#include "KWayland/Client/registry.h" +#include "KWayland/Client/surface.h" +#include "KWayland/Client/blur.h" #include "../../src/server/display.h" #include "../../src/server/compositor_interface.h" #include "../../src/server/region_interface.h" diff --git a/src/wayland/autotests/client/test_wayland_connection_thread.cpp b/src/wayland/autotests/client/test_wayland_connection_thread.cpp index c4b95886fc..73abc09c15 100644 --- a/src/wayland/autotests/client/test_wayland_connection_thread.cpp +++ b/src/wayland/autotests/client/test_wayland_connection_thread.cpp @@ -6,9 +6,9 @@ // Qt #include // KWin -#include "../../src/client/connection_thread.h" -#include "../../src/client/event_queue.h" -#include "../../src/client/registry.h" +#include "KWayland/Client/connection_thread.h" +#include "KWayland/Client/event_queue.h" +#include "KWayland/Client/registry.h" #include "../../src/server/display.h" // Wayland #include diff --git a/src/wayland/autotests/client/test_wayland_contrast.cpp b/src/wayland/autotests/client/test_wayland_contrast.cpp index 90ccd9a0e6..699eaf4e78 100644 --- a/src/wayland/autotests/client/test_wayland_contrast.cpp +++ b/src/wayland/autotests/client/test_wayland_contrast.cpp @@ -7,13 +7,13 @@ // Qt #include // KWin -#include "../../src/client/compositor.h" -#include "../../src/client/connection_thread.h" -#include "../../src/client/event_queue.h" -#include "../../src/client/region.h" -#include "../../src/client/registry.h" -#include "../../src/client/surface.h" -#include "../../src/client/contrast.h" +#include "KWayland/Client/compositor.h" +#include "KWayland/Client/connection_thread.h" +#include "KWayland/Client/event_queue.h" +#include "KWayland/Client/region.h" +#include "KWayland/Client/registry.h" +#include "KWayland/Client/surface.h" +#include "KWayland/Client/contrast.h" #include "../../src/server/display.h" #include "../../src/server/compositor_interface.h" #include "../../src/server/region_interface.h" diff --git a/src/wayland/autotests/client/test_wayland_filter.cpp b/src/wayland/autotests/client/test_wayland_filter.cpp index c1fa456ea1..3d03fb3104 100644 --- a/src/wayland/autotests/client/test_wayland_filter.cpp +++ b/src/wayland/autotests/client/test_wayland_filter.cpp @@ -6,13 +6,13 @@ // Qt #include // KWin -#include "../../src/client/compositor.h" -#include "../../src/client/connection_thread.h" -#include "../../src/client/event_queue.h" -#include "../../src/client/region.h" -#include "../../src/client/registry.h" -#include "../../src/client/surface.h" -#include "../../src/client/blur.h" +#include "KWayland/Client/compositor.h" +#include "KWayland/Client/connection_thread.h" +#include "KWayland/Client/event_queue.h" +#include "KWayland/Client/region.h" +#include "KWayland/Client/registry.h" +#include "KWayland/Client/surface.h" +#include "KWayland/Client/blur.h" #include "../../src/server/display.h" #include "../../src/server/compositor_interface.h" #include "../../src/server/region_interface.h" diff --git a/src/wayland/autotests/client/test_wayland_fullscreen_shell.cpp b/src/wayland/autotests/client/test_wayland_fullscreen_shell.cpp index 99e0973f04..e536615eff 100644 --- a/src/wayland/autotests/client/test_wayland_fullscreen_shell.cpp +++ b/src/wayland/autotests/client/test_wayland_fullscreen_shell.cpp @@ -6,9 +6,9 @@ // Qt #include // KWin -#include "../../src/client/connection_thread.h" -#include "../../src/client/registry.h" -#include "../../src/client/fullscreen_shell.h" +#include "KWayland/Client/connection_thread.h" +#include "KWayland/Client/registry.h" +#include "KWayland/Client/fullscreen_shell.h" // Wayland #include diff --git a/src/wayland/autotests/client/test_wayland_output.cpp b/src/wayland/autotests/client/test_wayland_output.cpp index 3190474a85..7bf55c0939 100644 --- a/src/wayland/autotests/client/test_wayland_output.cpp +++ b/src/wayland/autotests/client/test_wayland_output.cpp @@ -6,11 +6,11 @@ // Qt #include // KWin -#include "../../src/client/connection_thread.h" -#include "../../src/client/event_queue.h" -#include "../../src/client/dpms.h" -#include "../../src/client/output.h" -#include "../../src/client/registry.h" +#include "KWayland/Client/connection_thread.h" +#include "KWayland/Client/event_queue.h" +#include "KWayland/Client/dpms.h" +#include "KWayland/Client/output.h" +#include "KWayland/Client/registry.h" #include "../../src/server/display.h" #include "../../src/server/dpms_interface.h" #include "../../src/server/output_interface.h" diff --git a/src/wayland/autotests/client/test_wayland_outputdevice.cpp b/src/wayland/autotests/client/test_wayland_outputdevice.cpp index ab019a7625..36c10fa0b7 100644 --- a/src/wayland/autotests/client/test_wayland_outputdevice.cpp +++ b/src/wayland/autotests/client/test_wayland_outputdevice.cpp @@ -7,10 +7,10 @@ // Qt #include // KWin -#include "../../src/client/connection_thread.h" -#include "../../src/client/event_queue.h" -#include "../../src/client/outputdevice.h" -#include "../../src/client/registry.h" +#include "KWayland/Client/connection_thread.h" +#include "KWayland/Client/event_queue.h" +#include "KWayland/Client/outputdevice.h" +#include "KWayland/Client/registry.h" #include "../../src/server/display.h" #include "../../src/server/outputdevice_interface.h" // Wayland diff --git a/src/wayland/autotests/client/test_wayland_outputmanagement.cpp b/src/wayland/autotests/client/test_wayland_outputmanagement.cpp index d32644f9f6..a29a434f47 100644 --- a/src/wayland/autotests/client/test_wayland_outputmanagement.cpp +++ b/src/wayland/autotests/client/test_wayland_outputmanagement.cpp @@ -7,13 +7,13 @@ // Qt #include // KWin -#include "../../src/client/connection_thread.h" -#include "../../src/client/event_queue.h" -#include "../../src/client/outputdevice.h" -#include "../../src/client/outputconfiguration.h" -#include "../../src/client/outputmanagement.h" -#include "../../src/client/output.h" -#include "../../src/client/registry.h" +#include "KWayland/Client/connection_thread.h" +#include "KWayland/Client/event_queue.h" +#include "KWayland/Client/outputdevice.h" +#include "KWayland/Client/outputconfiguration.h" +#include "KWayland/Client/outputmanagement.h" +#include "KWayland/Client/output.h" +#include "KWayland/Client/registry.h" #include "../../src/server/display.h" #include "../../src/server/shell_interface.h" #include "../../src/server/compositor_interface.h" diff --git a/src/wayland/autotests/client/test_wayland_region.cpp b/src/wayland/autotests/client/test_wayland_region.cpp index 6c5d6fb7d3..c48084eefc 100644 --- a/src/wayland/autotests/client/test_wayland_region.cpp +++ b/src/wayland/autotests/client/test_wayland_region.cpp @@ -6,11 +6,11 @@ // Qt #include // KWin -#include "../../src/client/compositor.h" -#include "../../src/client/connection_thread.h" -#include "../../src/client/event_queue.h" -#include "../../src/client/region.h" -#include "../../src/client/registry.h" +#include "KWayland/Client/compositor.h" +#include "KWayland/Client/connection_thread.h" +#include "KWayland/Client/event_queue.h" +#include "KWayland/Client/region.h" +#include "KWayland/Client/registry.h" #include "../../src/server/display.h" #include "../../src/server/compositor_interface.h" #include "../../src/server/region_interface.h" diff --git a/src/wayland/autotests/client/test_wayland_registry.cpp b/src/wayland/autotests/client/test_wayland_registry.cpp index 789274a321..049e225055 100644 --- a/src/wayland/autotests/client/test_wayland_registry.cpp +++ b/src/wayland/autotests/client/test_wayland_registry.cpp @@ -6,24 +6,24 @@ // Qt #include // KWin -#include "../../src/client/blur.h" -#include "../../src/client/contrast.h" -#include "../../src/client/compositor.h" -#include "../../src/client/connection_thread.h" -#include "../../src/client/dpms.h" -#include "../../src/client/event_queue.h" -#include "../../src/client/registry.h" -#include "../../src/client/output.h" -#include "../../src/client/pointerconstraints.h" -#include "../../src/client/pointergestures.h" -#include "../../src/client/idleinhibit.h" -#include "../../src/client/seat.h" -#include "../../src/client/relativepointer.h" -#include "../../src/client/server_decoration.h" -#include "../../src/client/shell.h" -#include "../../src/client/surface.h" -#include "../../src/client/subcompositor.h" -#include "../../src/client/xdgshell.h" +#include "KWayland/Client/blur.h" +#include "KWayland/Client/contrast.h" +#include "KWayland/Client/compositor.h" +#include "KWayland/Client/connection_thread.h" +#include "KWayland/Client/dpms.h" +#include "KWayland/Client/event_queue.h" +#include "KWayland/Client/registry.h" +#include "KWayland/Client/output.h" +#include "KWayland/Client/pointerconstraints.h" +#include "KWayland/Client/pointergestures.h" +#include "KWayland/Client/idleinhibit.h" +#include "KWayland/Client/seat.h" +#include "KWayland/Client/relativepointer.h" +#include "KWayland/Client/server_decoration.h" +#include "KWayland/Client/shell.h" +#include "KWayland/Client/surface.h" +#include "KWayland/Client/subcompositor.h" +#include "KWayland/Client/xdgshell.h" #include "../../src/server/compositor_interface.h" #include "../../src/server/datadevicemanager_interface.h" #include "../../src/server/display.h" @@ -48,9 +48,9 @@ #include #include #include -#include -#include -#include +// #include +// #include +// #include #include #include #include @@ -77,9 +77,6 @@ private Q_SLOTS: void testBindContrastManager(); void testBindSlideManager(); void testBindDpmsManager(); - void testBindServerSideDecorationManager(); - void testBindTextInputManagerUnstableV0(); - void testBindTextInputManagerUnstableV2(); void testBindXdgShellUnstableV5(); void testBindRelativePointerManagerUnstableV1(); void testBindPointerGesturesUnstableV1(); @@ -316,21 +313,6 @@ void TestWaylandRegistry::testBindDpmsManager() TEST_BIND(KWayland::Client::Registry::Interface::Dpms, SIGNAL(dpmsAnnounced(quint32,quint32)), bindDpmsManager, org_kde_kwin_dpms_manager_destroy) } -void TestWaylandRegistry::testBindServerSideDecorationManager() -{ - TEST_BIND(KWayland::Client::Registry::Interface::ServerSideDecorationManager, SIGNAL(serverSideDecorationManagerAnnounced(quint32,quint32)), bindServerSideDecorationManager, org_kde_kwin_server_decoration_manager_destroy) -} - -void TestWaylandRegistry::testBindTextInputManagerUnstableV0() -{ - TEST_BIND(KWayland::Client::Registry::Interface::TextInputManagerUnstableV0, SIGNAL(textInputManagerUnstableV0Announced(quint32,quint32)), bindTextInputManagerUnstableV0, wl_text_input_manager_destroy) -} - -void TestWaylandRegistry::testBindTextInputManagerUnstableV2() -{ - TEST_BIND(KWayland::Client::Registry::Interface::TextInputManagerUnstableV2, SIGNAL(textInputManagerUnstableV2Announced(quint32,quint32)), bindTextInputManagerUnstableV2, zwp_text_input_manager_v2_destroy) -} - void TestWaylandRegistry::testBindXdgShellUnstableV5() { TEST_BIND(KWayland::Client::Registry::Interface::XdgShellUnstableV5, SIGNAL(xdgShellUnstableV5Announced(quint32,quint32)), bindXdgShellUnstableV5, zxdg_shell_v5_destroy) diff --git a/src/wayland/autotests/client/test_wayland_seat.cpp b/src/wayland/autotests/client/test_wayland_seat.cpp index 287bd16d8a..4a971a3ba3 100644 --- a/src/wayland/autotests/client/test_wayland_seat.cpp +++ b/src/wayland/autotests/client/test_wayland_seat.cpp @@ -6,23 +6,23 @@ // Qt #include // KWin -#include "../../src/client/compositor.h" -#include "../../src/client/connection_thread.h" -#include "../../src/client/datadevice.h" -#include "../../src/client/datadevicemanager.h" -#include "../../src/client/datasource.h" -#include "../../src/client/event_queue.h" -#include "../../src/client/keyboard.h" -#include "../../src/client/pointer.h" -#include "../../src/client/pointergestures.h" -#include "../../src/client/surface.h" -#include "../../src/client/registry.h" -#include "../../src/client/relativepointer.h" -#include "../../src/client/seat.h" -#include "../../src/client/shm_pool.h" -#include "../../src/client/subcompositor.h" -#include "../../src/client/subsurface.h" -#include "../../src/client/touch.h" +#include "KWayland/Client/compositor.h" +#include "KWayland/Client/connection_thread.h" +#include "KWayland/Client/datadevice.h" +#include "KWayland/Client/datadevicemanager.h" +#include "KWayland/Client/datasource.h" +#include "KWayland/Client/event_queue.h" +#include "KWayland/Client/keyboard.h" +#include "KWayland/Client/pointer.h" +#include "KWayland/Client/pointergestures.h" +#include "KWayland/Client/surface.h" +#include "KWayland/Client/registry.h" +#include "KWayland/Client/relativepointer.h" +#include "KWayland/Client/seat.h" +#include "KWayland/Client/shm_pool.h" +#include "KWayland/Client/subcompositor.h" +#include "KWayland/Client/subsurface.h" +#include "KWayland/Client/touch.h" #include "../../src/server/buffer_interface.h" #include "../../src/server/compositor_interface.h" #include "../../src/server/datadevicemanager_interface.h" diff --git a/src/wayland/autotests/client/test_wayland_shell.cpp b/src/wayland/autotests/client/test_wayland_shell.cpp index e8b46a55a5..b234698335 100644 --- a/src/wayland/autotests/client/test_wayland_shell.cpp +++ b/src/wayland/autotests/client/test_wayland_shell.cpp @@ -6,14 +6,14 @@ // Qt #include // KWin -#include "../../src/client/compositor.h" -#include "../../src/client/connection_thread.h" -#include "../../src/client/event_queue.h" -#include "../../src/client/pointer.h" -#include "../../src/client/seat.h" -#include "../../src/client/shell.h" -#include "../../src/client/surface.h" -#include "../../src/client/registry.h" +#include "KWayland/Client/compositor.h" +#include "KWayland/Client/connection_thread.h" +#include "KWayland/Client/event_queue.h" +#include "KWayland/Client/pointer.h" +#include "KWayland/Client/seat.h" +#include "KWayland/Client/shell.h" +#include "KWayland/Client/surface.h" +#include "KWayland/Client/registry.h" #include "../../src/server/buffer_interface.h" #include "../../src/server/compositor_interface.h" #include "../../src/server/display.h" diff --git a/src/wayland/autotests/client/test_wayland_slide.cpp b/src/wayland/autotests/client/test_wayland_slide.cpp index c4014c33f6..73ebdf7fb6 100644 --- a/src/wayland/autotests/client/test_wayland_slide.cpp +++ b/src/wayland/autotests/client/test_wayland_slide.cpp @@ -6,13 +6,13 @@ // Qt #include // KWin -#include "../../src/client/compositor.h" -#include "../../src/client/connection_thread.h" -#include "../../src/client/event_queue.h" -#include "../../src/client/region.h" -#include "../../src/client/registry.h" -#include "../../src/client/surface.h" -#include "../../src/client/slide.h" +#include "KWayland/Client/compositor.h" +#include "KWayland/Client/connection_thread.h" +#include "KWayland/Client/event_queue.h" +#include "KWayland/Client/region.h" +#include "KWayland/Client/registry.h" +#include "KWayland/Client/surface.h" +#include "KWayland/Client/slide.h" #include "../../src/server/display.h" #include "../../src/server/compositor_interface.h" #include "../../src/server/region_interface.h" diff --git a/src/wayland/autotests/client/test_wayland_subcompositor.cpp b/src/wayland/autotests/client/test_wayland_subcompositor.cpp index 646e8bbd26..8a9256dfb5 100644 --- a/src/wayland/autotests/client/test_wayland_subcompositor.cpp +++ b/src/wayland/autotests/client/test_wayland_subcompositor.cpp @@ -6,10 +6,10 @@ // Qt #include // KWin -#include "../../src/client/connection_thread.h" -#include "../../src/client/event_queue.h" -#include "../../src/client/registry.h" -#include "../../src/client/subcompositor.h" +#include "KWayland/Client/connection_thread.h" +#include "KWayland/Client/event_queue.h" +#include "KWayland/Client/registry.h" +#include "KWayland/Client/subcompositor.h" #include "../../src/server/display.h" #include "../../src/server/subcompositor_interface.h" diff --git a/src/wayland/autotests/client/test_wayland_subsurface.cpp b/src/wayland/autotests/client/test_wayland_subsurface.cpp index 6da8f36ad7..fbc40c5896 100644 --- a/src/wayland/autotests/client/test_wayland_subsurface.cpp +++ b/src/wayland/autotests/client/test_wayland_subsurface.cpp @@ -6,15 +6,15 @@ // Qt #include // KWin -#include "../../src/client/compositor.h" -#include "../../src/client/connection_thread.h" -#include "../../src/client/event_queue.h" -#include "../../src/client/region.h" -#include "../../src/client/registry.h" -#include "../../src/client/shm_pool.h" -#include "../../src/client/subcompositor.h" -#include "../../src/client/subsurface.h" -#include "../../src/client/surface.h" +#include "KWayland/Client/compositor.h" +#include "KWayland/Client/connection_thread.h" +#include "KWayland/Client/event_queue.h" +#include "KWayland/Client/region.h" +#include "KWayland/Client/registry.h" +#include "KWayland/Client/shm_pool.h" +#include "KWayland/Client/subcompositor.h" +#include "KWayland/Client/subsurface.h" +#include "KWayland/Client/surface.h" #include "../../src/server/buffer_interface.h" #include "../../src/server/display.h" #include "../../src/server/compositor_interface.h" diff --git a/src/wayland/autotests/client/test_wayland_surface.cpp b/src/wayland/autotests/client/test_wayland_surface.cpp index d8a9a0c18f..085519842c 100644 --- a/src/wayland/autotests/client/test_wayland_surface.cpp +++ b/src/wayland/autotests/client/test_wayland_surface.cpp @@ -8,15 +8,15 @@ #include #include // KWin -#include "../../src/client/compositor.h" -#include "../../src/client/connection_thread.h" -#include "../../src/client/event_queue.h" -#include "../../src/client/idleinhibit.h" -#include "../../src/client/output.h" -#include "../../src/client/surface.h" -#include "../../src/client/region.h" -#include "../../src/client/registry.h" -#include "../../src/client/shm_pool.h" +#include "KWayland/Client/compositor.h" +#include "KWayland/Client/connection_thread.h" +#include "KWayland/Client/event_queue.h" +#include "KWayland/Client/idleinhibit.h" +#include "KWayland/Client/output.h" +#include "KWayland/Client/surface.h" +#include "KWayland/Client/region.h" +#include "KWayland/Client/registry.h" +#include "KWayland/Client/shm_pool.h" #include "../../src/server/buffer_interface.h" #include "../../src/server/compositor_interface.h" #include "../../src/server/display.h" diff --git a/src/wayland/autotests/client/test_wayland_windowmanagement.cpp b/src/wayland/autotests/client/test_wayland_windowmanagement.cpp index 396d8266cf..be1622ebb1 100644 --- a/src/wayland/autotests/client/test_wayland_windowmanagement.cpp +++ b/src/wayland/autotests/client/test_wayland_windowmanagement.cpp @@ -6,13 +6,13 @@ // Qt #include // KWin -#include "../../src/client/compositor.h" -#include "../../src/client/connection_thread.h" -#include "../../src/client/event_queue.h" -#include "../../src/client/region.h" -#include "../../src/client/registry.h" -#include "../../src/client/surface.h" -#include "../../src/client/plasmawindowmanagement.h" +#include "KWayland/Client/compositor.h" +#include "KWayland/Client/connection_thread.h" +#include "KWayland/Client/event_queue.h" +#include "KWayland/Client/region.h" +#include "KWayland/Client/registry.h" +#include "KWayland/Client/surface.h" +#include "KWayland/Client/plasmawindowmanagement.h" #include "../../src/server/display.h" #include "../../src/server/compositor_interface.h" #include "../../src/server/region_interface.h" diff --git a/src/wayland/autotests/client/test_xdg_decoration.cpp b/src/wayland/autotests/client/test_xdg_decoration.cpp index 6f0b72a112..7efb397239 100644 --- a/src/wayland/autotests/client/test_xdg_decoration.cpp +++ b/src/wayland/autotests/client/test_xdg_decoration.cpp @@ -6,13 +6,13 @@ // Qt #include // KWin -#include "../../src/client/compositor.h" -#include "../../src/client/connection_thread.h" -#include "../../src/client/event_queue.h" -#include "../../src/client/registry.h" -#include "../../src/client/xdgshell.h" -#include "../../src/client/xdgdecoration.h" -#include "../../src/client/surface.h" +#include "KWayland/Client/compositor.h" +#include "KWayland/Client/connection_thread.h" +#include "KWayland/Client/event_queue.h" +#include "KWayland/Client/registry.h" +#include "KWayland/Client/xdgshell.h" +#include "KWayland/Client/xdgdecoration.h" +#include "KWayland/Client/surface.h" #include "../../src/server/display.h" #include "../../src/server/compositor_interface.h" #include "../../src/server/xdgshell_interface.h" diff --git a/src/wayland/autotests/client/test_xdg_foreign.cpp b/src/wayland/autotests/client/test_xdg_foreign.cpp index 106b02022b..c8b2a1f10b 100644 --- a/src/wayland/autotests/client/test_xdg_foreign.cpp +++ b/src/wayland/autotests/client/test_xdg_foreign.cpp @@ -7,13 +7,13 @@ // Qt #include // KWin -#include "../../src/client/compositor.h" -#include "../../src/client/connection_thread.h" -#include "../../src/client/event_queue.h" -#include "../../src/client/region.h" -#include "../../src/client/registry.h" -#include "../../src/client/surface.h" -#include "../../src/client/xdgforeign.h" +#include "KWayland/Client/compositor.h" +#include "KWayland/Client/connection_thread.h" +#include "KWayland/Client/event_queue.h" +#include "KWayland/Client/region.h" +#include "KWayland/Client/registry.h" +#include "KWayland/Client/surface.h" +#include "KWayland/Client/xdgforeign.h" #include "../../src/server/display.h" #include "../../src/server/compositor_interface.h" #include "../../src/server/surface_interface.h" diff --git a/src/wayland/autotests/client/test_xdg_output.cpp b/src/wayland/autotests/client/test_xdg_output.cpp index 5acccf14b0..93e0a22162 100644 --- a/src/wayland/autotests/client/test_xdg_output.cpp +++ b/src/wayland/autotests/client/test_xdg_output.cpp @@ -6,12 +6,12 @@ // Qt #include // KWin -#include "../../src/client/connection_thread.h" -#include "../../src/client/event_queue.h" -#include "../../src/client/dpms.h" -#include "../../src/client/output.h" -#include "../../src/client/xdgoutput.h" -#include "../../src/client/registry.h" +#include "KWayland/Client/connection_thread.h" +#include "KWayland/Client/event_queue.h" +#include "KWayland/Client/dpms.h" +#include "KWayland/Client/output.h" +#include "KWayland/Client/xdgoutput.h" +#include "KWayland/Client/registry.h" #include "../../src/server/display.h" #include "../../src/server/dpms_interface.h" #include "../../src/server/output_interface.h" diff --git a/src/wayland/autotests/client/test_xdg_shell.h b/src/wayland/autotests/client/test_xdg_shell.h index 1f7e757d3d..cd6a7027a4 100644 --- a/src/wayland/autotests/client/test_xdg_shell.h +++ b/src/wayland/autotests/client/test_xdg_shell.h @@ -9,15 +9,15 @@ // Qt #include // client -#include "../../src/client/xdgshell.h" -#include "../../src/client/connection_thread.h" -#include "../../src/client/compositor.h" -#include "../../src/client/event_queue.h" -#include "../../src/client/registry.h" -#include "../../src/client/output.h" -#include "../../src/client/seat.h" -#include "../../src/client/shm_pool.h" -#include "../../src/client/surface.h" +#include "KWayland/Client/xdgshell.h" +#include "KWayland/Client/connection_thread.h" +#include "KWayland/Client/compositor.h" +#include "KWayland/Client/event_queue.h" +#include "KWayland/Client/registry.h" +#include "KWayland/Client/output.h" +#include "KWayland/Client/seat.h" +#include "KWayland/Client/shm_pool.h" +#include "KWayland/Client/surface.h" // server #include "../../src/server/display.h" #include "../../src/server/compositor_interface.h" diff --git a/src/wayland/autotests/server/CMakeLists.txt b/src/wayland/autotests/server/CMakeLists.txt index 795db109a3..3b7014f17a 100644 --- a/src/wayland/autotests/server/CMakeLists.txt +++ b/src/wayland/autotests/server/CMakeLists.txt @@ -5,7 +5,7 @@ set( testWaylandServerDisplay_SRCS test_display.cpp ) add_executable(testWaylandServerDisplay ${testWaylandServerDisplay_SRCS}) -target_link_libraries( testWaylandServerDisplay Qt5::Test Qt5::Gui KF5::WaylandServer Wayland::Server) +target_link_libraries( testWaylandServerDisplay Qt5::Test Qt5::Gui Plasma::KWaylandServer Wayland::Server) add_test(NAME kwayland-testWaylandServerDisplay COMMAND testWaylandServerDisplay) ecm_mark_as_test(testWaylandServerDisplay) @@ -16,7 +16,7 @@ set( testWaylandServerSeat_SRCS test_seat.cpp ) add_executable(testWaylandServerSeat ${testWaylandServerSeat_SRCS}) -target_link_libraries( testWaylandServerSeat Qt5::Test Qt5::Gui KF5::WaylandServer Wayland::Server) +target_link_libraries( testWaylandServerSeat Qt5::Test Qt5::Gui Plasma::KWaylandServer Wayland::Server) add_test(NAME kwayland-testWaylandServerSeat COMMAND testWaylandServerSeat) ecm_mark_as_test(testWaylandServerSeat) @@ -34,7 +34,7 @@ set( testQtSurfaceExtension_SRCS test_qt_surface_extension.cpp ) add_executable(testQtSurfaceExtension ${testQtSurfaceExtension_SRCS}) -target_link_libraries( testQtSurfaceExtension Qt5::Test Qt5::Gui KF5::WaylandServer) +target_link_libraries( testQtSurfaceExtension Qt5::Test Qt5::Gui Plasma::KWaylandServer) add_test(NAME kwayland-testQtSurfaceExtension COMMAND testQtSurfaceExtension) ecm_mark_as_test(testQtSurfaceExtension) @@ -42,7 +42,7 @@ ecm_mark_as_test(testQtSurfaceExtension) # Test No XDG_RUNTIME_DIR ######################################################## add_executable(testNoXdgRuntimeDir test_no_xdg_runtime_dir.cpp) -target_link_libraries( testNoXdgRuntimeDir Qt5::Test KF5::WaylandServer) +target_link_libraries( testNoXdgRuntimeDir Qt5::Test Plasma::KWaylandServer) add_test(NAME kwayland-testNoXdgRuntimeDir COMMAND testNoXdgRuntimeDir) ecm_mark_as_test(testNoXdgRuntimeDir) @@ -54,6 +54,6 @@ ecm_add_qtwayland_client_protocol(TABLET_SRCS BASENAME tablet-unstable-v2 ) add_executable(testTabletInterface test_tablet_interface.cpp ${TABLET_SRCS}) -target_link_libraries( testTabletInterface Qt5::Test KF5::WaylandServer KF5::WaylandClient Wayland::Client) +target_link_libraries( testTabletInterface Qt5::Test Plasma::KWaylandServer KF5::WaylandClient Wayland::Client) add_test(NAME kwayland-testTabletInterface COMMAND testTabletInterface) ecm_mark_as_test(testTabletInterface) diff --git a/src/wayland/autotests/server/test_tablet_interface.cpp b/src/wayland/autotests/server/test_tablet_interface.cpp index 51abfc25c1..f584de7c44 100644 --- a/src/wayland/autotests/server/test_tablet_interface.cpp +++ b/src/wayland/autotests/server/test_tablet_interface.cpp @@ -27,11 +27,11 @@ License along with this library. If not, see . #include "../../src/server/seat_interface.h" #include "../../src/server/tablet_interface.h" -#include "../../src/client/compositor.h" -#include "../../src/client/connection_thread.h" -#include "../../src/client/event_queue.h" -#include "../../src/client/registry.h" -#include "../../src/client/seat.h" +#include "KWayland/Client/compositor.h" +#include "KWayland/Client/connection_thread.h" +#include "KWayland/Client/event_queue.h" +#include "KWayland/Client/registry.h" +#include "KWayland/Client/seat.h" #include "qwayland-tablet-unstable-v2.h" diff --git a/src/wayland/seat_interface.cpp b/src/wayland/seat_interface.cpp index 0d9e2803d1..8ff95c3430 100644 --- a/src/wayland/seat_interface.cpp +++ b/src/wayland/seat_interface.cpp @@ -21,7 +21,7 @@ #define WL_SEAT_NAME_SINCE_VERSION 2 #endif // linux -#include +#include #if HAVE_LINUX_INPUT_H #include #endif diff --git a/src/wayland/tests/CMakeLists.txt b/src/wayland/tests/CMakeLists.txt index f49881d529..8626283c2b 100644 --- a/src/wayland/tests/CMakeLists.txt +++ b/src/wayland/tests/CMakeLists.txt @@ -6,7 +6,7 @@ set(testServer_SRCS waylandservertest.cpp ) add_executable(testServer ${testServer_SRCS}) -target_link_libraries(testServer KF5::WaylandServer) +target_link_libraries(testServer Plasma::KWaylandServer) ecm_mark_as_test(testServer) find_package(Qt5Widgets ${QT_MIN_VERSION} CONFIG QUIET) @@ -15,7 +15,7 @@ if (Qt5Widgets_FOUND) renderingservertest.cpp ) add_executable(testRenderingServer ${testRenderingServer_SRCS}) - target_link_libraries(testRenderingServer KF5::WaylandServer Qt5::Concurrent Qt5::Widgets) + target_link_libraries(testRenderingServer Plasma::KWaylandServer Qt5::Concurrent Qt5::Widgets) ecm_mark_as_test(testRenderingServer) endif() diff --git a/src/wayland/tests/copyclient.cpp b/src/wayland/tests/copyclient.cpp index f220a47c9d..76ca1a1ce8 100644 --- a/src/wayland/tests/copyclient.cpp +++ b/src/wayland/tests/copyclient.cpp @@ -3,19 +3,19 @@ SPDX-License-Identifier: LGPL-2.1-only OR LGPL-3.0-only OR LicenseRef-KDE-Accepted-LGPL */ -#include "../src/client/compositor.h" -#include "../src/client/connection_thread.h" -#include "../src/client/datadevice.h" -#include "../src/client/datadevicemanager.h" -#include "../src/client/datasource.h" -#include "../src/client/event_queue.h" -#include "../src/client/keyboard.h" -#include "../src/client/pointer.h" -#include "../src/client/registry.h" -#include "../src/client/seat.h" -#include "../src/client/shell.h" -#include "../src/client/shm_pool.h" -#include "../src/client/surface.h" +#include "KWayland/Client/compositor.h" +#include "KWayland/Client/connection_thread.h" +#include "KWayland/Client/datadevice.h" +#include "KWayland/Client/datadevicemanager.h" +#include "KWayland/Client/datasource.h" +#include "KWayland/Client/event_queue.h" +#include "KWayland/Client/keyboard.h" +#include "KWayland/Client/pointer.h" +#include "KWayland/Client/registry.h" +#include "KWayland/Client/seat.h" +#include "KWayland/Client/shell.h" +#include "KWayland/Client/shm_pool.h" +#include "KWayland/Client/surface.h" // Qt #include #include diff --git a/src/wayland/tests/dpmstest.cpp b/src/wayland/tests/dpmstest.cpp index 90641a67c9..bd0648c2ec 100644 --- a/src/wayland/tests/dpmstest.cpp +++ b/src/wayland/tests/dpmstest.cpp @@ -10,10 +10,10 @@ #include #include #include -#include "../src/client/connection_thread.h" -#include "../src/client/dpms.h" -#include "../src/client/registry.h" -#include "../src/client/output.h" +#include "KWayland/Client/connection_thread.h" +#include "KWayland/Client/dpms.h" +#include "KWayland/Client/registry.h" +#include "KWayland/Client/output.h" using namespace KWayland::Client; diff --git a/src/wayland/tests/paneltest.cpp b/src/wayland/tests/paneltest.cpp index 3c09efba2d..9280358e0f 100644 --- a/src/wayland/tests/paneltest.cpp +++ b/src/wayland/tests/paneltest.cpp @@ -3,21 +3,21 @@ SPDX-License-Identifier: LGPL-2.1-only OR LGPL-3.0-only OR LicenseRef-KDE-Accepted-LGPL */ -#include "../src/client/compositor.h" -#include "../src/client/connection_thread.h" -#include "../src/client/datadevice.h" -#include "../src/client/datadevicemanager.h" -#include "../src/client/dataoffer.h" -#include "../src/client/event_queue.h" -#include "../src/client/keyboard.h" -#include "../src/client/plasmashell.h" -#include "../src/client/plasmawindowmanagement.h" -#include "../src/client/pointer.h" -#include "../src/client/registry.h" -#include "../src/client/seat.h" -#include "../src/client/shell.h" -#include "../src/client/shm_pool.h" -#include "../src/client/surface.h" +#include "KWayland/Client/compositor.h" +#include "KWayland/Client/connection_thread.h" +#include "KWayland/Client/datadevice.h" +#include "KWayland/Client/datadevicemanager.h" +#include "KWayland/Client/dataoffer.h" +#include "KWayland/Client/event_queue.h" +#include "KWayland/Client/keyboard.h" +#include "KWayland/Client/plasmashell.h" +#include "KWayland/Client/plasmawindowmanagement.h" +#include "KWayland/Client/pointer.h" +#include "KWayland/Client/registry.h" +#include "KWayland/Client/seat.h" +#include "KWayland/Client/shell.h" +#include "KWayland/Client/shm_pool.h" +#include "KWayland/Client/surface.h" // Qt #include #include diff --git a/src/wayland/tests/pasteclient.cpp b/src/wayland/tests/pasteclient.cpp index 9a0f96e2b9..e4f23e9d2e 100644 --- a/src/wayland/tests/pasteclient.cpp +++ b/src/wayland/tests/pasteclient.cpp @@ -3,19 +3,19 @@ SPDX-License-Identifier: LGPL-2.1-only OR LGPL-3.0-only OR LicenseRef-KDE-Accepted-LGPL */ -#include "../src/client/compositor.h" -#include "../src/client/connection_thread.h" -#include "../src/client/datadevice.h" -#include "../src/client/datadevicemanager.h" -#include "../src/client/dataoffer.h" -#include "../src/client/event_queue.h" -#include "../src/client/keyboard.h" -#include "../src/client/pointer.h" -#include "../src/client/registry.h" -#include "../src/client/seat.h" -#include "../src/client/shell.h" -#include "../src/client/shm_pool.h" -#include "../src/client/surface.h" +#include "KWayland/Client/compositor.h" +#include "KWayland/Client/connection_thread.h" +#include "KWayland/Client/datadevice.h" +#include "KWayland/Client/datadevicemanager.h" +#include "KWayland/Client/dataoffer.h" +#include "KWayland/Client/event_queue.h" +#include "KWayland/Client/keyboard.h" +#include "KWayland/Client/pointer.h" +#include "KWayland/Client/registry.h" +#include "KWayland/Client/seat.h" +#include "KWayland/Client/shell.h" +#include "KWayland/Client/shm_pool.h" +#include "KWayland/Client/surface.h" // Qt #include #include diff --git a/src/wayland/tests/plasmasurfacetest.cpp b/src/wayland/tests/plasmasurfacetest.cpp index 97ac9da20d..fd62bcf35a 100644 --- a/src/wayland/tests/plasmasurfacetest.cpp +++ b/src/wayland/tests/plasmasurfacetest.cpp @@ -3,14 +3,14 @@ SPDX-License-Identifier: LGPL-2.1-only OR LGPL-3.0-only OR LicenseRef-KDE-Accepted-LGPL */ -#include "../src/client/compositor.h" -#include "../src/client/connection_thread.h" -#include "../src/client/event_queue.h" -#include "../src/client/registry.h" -#include "../src/client/shell.h" -#include "../src/client/shm_pool.h" -#include "../src/client/surface.h" -#include "../src/client/plasmashell.h" +#include "KWayland/Client/compositor.h" +#include "KWayland/Client/connection_thread.h" +#include "KWayland/Client/event_queue.h" +#include "KWayland/Client/registry.h" +#include "KWayland/Client/shell.h" +#include "KWayland/Client/shm_pool.h" +#include "KWayland/Client/surface.h" +#include "KWayland/Client/plasmashell.h" // Qt #include #include diff --git a/src/wayland/tests/qtwaylandintegrationtest.cpp b/src/wayland/tests/qtwaylandintegrationtest.cpp index 7088f25826..0c0e2efb4b 100644 --- a/src/wayland/tests/qtwaylandintegrationtest.cpp +++ b/src/wayland/tests/qtwaylandintegrationtest.cpp @@ -4,15 +4,15 @@ SPDX-License-Identifier: LGPL-2.1-only OR LGPL-3.0-only OR LicenseRef-KDE-Accepted-LGPL */ #include "qtwaylandintegrationtest.h" -// KWin::Wayland -#include <../src/client/buffer.h> -#include <../src/client/compositor.h> -#include <../src/client/connection_thread.h> -#include <../src/client/pointer.h> -#include <../src/client/registry.h> -#include <../src/client/shell.h> -#include <../src/client/shm_pool.h> -#include <../src/client/surface.h> +// KWayland::Client +#include +#include +#include +#include +#include +#include +#include +#include // Qt #include #include diff --git a/src/wayland/tests/shadowtest.cpp b/src/wayland/tests/shadowtest.cpp index 1e63542883..2e0d2e968c 100644 --- a/src/wayland/tests/shadowtest.cpp +++ b/src/wayland/tests/shadowtest.cpp @@ -3,14 +3,14 @@ SPDX-License-Identifier: LGPL-2.1-only OR LGPL-3.0-only OR LicenseRef-KDE-Accepted-LGPL */ -#include "../src/client/compositor.h" -#include "../src/client/connection_thread.h" -#include "../src/client/event_queue.h" -#include "../src/client/registry.h" -#include "../src/client/shadow.h" -#include "../src/client/shell.h" -#include "../src/client/shm_pool.h" -#include "../src/client/surface.h" +#include "KWayland/Client/compositor.h" +#include "KWayland/Client/connection_thread.h" +#include "KWayland/Client/event_queue.h" +#include "KWayland/Client/registry.h" +#include "KWayland/Client/shadow.h" +#include "KWayland/Client/shell.h" +#include "KWayland/Client/shm_pool.h" +#include "KWayland/Client/surface.h" // Qt #include #include diff --git a/src/wayland/tests/subsurfacetest.cpp b/src/wayland/tests/subsurfacetest.cpp index 20b18ce284..61598017b8 100644 --- a/src/wayland/tests/subsurfacetest.cpp +++ b/src/wayland/tests/subsurfacetest.cpp @@ -3,19 +3,19 @@ SPDX-License-Identifier: LGPL-2.1-only OR LGPL-3.0-only OR LicenseRef-KDE-Accepted-LGPL */ -#include "../src/client/compositor.h" -#include "../src/client/connection_thread.h" -#include "../src/client/datadevice.h" -#include "../src/client/datadevicemanager.h" -#include "../src/client/dataoffer.h" -#include "../src/client/event_queue.h" -#include "../src/client/keyboard.h" -#include "../src/client/registry.h" -#include "../src/client/seat.h" -#include "../src/client/shell.h" -#include "../src/client/shm_pool.h" -#include "../src/client/subcompositor.h" -#include "../src/client/surface.h" +#include "KWayland/Client/compositor.h" +#include "KWayland/Client/connection_thread.h" +#include "KWayland/Client/datadevice.h" +#include "KWayland/Client/datadevicemanager.h" +#include "KWayland/Client/dataoffer.h" +#include "KWayland/Client/event_queue.h" +#include "KWayland/Client/keyboard.h" +#include "KWayland/Client/registry.h" +#include "KWayland/Client/seat.h" +#include "KWayland/Client/shell.h" +#include "KWayland/Client/shm_pool.h" +#include "KWayland/Client/subcompositor.h" +#include "KWayland/Client/surface.h" // Qt #include #include diff --git a/src/wayland/tests/touchclienttest.cpp b/src/wayland/tests/touchclienttest.cpp index 1bbdf97edc..6585af1a72 100644 --- a/src/wayland/tests/touchclienttest.cpp +++ b/src/wayland/tests/touchclienttest.cpp @@ -5,19 +5,19 @@ */ #include "touchclienttest.h" // KWin::Wayland -#include <../src/client/buffer.h> -#include <../src/client/compositor.h> -#include <../src/client/connection_thread.h> -#include <../src/client/event_queue.h> -#include <../src/client/keyboard.h> -#include <../src/client/output.h> -#include <../src/client/pointer.h> -#include <../src/client/registry.h> -#include <../src/client/seat.h> -#include <../src/client/shell.h> -#include <../src/client/shm_pool.h> -#include <../src/client/surface.h> -#include <../src/client/touch.h> +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include // Qt #include #include diff --git a/src/wayland/tests/xdgforeigntest.cpp b/src/wayland/tests/xdgforeigntest.cpp index 9e083dc2b8..f9aab01b20 100644 --- a/src/wayland/tests/xdgforeigntest.cpp +++ b/src/wayland/tests/xdgforeigntest.cpp @@ -4,15 +4,15 @@ SPDX-License-Identifier: LGPL-2.1-only OR LGPL-3.0-only OR LicenseRef-KDE-Accepted-LGPL */ -#include "../src/client/compositor.h" -#include "../src/client/connection_thread.h" -#include "../src/client/event_queue.h" -#include "../src/client/registry.h" -#include "../src/client/shell.h" -#include "../src/client/shm_pool.h" -#include "../src/client/server_decoration.h" -#include "../src/client/xdgshell.h" -#include "../src/client/xdgforeign.h" +#include "KWayland/Client/compositor.h" +#include "KWayland/Client/connection_thread.h" +#include "KWayland/Client/event_queue.h" +#include "KWayland/Client/registry.h" +#include "KWayland/Client/shell.h" +#include "KWayland/Client/shm_pool.h" +#include "KWayland/Client/server_decoration.h" +#include "KWayland/Client/xdgshell.h" +#include "KWayland/Client/xdgforeign.h" // Qt #include #include diff --git a/src/wayland/tests/xdgtest.cpp b/src/wayland/tests/xdgtest.cpp index c85ef4dd6d..1a0f4011ad 100644 --- a/src/wayland/tests/xdgtest.cpp +++ b/src/wayland/tests/xdgtest.cpp @@ -3,17 +3,17 @@ SPDX-License-Identifier: LGPL-2.1-only OR LGPL-3.0-only OR LicenseRef-KDE-Accepted-LGPL */ -#include "../src/client/compositor.h" -#include "../src/client/connection_thread.h" -#include "../src/client/event_queue.h" -#include "../src/client/registry.h" -#include "../src/client/shadow.h" -#include "../src/client/shell.h" -#include "../src/client/shm_pool.h" -#include "../src/client/surface.h" -#include "../src/client/xdgshell.h" -#include "../src/client/pointer.h" -#include "../src/client/seat.h" +#include "KWayland/Client/compositor.h" +#include "KWayland/Client/connection_thread.h" +#include "KWayland/Client/event_queue.h" +#include "KWayland/Client/registry.h" +#include "KWayland/Client/shadow.h" +#include "KWayland/Client/shell.h" +#include "KWayland/Client/shm_pool.h" +#include "KWayland/Client/surface.h" +#include "KWayland/Client/xdgshell.h" +#include "KWayland/Client/pointer.h" +#include "KWayland/Client/seat.h" // Qt #include #include