diff options
| author | Linus Jahn <lnj@kaidan.im> | 2021-07-05 16:59:09 +0200 |
|---|---|---|
| committer | Linus Jahn <lnj@kaidan.im> | 2021-07-05 18:07:28 +0200 |
| commit | af3f0c1f5b36757867bf719dc27786e9f947024c (patch) | |
| tree | abfefdd6e7b1f9173fc9a7f36d822d044c45e46a /src/client | |
| parent | f79990e13fffd36a5d2aa4153ef06b48c0eeebe4 (diff) | |
| download | qxmpp-af3f0c1f5b36757867bf719dc27786e9f947024c.tar.gz | |
More template magic for QFutures
Diffstat (limited to 'src/client')
| -rw-r--r-- | src/client/QXmppClient.cpp | 2 | ||||
| -rw-r--r-- | src/client/QXmppDiscoveryManager.cpp | 4 | ||||
| -rw-r--r-- | src/client/QXmppEntityTimeManager.cpp | 2 | ||||
| -rw-r--r-- | src/client/QXmppUploadRequestManager.cpp | 2 |
4 files changed, 5 insertions, 5 deletions
diff --git a/src/client/QXmppClient.cpp b/src/client/QXmppClient.cpp index 74875275..0e37a4f9 100644 --- a/src/client/QXmppClient.cpp +++ b/src/client/QXmppClient.cpp @@ -387,7 +387,7 @@ QFuture<QXmppClient::IqResult> QXmppClient::sendIq(const QXmppIq &iq) QFuture<QXmppClient::EmptyResult> QXmppClient::sendGenericIq(const QXmppIq &iq) { using namespace QXmpp::Private; - return chainIq<EmptyResult, QXmppIq>(sendIq(iq), this, [](const QXmppIq &) { + return chainIq(sendIq(iq), this, [](const QXmppIq &) -> EmptyResult { return QXmpp::Success(); }); } diff --git a/src/client/QXmppDiscoveryManager.cpp b/src/client/QXmppDiscoveryManager.cpp index 9e2198f0..517a49bb 100644 --- a/src/client/QXmppDiscoveryManager.cpp +++ b/src/client/QXmppDiscoveryManager.cpp @@ -144,7 +144,7 @@ QFuture<QXmppDiscoveryManager::InfoResult> QXmppDiscoveryManager::requestDiscoIn request.setQueryNode(node); } - return chainIq<InfoResult, QXmppDiscoveryIq>(client()->sendIq(request), this); + return chainIq<InfoResult>(client()->sendIq(request), this); } /// @@ -167,7 +167,7 @@ QFuture<QXmppDiscoveryManager::ItemsResult> QXmppDiscoveryManager::requestDiscoI request.setQueryNode(node); } - return chainIq<ItemsResult, QXmppDiscoveryIq>(client()->sendIq(request), this, [](QXmppDiscoveryIq &&iq) { + return chainIq(client()->sendIq(request), this, [](QXmppDiscoveryIq &&iq) -> ItemsResult { return iq.items(); }); } diff --git a/src/client/QXmppEntityTimeManager.cpp b/src/client/QXmppEntityTimeManager.cpp index 251442ac..030e797b 100644 --- a/src/client/QXmppEntityTimeManager.cpp +++ b/src/client/QXmppEntityTimeManager.cpp @@ -78,7 +78,7 @@ auto QXmppEntityTimeManager::requestEntityTime(const QString &jid) -> QFuture<En iq.setType(QXmppIq::Get); iq.setTo(jid); - return chainIq<EntityTimeResult, QXmppEntityTimeIq>(client()->sendIq(iq), this); + return chainIq<EntityTimeResult>(client()->sendIq(iq), this); } /// \cond diff --git a/src/client/QXmppUploadRequestManager.cpp b/src/client/QXmppUploadRequestManager.cpp index 27889ffb..439062b7 100644 --- a/src/client/QXmppUploadRequestManager.cpp +++ b/src/client/QXmppUploadRequestManager.cpp @@ -267,7 +267,7 @@ auto QXmppUploadRequestManager::requestSlot(const QString &fileName, iq.setSize(fileSize); iq.setContentType(mimeType); - return chainIq<SlotResult, QXmppHttpUploadSlotIq>(client()->sendIq(iq), this); + return chainIq<SlotResult>(client()->sendIq(iq), this); } /// Returns true if an HTTP File Upload service has been discovered. |