From 0d3b017b2379185e484b266598f09b6544ee41bf Mon Sep 17 00:00:00 2001
From: Alexander Lohnau <alexander.lohnau@gmx.de>
Date: Sun, 22 Oct 2023 07:09:07 +0200
Subject: [PATCH] Avoid QtDBus module include in commonly used headers

Because all of QtCore and QtDBus is no longer pulled in, a few placed had to get explicit includes
---
 autotests/integration/test_helpers.cpp | 2 +-
 src/backends/libinput/device.h         | 2 +-
 src/dbusinterface.cpp                  | 1 +
 src/dbusinterface.h                    | 3 ++-
 src/kcms/desktop/virtualdesktops.cpp   | 2 ++
 src/kcms/rules/kcmrules.cpp            | 2 ++
 src/kcms/rules/rulesmodel.cpp          | 8 +++++++-
 src/pluginmanager.cpp                  | 1 +
 src/virtualdesktopsdbustypes.h         | 2 +-
 src/workspace.cpp                      | 5 +++++
 10 files changed, 23 insertions(+), 5 deletions(-)

diff --git a/autotests/integration/test_helpers.cpp b/autotests/integration/test_helpers.cpp
index 52b1c90843..59c7842ff3 100644
--- a/autotests/integration/test_helpers.cpp
+++ b/autotests/integration/test_helpers.cpp
@@ -46,7 +46,7 @@
 
 #include <QFutureWatcher>
 #include <QThread>
-#include <QtConcurrent>
+#include <QtConcurrentRun>
 
 // system
 #include <sys/socket.h>
diff --git a/src/backends/libinput/device.h b/src/backends/libinput/device.h
index 21c8bdec27..05e0338acb 100644
--- a/src/backends/libinput/device.h
+++ b/src/backends/libinput/device.h
@@ -420,7 +420,7 @@ public:
     {
         auto list = defaultValue("CalibrationMatrix", QList<float>{});
         if (list.size() == 16) {
-            return QMatrix4x4{list.toVector().constData()};
+            return QMatrix4x4{list.constData()};
         }
 
         return m_defaultCalibrationMatrix;
diff --git a/src/dbusinterface.cpp b/src/dbusinterface.cpp
index c7cfb78599..abecc29247 100644
--- a/src/dbusinterface.cpp
+++ b/src/dbusinterface.cpp
@@ -30,6 +30,7 @@
 #endif
 
 // Qt
+#include <QDBusConnection>
 #include <QOpenGLContext>
 
 namespace KWin
diff --git a/src/dbusinterface.h b/src/dbusinterface.h
index 6f2b5d1fe5..c42a3c4486 100644
--- a/src/dbusinterface.h
+++ b/src/dbusinterface.h
@@ -9,8 +9,9 @@
 
 #pragma once
 
+#include <QDBusContext>
+#include <QDBusMessage>
 #include <QObject>
-#include <QtDBus>
 
 #include "virtualdesktopsdbustypes.h"
 
diff --git a/src/kcms/desktop/virtualdesktops.cpp b/src/kcms/desktop/virtualdesktops.cpp
index 8a9497138e..e1d24b8eca 100644
--- a/src/kcms/desktop/virtualdesktops.cpp
+++ b/src/kcms/desktop/virtualdesktops.cpp
@@ -16,6 +16,8 @@
 #include <KConfigGroup>
 #include <KLocalizedString>
 #include <KPluginFactory>
+#include <QDBusConnection>
+#include <QDBusMessage>
 
 K_PLUGIN_FACTORY_WITH_JSON(VirtualDesktopsFactory,
                            "kcm_kwin_virtualdesktops.json",
diff --git a/src/kcms/rules/kcmrules.cpp b/src/kcms/rules/kcmrules.cpp
index e689075864..b794a06a9f 100644
--- a/src/kcms/rules/kcmrules.cpp
+++ b/src/kcms/rules/kcmrules.cpp
@@ -10,6 +10,8 @@
 
 #include <QDBusConnection>
 #include <QDBusMessage>
+#include <QDBusPendingCallWatcher>
+#include <QDBusPendingReply>
 
 #include <KConfig>
 #include <KLocalizedString>
diff --git a/src/kcms/rules/rulesmodel.cpp b/src/kcms/rules/rulesmodel.cpp
index b323595b80..c7aefb5a1c 100644
--- a/src/kcms/rules/rulesmodel.cpp
+++ b/src/kcms/rules/rulesmodel.cpp
@@ -11,9 +11,15 @@
 #include "activities.h"
 #endif
 
+#include <QDBusConnection>
+#include <QDBusMessage>
+#include <QDBusMetaType>
+#include <QDBusPendingCallWatcher>
+#include <QDBusPendingReply>
+#include <QFileInfo>
 #include <QIcon>
 #include <QQmlEngine>
-#include <QtDBus>
+#include <QTimer>
 
 #include <KColorSchemeManager>
 #include <KConfig>
diff --git a/src/pluginmanager.cpp b/src/pluginmanager.cpp
index 3e058caf5f..b94078f252 100644
--- a/src/pluginmanager.cpp
+++ b/src/pluginmanager.cpp
@@ -13,6 +13,7 @@
 #include <KConfigGroup>
 #include <KPluginFactory>
 #include <KPluginMetaData>
+#include <QPluginLoader>
 
 namespace KWin
 {
diff --git a/src/virtualdesktopsdbustypes.h b/src/virtualdesktopsdbustypes.h
index b5e7296a7e..00aef4db20 100644
--- a/src/virtualdesktopsdbustypes.h
+++ b/src/virtualdesktopsdbustypes.h
@@ -9,7 +9,7 @@
 
 #pragma once
 
-#include <QtDBus>
+#include <QDBusArgument>
 
 namespace KWin
 {
diff --git a/src/workspace.cpp b/src/workspace.cpp
index b34cdd3ede..b3e5d2a967 100644
--- a/src/workspace.cpp
+++ b/src/workspace.cpp
@@ -66,6 +66,11 @@
 #include <KConfigGroup>
 #include <KLocalizedString>
 #include <KStartupInfo>
+// Qt
+#include <QCryptographicHash>
+#include <QDBusConnection>
+#include <QDBusPendingCall>
+#include <QMetaProperty>
 // xcb
 #include <xcb/xinerama.h>