From b17284ee7d674416e0d11f1699f73fcc606262d4 Mon Sep 17 00:00:00 2001 From: Linus Jahn Date: Tue, 16 Aug 2022 21:00:15 +0200 Subject: Introduce QXmppTask & QXmppPromise MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Closes #502. Co-authored-by: Jonah Brüchert --- src/client/QXmppUploadRequestManager.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'src/client/QXmppUploadRequestManager.cpp') diff --git a/src/client/QXmppUploadRequestManager.cpp b/src/client/QXmppUploadRequestManager.cpp index 17a58893..4a45d86b 100644 --- a/src/client/QXmppUploadRequestManager.cpp +++ b/src/client/QXmppUploadRequestManager.cpp @@ -185,7 +185,7 @@ QString QXmppUploadRequestManager::requestUploadSlot(const QString &fileName, /// \since QXmpp 1.5 /// auto QXmppUploadRequestManager::requestSlot(const QFileInfo &file, - const QString &uploadService) -> QFuture + const QString &uploadService) -> QXmppTask { return requestSlot(file, file.fileName(), uploadService); } @@ -206,7 +206,7 @@ auto QXmppUploadRequestManager::requestSlot(const QFileInfo &file, /// auto QXmppUploadRequestManager::requestSlot(const QFileInfo &file, const QString &customFileName, - const QString &uploadService) -> QFuture + const QString &uploadService) -> QXmppTask { return requestSlot(customFileName, file.size(), QMimeDatabase().mimeTypeForFile(file), @@ -233,12 +233,12 @@ auto QXmppUploadRequestManager::requestSlot(const QFileInfo &file, auto QXmppUploadRequestManager::requestSlot(const QString &fileName, qint64 fileSize, const QMimeType &mimeType, - const QString &uploadService) -> QFuture + const QString &uploadService) -> QXmppTask { if (!serviceFound() && uploadService.isEmpty()) { using Error = QXmppStanza::Error; const auto errorMessage = QStringLiteral("Couldn't request upload slot: No service found."); - return makeReadyFuture(SlotResult(Error(Error::Cancel, Error::FeatureNotImplemented, errorMessage))); + return makeReadyTask(SlotResult(Error(Error::Cancel, Error::FeatureNotImplemented, errorMessage))); } QXmppHttpUploadRequestIq iq; -- cgit v1.2.3