From 0b21c53d4463bab482c1dfbc915c1fd48b3a98d2 Mon Sep 17 00:00:00 2001 From: Vlad Zahorodnii Date: Fri, 29 Sep 2023 11:46:16 +0300 Subject: [PATCH] Move resource_cast helper to shared utils/ directory --- src/{wayland/utils.h => utils/resource.h} | 2 -- src/wayland/datacontrolsource_v1.cpp | 2 +- src/wayland/datasource.cpp | 2 +- src/wayland/drmlease_v1.cpp | 2 +- src/wayland/output.cpp | 2 +- src/wayland/outputdevice_v2.cpp | 2 +- src/wayland/plasmashell.cpp | 2 +- src/wayland/pointer.cpp | 2 +- src/wayland/primaryselectionsource_v1.cpp | 2 +- src/wayland/region.cpp | 2 +- src/wayland/seat.cpp | 2 +- src/wayland/surface.cpp | 2 +- src/wayland/surface_p.h | 1 - src/wayland/tablet_v2.cpp | 2 +- src/wayland/xdgshell.cpp | 2 +- src/wayland/xdgtopleveldrag_v1.cpp | 2 +- 16 files changed, 14 insertions(+), 17 deletions(-) rename src/{wayland/utils.h => utils/resource.h} (95%) diff --git a/src/wayland/utils.h b/src/utils/resource.h similarity index 95% rename from src/wayland/utils.h rename to src/utils/resource.h index a5b8b0687d..ebff80562e 100644 --- a/src/wayland/utils.h +++ b/src/utils/resource.h @@ -6,8 +6,6 @@ #pragma once -#include "kwin_export.h" - #include #include diff --git a/src/wayland/datacontrolsource_v1.cpp b/src/wayland/datacontrolsource_v1.cpp index 11cba29b03..734c41cdea 100644 --- a/src/wayland/datacontrolsource_v1.cpp +++ b/src/wayland/datacontrolsource_v1.cpp @@ -6,7 +6,7 @@ #include "datacontrolsource_v1.h" #include "clientconnection.h" #include "datacontroldevicemanager_v1.h" -#include "utils.h" +#include "utils/resource.h" // Qt #include // Wayland diff --git a/src/wayland/datasource.cpp b/src/wayland/datasource.cpp index 08fab2ce6c..418a160e01 100644 --- a/src/wayland/datasource.cpp +++ b/src/wayland/datasource.cpp @@ -8,7 +8,7 @@ #include "clientconnection.h" #include "datadevicemanager.h" #include "datasource_p.h" -#include "utils.h" +#include "utils/resource.h" // Qt #include // Wayland diff --git a/src/wayland/drmlease_v1.cpp b/src/wayland/drmlease_v1.cpp index 14432fe5df..e8a32cf938 100644 --- a/src/wayland/drmlease_v1.cpp +++ b/src/wayland/drmlease_v1.cpp @@ -6,8 +6,8 @@ #include "drmlease_v1.h" #include "display.h" #include "drmlease_v1_p.h" -#include "utils.h" #include "utils/common.h" +#include "utils/resource.h" #include #include diff --git a/src/wayland/output.cpp b/src/wayland/output.cpp index 8141d9981a..4c51f99b40 100644 --- a/src/wayland/output.cpp +++ b/src/wayland/output.cpp @@ -7,7 +7,7 @@ #include "output.h" #include "display.h" #include "display_p.h" -#include "utils.h" +#include "utils/resource.h" #include "core/output.h" diff --git a/src/wayland/outputdevice_v2.cpp b/src/wayland/outputdevice_v2.cpp index 3c6b8fd7a4..0239326637 100644 --- a/src/wayland/outputdevice_v2.cpp +++ b/src/wayland/outputdevice_v2.cpp @@ -8,8 +8,8 @@ #include "display.h" #include "display_p.h" -#include "utils.h" #include "utils/common.h" +#include "utils/resource.h" #include "core/output.h" diff --git a/src/wayland/plasmashell.cpp b/src/wayland/plasmashell.cpp index 99d8b50210..cc4afe51e3 100644 --- a/src/wayland/plasmashell.cpp +++ b/src/wayland/plasmashell.cpp @@ -7,7 +7,7 @@ #include "plasmashell.h" #include "display.h" #include "surface.h" -#include "utils.h" +#include "utils/resource.h" #include diff --git a/src/wayland/pointer.cpp b/src/wayland/pointer.cpp index 20d3b6d4a3..3cead34ec9 100644 --- a/src/wayland/pointer.cpp +++ b/src/wayland/pointer.cpp @@ -14,8 +14,8 @@ #include "relativepointer_v1_p.h" #include "seat.h" #include "surface.h" -#include "utils.h" #include "utils/common.h" +#include "utils/resource.h" namespace KWin { diff --git a/src/wayland/primaryselectionsource_v1.cpp b/src/wayland/primaryselectionsource_v1.cpp index 4b1d0e85dc..a86012b24f 100644 --- a/src/wayland/primaryselectionsource_v1.cpp +++ b/src/wayland/primaryselectionsource_v1.cpp @@ -6,7 +6,7 @@ #include "primaryselectionsource_v1.h" #include "clientconnection.h" #include "primaryselectiondevicemanager_v1.h" -#include "utils.h" +#include "utils/resource.h" // Qt #include // Wayland diff --git a/src/wayland/region.cpp b/src/wayland/region.cpp index c44d49062e..db180ebf26 100644 --- a/src/wayland/region.cpp +++ b/src/wayland/region.cpp @@ -5,7 +5,7 @@ SPDX-License-Identifier: LGPL-2.1-only OR LGPL-3.0-only OR LicenseRef-KDE-Accepted-LGPL */ #include "region_p.h" -#include "utils.h" +#include "utils/resource.h" namespace KWin { diff --git a/src/wayland/seat.cpp b/src/wayland/seat.cpp index 64976bf675..4c9232eb93 100644 --- a/src/wayland/seat.cpp +++ b/src/wayland/seat.cpp @@ -29,8 +29,8 @@ #include "textinput_v2_p.h" #include "textinput_v3_p.h" #include "touch_p.h" -#include "utils.h" #include "utils/common.h" +#include "utils/resource.h" #include "xdgtopleveldrag_v1.h" #include diff --git a/src/wayland/surface.cpp b/src/wayland/surface.cpp index 2e6027a0ca..5532f2be6d 100644 --- a/src/wayland/surface.cpp +++ b/src/wayland/surface.cpp @@ -21,7 +21,7 @@ #include "subcompositor.h" #include "surface_p.h" #include "transaction.h" -#include "utils.h" +#include "utils/resource.h" #include // std diff --git a/src/wayland/surface_p.h b/src/wayland/surface_p.h index b0b25b510a..9ce1eb8036 100644 --- a/src/wayland/surface_p.h +++ b/src/wayland/surface_p.h @@ -8,7 +8,6 @@ #include "core/graphicsbuffer.h" #include "surface.h" -#include "utils.h" // Qt #include #include diff --git a/src/wayland/tablet_v2.cpp b/src/wayland/tablet_v2.cpp index 9e983491bd..313c9a29fb 100644 --- a/src/wayland/tablet_v2.cpp +++ b/src/wayland/tablet_v2.cpp @@ -8,7 +8,7 @@ #include "display.h" #include "seat.h" #include "surface.h" -#include "utils.h" +#include "utils/resource.h" #include "qwayland-server-tablet-unstable-v2.h" diff --git a/src/wayland/xdgshell.cpp b/src/wayland/xdgshell.cpp index cb4cc6c3e5..3a587692a0 100644 --- a/src/wayland/xdgshell.cpp +++ b/src/wayland/xdgshell.cpp @@ -10,8 +10,8 @@ #include "display.h" #include "output.h" #include "seat.h" -#include "utils.h" #include "utils/common.h" +#include "utils/resource.h" #include diff --git a/src/wayland/xdgtopleveldrag_v1.cpp b/src/wayland/xdgtopleveldrag_v1.cpp index aa03684448..6e0a8ddf85 100644 --- a/src/wayland/xdgtopleveldrag_v1.cpp +++ b/src/wayland/xdgtopleveldrag_v1.cpp @@ -10,7 +10,7 @@ #include "datasource_p.h" #include "display.h" #include "surface.h" -#include "utils.h" +#include "utils/resource.h" #include "xdgshell.h" #include