From 892edf94d54bdee1d99bddfc71527e26b3c46653 Mon Sep 17 00:00:00 2001 From: Vlad Zahorodnii Date: Tue, 2 May 2023 21:47:17 +0300 Subject: [PATCH] Remove unused "output_interface.h" include output_interface.h used to be included because of its output transform enums. It's not needed after switching to Output::Transform. --- src/wayland/autotests/client/test_wayland_surface.cpp | 1 + .../autotests/server/test_inputmethod_interface.cpp | 1 + src/wayland/layershell_v1_interface.cpp | 1 + src/wayland/plasmawindowmanagement_interface.cpp | 1 + src/wayland/surface_interface.cpp | 1 + src/wayland/surface_interface.h | 7 +++++-- 6 files changed, 10 insertions(+), 2 deletions(-) diff --git a/src/wayland/autotests/client/test_wayland_surface.cpp b/src/wayland/autotests/client/test_wayland_surface.cpp index 54a7f931b3..2e5a071f16 100644 --- a/src/wayland/autotests/client/test_wayland_surface.cpp +++ b/src/wayland/autotests/client/test_wayland_surface.cpp @@ -11,6 +11,7 @@ #include "wayland/compositor_interface.h" #include "wayland/display.h" #include "wayland/idleinhibit_v1_interface.h" +#include "wayland/output_interface.h" #include "wayland/shmclientbuffer.h" #include "wayland/surface_interface.h" diff --git a/src/wayland/autotests/server/test_inputmethod_interface.cpp b/src/wayland/autotests/server/test_inputmethod_interface.cpp index 5191b15c46..6fbf6557b1 100644 --- a/src/wayland/autotests/server/test_inputmethod_interface.cpp +++ b/src/wayland/autotests/server/test_inputmethod_interface.cpp @@ -15,6 +15,7 @@ #include "wayland/compositor_interface.h" #include "wayland/display.h" #include "wayland/inputmethod_v1_interface.h" +#include "wayland/output_interface.h" #include "wayland/seat_interface.h" #include "KWayland/Client/compositor.h" diff --git a/src/wayland/layershell_v1_interface.cpp b/src/wayland/layershell_v1_interface.cpp index 64c8cb5796..70e3d242f5 100644 --- a/src/wayland/layershell_v1_interface.cpp +++ b/src/wayland/layershell_v1_interface.cpp @@ -6,6 +6,7 @@ #include "layershell_v1_interface.h" #include "display.h" +#include "output_interface.h" #include "surface_interface.h" #include "surfacerole_p.h" #include "utils/common.h" diff --git a/src/wayland/plasmawindowmanagement_interface.cpp b/src/wayland/plasmawindowmanagement_interface.cpp index d8e890aad1..252e0d4607 100644 --- a/src/wayland/plasmawindowmanagement_interface.cpp +++ b/src/wayland/plasmawindowmanagement_interface.cpp @@ -5,6 +5,7 @@ */ #include "plasmawindowmanagement_interface.h" #include "display.h" +#include "output_interface.h" #include "plasmavirtualdesktop_interface.h" #include "surface_interface.h" #include "utils/common.h" diff --git a/src/wayland/surface_interface.cpp b/src/wayland/surface_interface.cpp index 83e8f31fef..5293af5455 100644 --- a/src/wayland/surface_interface.cpp +++ b/src/wayland/surface_interface.cpp @@ -12,6 +12,7 @@ #include "fractionalscale_v1_interface_p.h" #include "idleinhibit_v1_interface_p.h" #include "linuxdmabufv1clientbuffer.h" +#include "output_interface.h" #include "pointerconstraints_v1_interface_p.h" #include "region_interface_p.h" #include "subcompositor_interface.h" diff --git a/src/wayland/surface_interface.h b/src/wayland/surface_interface.h index e9e5861900..6364336b07 100644 --- a/src/wayland/surface_interface.h +++ b/src/wayland/surface_interface.h @@ -7,13 +7,14 @@ #pragma once #include "core/output.h" -#include "output_interface.h" #include #include #include #include +struct wl_resource; + namespace KWin { class GraphicsBuffer; @@ -22,15 +23,17 @@ class GraphicsBuffer; namespace KWaylandServer { class BlurInterface; +class ClientConnection; class ConfinedPointerV1Interface; class ContrastInterface; class CompositorInterface; +class LinuxDmaBufV1Feedback; class LockedPointerV1Interface; +class OutputInterface; class ShadowInterface; class SlideInterface; class SubSurfaceInterface; class SurfaceInterfacePrivate; -class LinuxDmaBufV1Feedback; enum class PresentationHint { VSync,