Move setWhenAvailable from dbusinterfaces to dbushelpers

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

interfaces/dbusinterfaces.cpp

@@ -5,7 +5,6 @@
  */
 
 #include "dbusinterfaces.h"
-#include <dbushelper.h>
 
 QString DaemonDbusInterface::activatedService()
 {

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

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"

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"