Drop some unused kwineffects.h includes

autotests/integration/activities_test.cpp

@@ -10,7 +10,6 @@
 
 #include "activities.h"
 #include "core/output.h"
-#include "libkwineffects/kwineffects.h"
 #include "pointer_input.h"
 #include "utils/xcbutils.h"
 #include "wayland_server.h"

autotests/integration/decoration_input_test.cpp

@@ -11,7 +11,6 @@
 #include "core/output.h"
 #include "cursor.h"
 #include "internalwindow.h"
-#include "libkwineffects/kwineffects.h"
 #include "pointer_input.h"
 #include "touch_input.h"
 #include "wayland_server.h"

autotests/integration/desktop_window_x11_test.cpp

@@ -9,7 +9,6 @@
 #include "kwin_wayland_test.h"
 
 #include "core/output.h"
-#include "libkwineffects/kwineffects.h"
 #include "pointer_input.h"
 #include "utils/xcbutils.h"
 #include "wayland_server.h"

autotests/integration/input_stacking_order.cpp

@@ -9,7 +9,6 @@
 #include "kwin_wayland_test.h"
 
 #include "core/output.h"
-#include "libkwineffects/kwineffects.h"
 #include "pointer_input.h"
 #include "wayland/seat.h"
 #include "wayland_server.h"

autotests/integration/plasmawindow_test.cpp

@@ -9,7 +9,6 @@
 #include "kwin_wayland_test.h"
 
 #include "core/output.h"
-#include "libkwineffects/kwineffects.h"
 #include "pointer_input.h"
 #include "wayland/seat.h"
 #include "wayland_server.h"

autotests/integration/shade_test.cpp

@@ -9,7 +9,6 @@
 #include "kwin_wayland_test.h"
 
 #include "core/output.h"
-#include "libkwineffects/kwineffects.h"
 #include "pointer_input.h"
 #include "wayland_server.h"
 #include "workspace.h"

autotests/integration/struts_test.cpp

@@ -9,7 +9,6 @@
 #include "kwin_wayland_test.h"
 
 #include "core/output.h"
-#include "libkwineffects/kwineffects.h"
 #include "pointer_input.h"
 #include "screenedge.h"
 #include "virtualdesktops.h"

autotests/integration/transient_placement.cpp

@@ -9,7 +9,6 @@
 #include "kwin_wayland_test.h"
 
 #include "core/output.h"
-#include "libkwineffects/kwineffects.h"
 #include "pointer_input.h"
 #include "wayland/seat.h"
 #include "wayland/surface.h"

src/effectloader.cpp

@@ -11,7 +11,7 @@
 // config
 #include <config-kwin.h>
 // KWin
-#include "libkwineffects/kwineffects.h"
+#include "libkwineffects/effect.h"
 #include "plugin.h"
 #include "scripting/scriptedeffect.h"
 #include "scripting/scriptedquicksceneeffect.h"

src/libkwineffects/effectframe.h

@@ -7,9 +7,11 @@
 
 #pragma once
 
+#include "libkwineffects/kwineffects.h" // FIXME: move infiniteRegion() elsewhere
 #include "libkwineffects/kwinoffscreenquickview.h"
 
 #include <QFont>
+#include <QIcon>
 
 namespace KWin
 {

src/libkwineffects/kwinoffscreenquickview.h

@@ -9,7 +9,7 @@
 
 #pragma once
 
-#include "libkwineffects/kwineffects.h"
+#include "kwin_export.h"
 
 #include <QObject>
 #include <QRect>

src/libkwineffects/kwinquickeffect.cpp

@@ -6,6 +6,7 @@
 
 #include "libkwineffects/kwinquickeffect.h"
 #include "core/output.h"
+#include "libkwineffects/kwineffects.h"
 
 #include "logging_p.h"
 

src/opengl/gltexture.cpp

@@ -10,7 +10,6 @@
 */
 
 #include "gltexture_p.h"
-#include "libkwineffects/kwineffects.h"
 #include "opengl/glplatform.h"
 #include "opengl/glutils.h"
 #include "opengl/glutils_funcs.h"

src/plugins/kdecorations/aurorae/src/aurorae.cpp

@@ -6,7 +6,6 @@
 #include "aurorae.h"
 
 #include "config-kwin.h"
-#include "libkwineffects/kwineffects.h"
 
 #include "auroraeshared.h"
 #include "auroraetheme.h"

src/plugins/outputlocator/outputlocator.cpp

@@ -6,6 +6,7 @@
 
 #include "outputlocator.h"
 #include "core/output.h"
+#include "libkwineffects/kwineffects.h"
 #include "libkwineffects/kwinoffscreenquickview.h"
 
 #include <algorithm>

src/plugins/overview/overvieweffect.cpp

@@ -5,6 +5,7 @@
 */
 
 #include "overvieweffect.h"
+#include "libkwineffects/kwineffects.h"
 #include "overviewconfig.h"
 
 #include <KGlobalAccel>

src/plugins/overview/overvieweffect.h

@@ -12,6 +12,8 @@
 namespace KWin
 {
 
+class VirtualDesktop;
+
 class OverviewEffect : public QuickSceneEffect
 {
     Q_OBJECT

src/plugins/private/expoarea.cpp

@@ -5,7 +5,8 @@
 */
 
 #include "expoarea.h"
-#include "core/output.h"
+#include "virtualdesktops.h"
+#include "workspace.h"
 
 namespace KWin
 {
@@ -62,7 +63,7 @@ void ExpoArea::update()
     }
     const QRectF oldRect = m_rect;
 
-    m_rect = effects->clientArea(MaximizeArea, m_screen, effects->currentDesktop());
+    m_rect = workspace()->clientArea(MaximizeArea, m_screen, VirtualDesktopManager::self()->currentDesktop());
 
     // Map the area to the output local coordinates.
     m_rect.translate(-m_screen->geometry().topLeft());

src/plugins/private/expoarea.h

@@ -6,7 +6,7 @@
 
 #pragma once
 
-#include "libkwineffects/kwineffects.h"
+#include "core/output.h"
 
 namespace KWin
 {

src/plugins/screencast/windowscreencastsource.cpp

@@ -12,8 +12,6 @@
 #include "core/renderloop.h"
 #include "core/rendertarget.h"
 #include "core/renderviewport.h"
-#include "effects.h"
-#include "libkwineffects/kwineffects.h"
 #include "opengl/gltexture.h"
 #include "opengl/glutils.h"
 #include "scene/itemrenderer.h"

src/plugins/tileseditor/tileseditoreffect.cpp

@@ -4,6 +4,7 @@
 */
 
 #include "tileseditoreffect.h"
+#include "libkwineffects/kwineffects.h"
 
 #include <QAction>
 #include <QQuickItem>

src/plugins/tileseditor/tileseditoreffect.h

@@ -8,6 +8,8 @@
 
 #include "libkwineffects/kwinquickeffect.h"
 
+#include <QAction>
+
 namespace KWin
 {
 

src/plugins/windowview/windowvieweffect.cpp

@@ -5,6 +5,7 @@
 */
 
 #include "windowvieweffect.h"
+#include "libkwineffects/kwineffects.h"
 #include "windowview1adaptor.h"
 #include "windowviewconfig.h"
 

src/shadow.h

@@ -9,8 +9,13 @@
 */
 #pragma once
 
-#include "libkwineffects/kwineffects.h"
+#include "kwin_export.h"
+
+#include <QImage>
 #include <QObject>
+#include <QRectF>
+
+#include <xcb/xcb.h>
 
 namespace KDecoration2
 {