From 624a453109c5255cf7d10309d017fcfbc3184bb8 Mon Sep 17 00:00:00 2001 From: Vlad Zagorodniy Date: Fri, 31 Aug 2018 21:28:22 +0300 Subject: [PATCH] Clean up includes Summary: * effects.h includes client.h and forward declares Client, both at the same time. Thus, delete the include; * the blur effect includes effects.h. That, most likely, is a leftover after 3f5bf65a9ec8fa413ca59dd07df267c8b765329c. Test Plan: Compiles. Reviewers: #kwin, davidedmundson Reviewed By: #kwin, davidedmundson Subscribers: kwin Tags: #kwin Differential Revision: https://phabricator.kde.org/D15191 --- autotests/integration/effects/slidingpopups_test.cpp | 1 + autotests/integration/effects/translucency_test.cpp | 1 + autotests/integration/effects/wobbly_shade_test.cpp | 1 + autotests/integration/move_resize_window_test.cpp | 1 + autotests/integration/x11_client_test.cpp | 1 + effects.h | 5 ++++- effects/blur/blur.cpp | 2 +- pointer_input.cpp | 1 + window_property_notify_x11_filter.cpp | 1 + 9 files changed, 12 insertions(+), 2 deletions(-) diff --git a/autotests/integration/effects/slidingpopups_test.cpp b/autotests/integration/effects/slidingpopups_test.cpp index 0622d53a74..a67eb40a88 100644 --- a/autotests/integration/effects/slidingpopups_test.cpp +++ b/autotests/integration/effects/slidingpopups_test.cpp @@ -18,6 +18,7 @@ You should have received a copy of the GNU General Public License along with this program. If not, see . *********************************************************************/ #include "kwin_wayland_test.h" +#include "client.h" #include "composite.h" #include "effects.h" #include "effectloader.h" diff --git a/autotests/integration/effects/translucency_test.cpp b/autotests/integration/effects/translucency_test.cpp index 055c851bfd..0a6c7506b8 100644 --- a/autotests/integration/effects/translucency_test.cpp +++ b/autotests/integration/effects/translucency_test.cpp @@ -18,6 +18,7 @@ You should have received a copy of the GNU General Public License along with this program. If not, see . *********************************************************************/ #include "kwin_wayland_test.h" +#include "client.h" #include "composite.h" #include "effects.h" #include "effectloader.h" diff --git a/autotests/integration/effects/wobbly_shade_test.cpp b/autotests/integration/effects/wobbly_shade_test.cpp index f251b9623e..5693da3793 100644 --- a/autotests/integration/effects/wobbly_shade_test.cpp +++ b/autotests/integration/effects/wobbly_shade_test.cpp @@ -18,6 +18,7 @@ You should have received a copy of the GNU General Public License along with this program. If not, see . *********************************************************************/ #include "kwin_wayland_test.h" +#include "client.h" #include "composite.h" #include "cursor.h" #include "effects.h" diff --git a/autotests/integration/move_resize_window_test.cpp b/autotests/integration/move_resize_window_test.cpp index 8b71765a50..3c3b3506e5 100644 --- a/autotests/integration/move_resize_window_test.cpp +++ b/autotests/integration/move_resize_window_test.cpp @@ -22,6 +22,7 @@ along with this program. If not, see . #include "atoms.h" #include "platform.h" #include "abstract_client.h" +#include "client.h" #include "cursor.h" #include "effects.h" #include "screens.h" diff --git a/autotests/integration/x11_client_test.cpp b/autotests/integration/x11_client_test.cpp index f718e7bfbe..7be40fe7bb 100644 --- a/autotests/integration/x11_client_test.cpp +++ b/autotests/integration/x11_client_test.cpp @@ -19,6 +19,7 @@ along with this program. If not, see . *********************************************************************/ #include "kwin_wayland_test.h" #include "atoms.h" +#include "client.h" #include "composite.h" #include "effects.h" #include "effectloader.h" diff --git a/effects.h b/effects.h index 3388466fe1..3b68e3df1f 100644 --- a/effects.h +++ b/effects.h @@ -24,12 +24,13 @@ along with this program. If not, see . #include "kwineffects.h" -#include "client.h" #include "scene.h" #include #include +#include + namespace Plasma { class Theme; } @@ -53,10 +54,12 @@ class AbstractThumbnailItem; class DesktopThumbnailItem; class WindowThumbnailItem; +class AbstractClient; class Client; class Compositor; class Deleted; class EffectLoader; +class Toplevel; class Unmanaged; class WindowPropertyNotifyX11Filter; diff --git a/effects/blur/blur.cpp b/effects/blur/blur.cpp index 1e7945076d..be4d4fa20e 100644 --- a/effects/blur/blur.cpp +++ b/effects/blur/blur.cpp @@ -20,11 +20,11 @@ */ #include "blur.h" -#include "effects.h" #include "blurshader.h" // KConfigSkeleton #include "blurconfig.h" +#include #include #include #include // for QGuiApplication diff --git a/pointer_input.cpp b/pointer_input.cpp index 955fd8e9ae..e876f7c226 100644 --- a/pointer_input.cpp +++ b/pointer_input.cpp @@ -19,6 +19,7 @@ along with this program. If not, see . *********************************************************************/ #include "pointer_input.h" #include "platform.h" +#include "client.h" #include "effects.h" #include "input_event.h" #include "input_event_spy.h" diff --git a/window_property_notify_x11_filter.cpp b/window_property_notify_x11_filter.cpp index 293a5026cf..69f6d42d7f 100644 --- a/window_property_notify_x11_filter.cpp +++ b/window_property_notify_x11_filter.cpp @@ -18,6 +18,7 @@ You should have received a copy of the GNU General Public License along with this program. If not, see . *********************************************************************/ #include "window_property_notify_x11_filter.h" +#include "client.h" #include "effects.h" #include "unmanaged.h" #include "workspace.h"