From bd72602875ae4cbe85e56375fc66973728772964 Mon Sep 17 00:00:00 2001
From: Albert Vaca Cintora <albertvaka@gmail.com>
Date: Sun, 23 Jul 2023 16:53:57 +0200
Subject: [PATCH] Move setWhenAvailable from dbusinterfaces to dbushelpers

---
 interfaces/dbushelpers.h         | 11 +++++++++++
 interfaces/dbusinterfaces.cpp    |  1 -
 interfaces/dbusinterfaces.h      | 11 -----------
 kcm/kcm.cpp                      |  1 +
 smsapp/conversationlistmodel.cpp |  1 +
 5 files changed, 13 insertions(+), 12 deletions(-)

diff --git a/interfaces/dbushelpers.h b/interfaces/dbushelpers.h
index 088abffde..00401ee64 100644
--- a/interfaces/dbushelpers.h
+++ b/interfaces/dbushelpers.h
@@ -31,4 +31,15 @@ void blockOnReply(QDBusPendingReply<void> reply)
     }
 }
 
+template<typename T, typename W>
+static void setWhenAvailable(const QDBusPendingReply<T> &pending, W func, QObject *parent)
+{
+    QDBusPendingCallWatcher *watcher = new QDBusPendingCallWatcher(pending, parent);
+    QObject::connect(watcher, &QDBusPendingCallWatcher::finished, parent, [func](QDBusPendingCallWatcher *watcher) {
+        watcher->deleteLater();
+        QDBusPendingReply<T> reply = *watcher;
+        func(reply.value());
+    });
+}
+
 #endif
diff --git a/interfaces/dbusinterfaces.cpp b/interfaces/dbusinterfaces.cpp
index 3ca0f54b5..3b0ff0c51 100644
--- a/interfaces/dbusinterfaces.cpp
+++ b/interfaces/dbusinterfaces.cpp
@@ -5,7 +5,6 @@
  */
 
 #include "dbusinterfaces.h"
-#include <dbushelper.h>
 
 QString DaemonDbusInterface::activatedService()
 {
diff --git a/interfaces/dbusinterfaces.h b/interfaces/dbusinterfaces.h
index 6a2bf61ab..fd6c2f735 100644
--- a/interfaces/dbusinterfaces.h
+++ b/interfaces/dbusinterfaces.h
@@ -265,17 +265,6 @@ public:
     ~VirtualmonitorDbusInterface() override;
 };
 
-template<typename T, typename W>
-static void setWhenAvailable(const QDBusPendingReply<T> &pending, W func, QObject *parent)
-{
-    QDBusPendingCallWatcher *watcher = new QDBusPendingCallWatcher(pending, parent);
-    QObject::connect(watcher, &QDBusPendingCallWatcher::finished, parent, [func](QDBusPendingCallWatcher *watcher) {
-        watcher->deleteLater();
-        QDBusPendingReply<T> reply = *watcher;
-        func(reply.value());
-    });
-}
-
 class KDECONNECTINTERFACES_EXPORT ClipboardDbusInterface : public OrgKdeKdeconnectDeviceClipboardInterface
 {
     Q_OBJECT
diff --git a/kcm/kcm.cpp b/kcm/kcm.cpp
index 3cec6c5e9..cad83c7d6 100644
--- a/kcm/kcm.cpp
+++ b/kcm/kcm.cpp
@@ -14,6 +14,7 @@
 #include <KPluginMetaData>
 #include <kcmutils_version.h>
 
+#include "dbushelpers.h"
 #include "dbusinterfaces.h"
 #include "devicesmodel.h"
 #include "devicessortproxymodel.h"
diff --git a/smsapp/conversationlistmodel.cpp b/smsapp/conversationlistmodel.cpp
index 1d284fdc6..a5eea3e27 100644
--- a/smsapp/conversationlistmodel.cpp
+++ b/smsapp/conversationlistmodel.cpp
@@ -12,6 +12,7 @@
 
 #include <KLocalizedString>
 
+#include "dbushelpers.h"
 #include "interfaces/conversationmessage.h"
 #include "interfaces/dbusinterfaces.h"
 #include "sms_conversations_list_debug.h"