Introduce QXmppTask & QXmppPromise

Closes #502.

Co-authored-by: Jonah Brüchert <jbb@kaidan.im>

1 files changed, 3 insertions, 11 deletions

diff --git a/src/client/QXmppHttpUploadManager.cpp b/src/client/QXmppHttpUploadManager.cpp
index 2fe2994e..35eedf80 100644
--- a/src/client/QXmppHttpUploadManager.cpp
+++ b/src/client/QXmppHttpUploadManager.cpp
@@ -5,8 +5,8 @@
 #include "QXmppHttpUploadManager.h"
 
 #include "QXmppClient.h"
-#include "QXmppFutureUtils_p.h"
 #include "QXmppHttpUploadIq.h"
+#include "QXmppTask.h"
 #include "QXmppUploadRequestManager.h"
 #include "QXmppUtils_p.h"
 
@@ -299,11 +299,8 @@ std::shared_ptr<QXmppHttpUpload> QXmppHttpUploadManager::uploadFile(std::unique_
     }
 
     auto future = client()->findExtension<QXmppUploadRequestManager>()->requestSlot(filename, fileSize, mimeType, uploadServiceJid);
-#if QT_VERSION >= QT_VERSION_CHECK(5, 15, 0)
-    await(future, this, [this, upload, data = std::move(data)](SlotResult result) mutable {
-#else
-    await(future, this, [this, upload, rawSourceDevice = data.release()](SlotResult result) mutable {
-#endif
+    // TODO: rawSourceDevice: could this lead to a memory leak if the "then lambda" is never executed?
+    future.then(this, [this, upload, rawSourceDevice = data.release()](SlotResult result) mutable {
         // first check whether upload was cancelled in the meantime
         if (upload->d->cancelled) {
             upload->d->reportFinished();
@@ -331,11 +328,6 @@ std::shared_ptr<QXmppHttpUpload> QXmppHttpUploadManager::uploadFile(std::unique_
                 request.setRawHeader(itr.key().toUtf8(), itr.value().toUtf8());
             }
 
-#if QT_VERSION >= QT_VERSION_CHECK(5, 15, 0)
-            auto *rawSourceDevice = data.release();
-#else
-            // already defined in lambda capture
-#endif
             auto *reply = d->netManager->put(request, rawSourceDevice);
             rawSourceDevice->setParent(reply);
             upload->d->reply = reply;