Move QFuture utilities into new QXmppFutureUtils_p.h

Also ran clang-format on the file.

5 files changed, 51 insertions, 25 deletions

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index ca724939..695ac5c5 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -31,6 +31,7 @@ set(INSTALL_HEADER_FILES
     base/QXmppDiscoveryIq.h
     base/QXmppElement.h
     base/QXmppEntityTimeIq.h
+    base/QXmppFutureUtils_p.h
     base/QXmppHttpUploadIq.h
     base/QXmppIbbIq.h
     base/QXmppIq.h
diff --git a/src/base/QXmppGlobal_p.h b/src/base/QXmppFutureUtils_p.h
index 0df63fed..d109f74b 100644
--- a/src/base/QXmppGlobal_p.h
+++ b/src/base/QXmppFutureUtils_p.h
@@ -21,8 +21,20 @@
  *
  */
 
-#ifndef QXMPPGLOBAL_P_H
-#define QXMPPGLOBAL_P_H
+#ifndef QXMPPFUTUREUTILS_P_H
+#define QXMPPFUTUREUTILS_P_H
+
+//
+//  W A R N I N G
+//  -------------
+//
+// This file is not part of the QXmpp API.  This header file may change from
+// version to version without notice, or even be removed.
+//
+// We mean it.
+//
+
+#include <QXmppIq.h>
 
 #include <memory>
 #include <variant>
@@ -30,12 +42,16 @@
 #include <QFutureWatcher>
 #include <QObject>
 
-#include <QXmppIq.h>
+namespace QXmpp::Private {
 
 // helper for std::visit
-template<class... Ts> struct overloaded : Ts... { using Ts::operator()...; };
+template<class... Ts>
+struct overloaded : Ts... {
+    using Ts::operator()...;
+};
 // explicit deduction guide (not needed as of C++20)
-template<class... Ts> overloaded(Ts...) -> overloaded<Ts...>;
+template<class... Ts>
+overloaded(Ts...) -> overloaded<Ts...>;
 
 template<typename T>
 QFuture<T> makeReadyFuture(T &&value)
@@ -52,7 +68,7 @@ QFuture<Result> chain(QFuture<Input> &&source, QObject *context, Converter task)
     auto resultInterface = std::make_shared<QFutureInterface<Result>>(QFutureInterfaceBase::Started);
 
     auto *watcher = new QFutureWatcher<Input>(context);
-    QObject::connect(watcher, &QFutureWatcherBase::finished, context, [=](){
+    QObject::connect(watcher, &QFutureWatcherBase::finished, context, [=]() {
         resultInterface->reportResult(task(watcher->result()));
         resultInterface->reportFinished();
         watcher->deleteLater();
@@ -65,20 +81,21 @@ template<typename Result, typename IqType, typename Input, typename Converter>
 Result parseIq(Input &&sendResult, Converter convert)
 {
     return std::visit(overloaded {
-        [convert { std::move(convert) }](const QDomElement &element) -> Result {
-            IqType iq;
-            iq.parse(element);
-            if (iq.type() == QXmppIq::Error) {
-                return iq.error();
-            }
-            return convert(std::move(iq));
-        },
-        [](QXmpp::PacketState) -> Result {
-            using Error = QXmppStanza::Error;
-            return Error(Error::Wait, Error::UndefinedCondition,
-                         QStringLiteral("Couldn't send request: lost connection."));
-        },
-    }, sendResult);
+                          [convert { std::move(convert) }](const QDomElement &element) -> Result {
+                              IqType iq;
+                              iq.parse(element);
+                              if (iq.type() == QXmppIq::Error) {
+                                  return iq.error();
+                              }
+                              return convert(std::move(iq));
+                          },
+                          [](QXmpp::PacketState) -> Result {
+                              using Error = QXmppStanza::Error;
+                              return Error(Error::Wait, Error::UndefinedCondition,
+                                           QStringLiteral("Couldn't send request: lost connection."));
+                          },
+                      },
+                      sendResult);
 }
 
 template<typename Result, typename IqType, typename Input>
@@ -93,7 +110,7 @@ Result parseIq(Input &&sendResult)
 template<typename Result, typename IqType, typename Input, typename Converter>
 QFuture<Result> chainIq(QFuture<Input> &&input, QObject *context, Converter convert)
 {
-    return chain<Result>(std::move(input), context, [convert {std::move(convert)}](Input &&input) -> Result {
+    return chain<Result>(std::move(input), context, [convert { std::move(convert) }](Input &&input) -> Result {
         return parseIq<Result, IqType>(std::move(input), convert);
     });
 }
@@ -106,4 +123,6 @@ QFuture<Result> chainIq(QFuture<Input> &&input, QObject *context)
     });
 }
 
-#endif // QXMPPGLOBAL_P_H
+}
+
+#endif  // QXMPPFUTUREUTILS_P_H
diff --git a/src/client/QXmppDiscoveryManager.cpp b/src/client/QXmppDiscoveryManager.cpp
index 6f7d3654..9e2198f0 100644
--- a/src/client/QXmppDiscoveryManager.cpp
+++ b/src/client/QXmppDiscoveryManager.cpp
@@ -28,13 +28,15 @@
 #include "QXmppConstants_p.h"
 #include "QXmppDataForm.h"
 #include "QXmppDiscoveryIq.h"
+#include "QXmppFutureUtils_p.h"
 #include "QXmppGlobal.h"
-#include "QXmppGlobal_p.h"
 #include "QXmppStream.h"
 
 #include <QCoreApplication>
 #include <QDomElement>
 
+using namespace QXmpp::Private;
+
 class QXmppDiscoveryManagerPrivate
 {
 public:
diff --git a/src/client/QXmppEntityTimeManager.cpp b/src/client/QXmppEntityTimeManager.cpp
index 15ede78c..251442ac 100644
--- a/src/client/QXmppEntityTimeManager.cpp
+++ b/src/client/QXmppEntityTimeManager.cpp
@@ -26,12 +26,14 @@
 #include "QXmppClient.h"
 #include "QXmppConstants_p.h"
 #include "QXmppEntityTimeIq.h"
-#include "QXmppGlobal_p.h"
+#include "QXmppFutureUtils_p.h"
 #include "QXmppUtils.h"
 
 #include <QDateTime>
 #include <QDomElement>
 
+using namespace QXmpp::Private;
+
 ///
 /// \typedef QXmppEntityTimeManager::EntityTimeResult
 ///
diff --git a/src/client/QXmppUploadRequestManager.cpp b/src/client/QXmppUploadRequestManager.cpp
index cc6780c2..27889ffb 100644
--- a/src/client/QXmppUploadRequestManager.cpp
+++ b/src/client/QXmppUploadRequestManager.cpp
@@ -28,13 +28,15 @@
 #include "QXmppDataForm.h"
 #include "QXmppDiscoveryIq.h"
 #include "QXmppDiscoveryManager.h"
-#include "QXmppGlobal_p.h"
+#include "QXmppFutureUtils_p.h"
 #include "QXmppHttpUploadIq.h"
 
 #include <QDomElement>
 #include <QFileInfo>
 #include <QMimeDatabase>
 
+using namespace QXmpp::Private;
+
 class QXmppUploadServicePrivate : public QSharedData
 {
 public: