Port to standalone kglobalacceld

.kde-ci.yml

@@ -32,6 +32,7 @@ Dependencies:
     'libraries/plasma-wayland-protocols': '@latest-kf6'
     'plasma/breeze': '@same'
     'plasma/kdecoration': '@same'
+    'plasma/kglobalacceld': '@same'
     'plasma/kpipewire': '@same'
     'plasma/kscreenlocker': '@same'
 

CMakeLists.txt

@@ -350,6 +350,8 @@ set_package_properties(QAccessibilityClient6 PROPERTIES
 )
 set(HAVE_ACCESSIBILITY ${QAccessibilityClient6_FOUND})
 
+find_package(KGlobalAccelD REQUIRED)
+
 ecm_find_qmlmodule(QtQuick 2.3)
 ecm_find_qmlmodule(QtQuick.Controls 2.15)
 ecm_find_qmlmodule(QtQuick.Layouts 1.3)

src/CMakeLists.txt

@@ -198,7 +198,6 @@ target_link_libraries(kwin
     KF6::CoreAddons
     KF6::Crash
     KF6::GlobalAccel
-    KF6::GlobalAccelPrivate
     KF6::I18n
     KF6::Package
     KF6::Service
@@ -207,6 +206,8 @@ target_link_libraries(kwin
     KDecoration2::KDecoration
     KDecoration2::KDecoration2Private
 
+    K::KGlobalAccelD
+
     XCB::COMPOSITE
     XCB::CURSOR
     XCB::DAMAGE

src/globalshortcuts.cpp

@@ -16,8 +16,8 @@
 #include "main.h"
 #include "utils/common.h"
 // KDE
-#include <private/kglobalaccel_interface.h>
-#include <private/kglobalacceld.h>
+#include <kglobalaccel_interface.h>
+#include <kglobalacceld.h>
 // Qt
 #include <QAction>
 // system

src/plugins/kglobalaccel/CMakeLists.txt

@@ -5,4 +5,4 @@ set(kglobalaccel_plugin_SRCS
 add_library(KF6GlobalAccelKWinPlugin OBJECT ${kglobalaccel_plugin_SRCS})
 set_property(TARGET KF6GlobalAccelKWinPlugin PROPERTY POSITION_INDEPENDENT_CODE ON)
 target_compile_definitions(KF6GlobalAccelKWinPlugin PRIVATE QT_STATICPLUGIN)
-target_link_libraries(KF6GlobalAccelKWinPlugin KF6::GlobalAccelPrivate kwin)
+target_link_libraries(KF6GlobalAccelKWinPlugin K::KGlobalAccelD kwin)

src/plugins/kglobalaccel/kglobalaccel_plugin.cpp

@@ -13,7 +13,7 @@
 #include <QDebug>
 
 KGlobalAccelImpl::KGlobalAccelImpl(QObject *parent)
-    : KGlobalAccelInterfaceV2(parent)
+    : KGlobalAccelInterface(parent)
 {
 }
 

src/plugins/kglobalaccel/kglobalaccel_plugin.h

@@ -8,11 +8,11 @@
 */
 #pragma once
 
-#include <private/kglobalaccel_interface.h>
+#include <kglobalaccel_interface.h>
 
 #include <QObject>
 
-class KGlobalAccelImpl : public KGlobalAccelInterfaceV2
+class KGlobalAccelImpl : public KGlobalAccelInterface
 {
     Q_OBJECT
     Q_PLUGIN_METADATA(IID KGlobalAccelInterface_iid FILE "kwin.json")