From 8a0a91fea155be3944c9a4152be60bf3d6603873 Mon Sep 17 00:00:00 2001
From: Nicolas Fella <nicolas.fella@gmx.de>
Date: Sat, 15 Apr 2023 00:05:36 +0200
Subject: [PATCH] Port to standalone kglobalacceld

---
 .kde-ci.yml                                      | 1 +
 CMakeLists.txt                                   | 2 ++
 src/CMakeLists.txt                               | 3 ++-
 src/globalshortcuts.cpp                          | 4 ++--
 src/plugins/kglobalaccel/CMakeLists.txt          | 2 +-
 src/plugins/kglobalaccel/kglobalaccel_plugin.cpp | 2 +-
 src/plugins/kglobalaccel/kglobalaccel_plugin.h   | 4 ++--
 7 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/.kde-ci.yml b/.kde-ci.yml
index 514f9d8311..9029f5bafb 100644
--- a/.kde-ci.yml
+++ b/.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'
 
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 9c50170ca8..165a203136 100644
--- a/CMakeLists.txt
+++ b/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)
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 32d37d8d7a..b662b500b2 100644
--- a/src/CMakeLists.txt
+++ b/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
diff --git a/src/globalshortcuts.cpp b/src/globalshortcuts.cpp
index ff3d25baf3..8b18664608 100644
--- a/src/globalshortcuts.cpp
+++ b/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
diff --git a/src/plugins/kglobalaccel/CMakeLists.txt b/src/plugins/kglobalaccel/CMakeLists.txt
index c2bbb443d0..35c1fe0d07 100644
--- a/src/plugins/kglobalaccel/CMakeLists.txt
+++ b/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)
diff --git a/src/plugins/kglobalaccel/kglobalaccel_plugin.cpp b/src/plugins/kglobalaccel/kglobalaccel_plugin.cpp
index 122f95ec40..a14bcfd600 100644
--- a/src/plugins/kglobalaccel/kglobalaccel_plugin.cpp
+++ b/src/plugins/kglobalaccel/kglobalaccel_plugin.cpp
@@ -13,7 +13,7 @@
 #include <QDebug>
 
 KGlobalAccelImpl::KGlobalAccelImpl(QObject *parent)
-    : KGlobalAccelInterfaceV2(parent)
+    : KGlobalAccelInterface(parent)
 {
 }
 
diff --git a/src/plugins/kglobalaccel/kglobalaccel_plugin.h b/src/plugins/kglobalaccel/kglobalaccel_plugin.h
index 0467894072..804b3a8c4e 100644
--- a/src/plugins/kglobalaccel/kglobalaccel_plugin.h
+++ b/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")