From 21a198fd66e7c35622fce0b08c306553a4e4ff5a Mon Sep 17 00:00:00 2001 From: Linus Jahn Date: Sun, 5 Sep 2021 15:46:53 +0200 Subject: Client: Require moving the packets/iqs for sending --- src/client/QXmppPubSubManager.cpp | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) (limited to 'src/client/QXmppPubSubManager.cpp') diff --git a/src/client/QXmppPubSubManager.cpp b/src/client/QXmppPubSubManager.cpp index 9b38ab97..1b188c64 100644 --- a/src/client/QXmppPubSubManager.cpp +++ b/src/client/QXmppPubSubManager.cpp @@ -188,7 +188,7 @@ QFuture QXmppPubSubManager::fetchNodes(const QS request.setQueryType(QXmppDiscoveryIq::ItemsQuery); request.setTo(jid); - return chainIq(client()->sendIq(request), this, [](QXmppDiscoveryIq &&iq) -> NodesResult { + return chainIq(client()->sendIq(std::move(request)), this, [](QXmppDiscoveryIq &&iq) -> NodesResult { const auto items = iq.items(); QVector nodes; for (const auto &item : items) { @@ -223,7 +223,7 @@ auto QXmppPubSubManager::createNode(const QString &jid, const QString &nodeName) request.setQueryNode(nodeName); request.setTo(jid); - return client()->sendGenericIq(request); + return client()->sendGenericIq(std::move(request)); } /// @@ -242,7 +242,7 @@ QFuture QXmppPubSubManager::createInstant request.setQueryType(QXmppPubSubIq<>::Create); request.setTo(jid); - return chainIq(client()->sendIq(request), this, + return chainIq(client()->sendIq(std::move(request)), this, [](const QXmppPubSubIq<> &iq) -> InstantNodeResult { return iq.queryNode(); }); @@ -263,7 +263,7 @@ auto QXmppPubSubManager::deleteNode(const QString &jid, const QString &nodeName) request.setQueryNode(nodeName); request.setTo(jid); - return client()->sendGenericIq(request); + return client()->sendGenericIq(std::move(request)); } /// @@ -283,7 +283,7 @@ auto QXmppPubSubManager::retractItem(const QString &jid, const QString &nodeName request.setItems({QXmppPubSubItem(itemId)}); request.setTo(jid); - return client()->sendGenericIq(request); + return client()->sendGenericIq(std::move(request)); } /// @@ -302,7 +302,7 @@ auto QXmppPubSubManager::purgeItems(const QString &jid, const QString &nodeName) request.setQueryNode(nodeName); request.setTo(jid); - return client()->sendGenericIq(request); + return client()->sendGenericIq(std::move(request)); } /// @@ -331,7 +331,7 @@ QFuture QXmppPubSubManager::requestSubs request.setQueryType(QXmppPubSubIq<>::Subscriptions); request.setQueryNode(nodeName); - return chainIq(client()->sendIq(request), this, + return chainIq(client()->sendIq(std::move(request)), this, [](const QXmppPubSubIq<> &iq) -> SubscriptionsResult { return iq.subscriptions(); }); @@ -355,7 +355,7 @@ QFuture QXmppPubSubManager::requestNodeA request.setQueryType(QXmppPubSubIq<>::OwnerAffiliations); request.setQueryNode(nodeName); - return chainIq(client()->sendIq(request), this, + return chainIq(client()->sendIq(std::move(request)), this, [](const QXmppPubSubIq<> &iq) -> AffiliationsResult { return iq.affiliations(); }); @@ -387,7 +387,7 @@ QFuture QXmppPubSubManager::requestAffil request.setQueryType(QXmppPubSubIq<>::Affiliations); request.setQueryNode(nodeName); - return chainIq(client()->sendIq(request), this, + return chainIq(client()->sendIq(std::move(request)), this, [](const QXmppPubSubIq<> &iq) -> AffiliationsResult { return iq.affiliations(); }); @@ -422,7 +422,7 @@ QFuture QXmppPubSubManager::requestSubscribeO request.setQueryNode(nodeName); request.setQueryJid(subscriberJid); - return chainIq(client()->sendIq(request), this, + return chainIq(client()->sendIq(std::move(request)), this, [](const QXmppPubSubIq<> &iq) -> OptionsResult { if (const auto form = iq.dataForm()) { if (const auto options = QXmppPubSubSubscribeOptions::fromDataForm(*form)) { @@ -469,7 +469,7 @@ QFuture QXmppPubSubManager::setSubscribeOptions(cons request.setDataForm(options); request.setQueryNode(nodeName); request.setQueryJid(subscriberJid); - return client()->sendGenericIq(request); + return client()->sendGenericIq(std::move(request)); } /// @@ -592,7 +592,7 @@ auto QXmppPubSubManager::publishItem(QXmppPubSubIqBase &&request) -> QFuturesendIq(request), this, + return chainIq(client()->sendIq(std::move(request)), this, [](const QXmppPubSubIq<> &iq) -> PublishItemResult { if (!iq.items().isEmpty()) { return iq.items().constFirst().id(); @@ -607,7 +607,7 @@ auto QXmppPubSubManager::publishItems(QXmppPubSubIqBase &&request) -> QFuturesendIq(request), this, + return chainIq(client()->sendIq(std::move(request)), this, [](const QXmppPubSubIq<> &iq) -> PublishItemsResult { const auto itemToId = [](const QXmppPubSubItem &item) { return item.id(); -- cgit v1.2.3