aboutsummaryrefslogtreecommitdiff
path: root/src/client
diff options
context:
space:
mode:
authorLinus Jahn <lnj@kaidan.im>2021-07-03 18:28:27 +0200
committerLinus Jahn <lnj@kaidan.im>2021-07-03 20:09:03 +0200
commit3d493f9c61f27b7c35304efbc563325c69d49147 (patch)
tree9a116c2dffea18c2d491efa6c1fd2271c50c342c /src/client
parent4ae1923665d4d4be602e45febb06fdecb590394f (diff)
downloadqxmpp-3d493f9c61f27b7c35304efbc563325c69d49147.tar.gz
Move QFuture utilities into new QXmppFutureUtils_p.h
Also ran clang-format on the file.
Diffstat (limited to 'src/client')
-rw-r--r--src/client/QXmppDiscoveryManager.cpp4
-rw-r--r--src/client/QXmppEntityTimeManager.cpp4
-rw-r--r--src/client/QXmppUploadRequestManager.cpp4
3 files changed, 9 insertions, 3 deletions
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: