Remove KX11Extras and KWindowSystem

matinlotfali · Jan 15, 2024 · 65225f7 · 65225f7
1 parent 037ae3f
commit 65225f7
Show file tree

Hide file tree

Showing 4 changed files with 2 additions and 17 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -47,7 +47,6 @@ find_package(KF${QT_VERSION_MAJOR} ${KF_MIN_VERSION} REQUIRED COMPONENTS
     ConfigWidgets
     CoreAddons
     GlobalAccel
-    WindowSystem
 )
 if(${QT_VERSION_MAJOR} EQUAL 6)
     find_package(KF${QT_VERSION_MAJOR} ${KF_MIN_VERSION} REQUIRED COMPONENTS

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
@@ -20,7 +20,6 @@ target_link_libraries(kwin4_effect_shapecorners
     KF${QT_VERSION_MAJOR}::ConfigCore
     KF${QT_VERSION_MAJOR}::ConfigGui
     KF${QT_VERSION_MAJOR}::CoreAddons
-    KF${QT_VERSION_MAJOR}::WindowSystem
 )
 if(${QT_VERSION_MAJOR} EQUAL 6)
     target_link_libraries(kwin4_effect_shapecorners

diff --git a/src/ShapeCornersEffect.cpp b/src/ShapeCornersEffect.cpp
@@ -30,12 +30,6 @@
     #include <kwinglutils.h>
 #endif
 
-#if KWIN_EFFECT_API_VERSION >= 235
-    #include <KX11Extras>
-#else
-    #include <kwindowsystem.h>
-#endif
-
 ShapeCornersEffect::ShapeCornersEffect()
 #if KWIN_EFFECT_API_VERSION >= 236
     : KWin::OffscreenEffect()
@@ -61,14 +55,8 @@ ShapeCornersEffect::ShapeCornersEffect()
     }
 
     if(m_shaderManager.IsValid()) {
-#if KWIN_EFFECT_API_VERSION >= 235
-        const auto& windowList = KX11Extras::windows();
-#else
-        const auto& windowList = KWindowSystem::windows();
-#endif
-        for (const auto& id: windowList)
-            if (const auto win = KWin::effects->findWindow(id))
-                windowAdded(win);
+        for (const auto& win: KWin::effects->stackingOrder())
+            windowAdded(win);
         connect(KWin::effects, &KWin::EffectsHandler::windowAdded, this, &ShapeCornersEffect::windowAdded);
         connect(KWin::effects, &KWin::EffectsHandler::windowDeleted, this, &ShapeCornersEffect::windowRemoved);
     }

diff --git a/src/kcm/CMakeLists.txt b/src/kcm/CMakeLists.txt
@@ -28,5 +28,4 @@ target_link_libraries(kwin_shapecorners_config
     KF${QT_VERSION_MAJOR}::ConfigWidgets
     KF${QT_VERSION_MAJOR}::ConfigGui
     KF${QT_VERSION_MAJOR}::GlobalAccel
-    KF${QT_VERSION_MAJOR}::WindowSystem
 )