aboutsummaryrefslogtreecommitdiff
path: root/src/client
diff options
context:
space:
mode:
authorLinus Jahn <lnj@kaidan.im>2021-09-05 15:46:53 +0200
committerLinus Jahn <lnj@kaidan.im>2021-09-28 17:08:08 +0200
commit21a198fd66e7c35622fce0b08c306553a4e4ff5a (patch)
tree4f6721fa737e109c9aa0ecdf1f4fb6897be0e299 /src/client
parenteffe99a4c0006cf159ab7342cc27b13c2d1cf2e6 (diff)
downloadqxmpp-21a198fd66e7c35622fce0b08c306553a4e4ff5a.tar.gz
Client: Require moving the packets/iqs for sending
Diffstat (limited to 'src/client')
-rw-r--r--src/client/QXmppAtmManager.cpp2
-rw-r--r--src/client/QXmppClient.cpp12
-rw-r--r--src/client/QXmppClient.h6
-rw-r--r--src/client/QXmppDiscoveryManager.cpp4
-rw-r--r--src/client/QXmppEntityTimeManager.cpp2
-rw-r--r--src/client/QXmppPubSubManager.cpp26
-rw-r--r--src/client/QXmppRosterManager.cpp10
-rw-r--r--src/client/QXmppUploadRequestManager.cpp2
8 files changed, 32 insertions, 32 deletions
diff --git a/src/client/QXmppAtmManager.cpp b/src/client/QXmppAtmManager.cpp
index fb14aec0..04e9ff2a 100644
--- a/src/client/QXmppAtmManager.cpp
+++ b/src/client/QXmppAtmManager.cpp
@@ -515,5 +515,5 @@ QFuture<QXmpp::SendResult> QXmppAtmManager::sendTrustMessage(const QString &encr
QXmppMessage message;
message.setTo(recipientJid);
message.setTrustMessageElement(trustMessageElement);
- return client()->send(message);
+ return client()->send(std::move(message));
}
diff --git a/src/client/QXmppClient.cpp b/src/client/QXmppClient.cpp
index e6655bd0..7034fbb7 100644
--- a/src/client/QXmppClient.cpp
+++ b/src/client/QXmppClient.cpp
@@ -339,9 +339,9 @@ bool QXmppClient::sendPacket(const QXmppNonza &packet)
/// You can use QFutureWatcher in Qt 5 and QFuture::then() in Qt 6 to handle the
/// results.
///
-QFuture<QXmpp::SendResult> QXmppClient::send(const QXmppStanza &stanza)
+QFuture<QXmpp::SendResult> QXmppClient::send(QXmppStanza &&stanza)
{
- return d->stream->send(stanza);
+ return d->stream->send(std::move(stanza));
}
///
@@ -355,9 +355,9 @@ QFuture<QXmpp::SendResult> QXmppClient::send(const QXmppStanza &stanza)
///
/// \since QXmpp 1.5
///
-QFuture<QXmppClient::IqResult> QXmppClient::sendIq(const QXmppIq &iq)
+QFuture<QXmppClient::IqResult> QXmppClient::sendIq(QXmppIq &&iq)
{
- return d->stream->sendIq(iq);
+ return d->stream->sendIq(std::move(iq));
}
///
@@ -373,10 +373,10 @@ QFuture<QXmppClient::IqResult> QXmppClient::sendIq(const QXmppIq &iq)
///
/// \since QXmpp 1.5
///
-QFuture<QXmppClient::EmptyResult> QXmppClient::sendGenericIq(const QXmppIq &iq)
+QFuture<QXmppClient::EmptyResult> QXmppClient::sendGenericIq(QXmppIq &&iq)
{
using namespace QXmpp::Private;
- return chainIq(sendIq(iq), this, [](const QXmppIq &) -> EmptyResult {
+ return chainIq(sendIq(std::move(iq)), this, [](const QXmppIq &) -> EmptyResult {
return QXmpp::Success();
});
}
diff --git a/src/client/QXmppClient.h b/src/client/QXmppClient.h
index 5b71e108..6f98acec 100644
--- a/src/client/QXmppClient.h
+++ b/src/client/QXmppClient.h
@@ -231,9 +231,9 @@ public:
State state() const;
QXmppStanza::Error::Condition xmppStreamError();
- QFuture<QXmpp::SendResult> send(const QXmppStanza &);
- QFuture<IqResult> sendIq(const QXmppIq &);
- QFuture<EmptyResult> sendGenericIq(const QXmppIq &iq);
+ QFuture<QXmpp::SendResult> send(QXmppStanza &&);
+ QFuture<IqResult> sendIq(QXmppIq &&);
+ QFuture<EmptyResult> sendGenericIq(QXmppIq &&);
#if QXMPP_DEPRECATED_SINCE(1, 1)
QT_DEPRECATED_X("Use QXmppClient::findExtension<QXmppRosterManager>() instead")
diff --git a/src/client/QXmppDiscoveryManager.cpp b/src/client/QXmppDiscoveryManager.cpp
index 517a49bb..e60a9cd0 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>(client()->sendIq(request), this);
+ return chainIq<InfoResult>(client()->sendIq(std::move(request)), this);
}
///
@@ -167,7 +167,7 @@ QFuture<QXmppDiscoveryManager::ItemsResult> QXmppDiscoveryManager::requestDiscoI
request.setQueryNode(node);
}
- return chainIq(client()->sendIq(request), this, [](QXmppDiscoveryIq &&iq) -> ItemsResult {
+ return chainIq(client()->sendIq(std::move(request)), this, [](QXmppDiscoveryIq &&iq) -> ItemsResult {
return iq.items();
});
}
diff --git a/src/client/QXmppEntityTimeManager.cpp b/src/client/QXmppEntityTimeManager.cpp
index 030e797b..8e34b45d 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>(client()->sendIq(iq), this);
+ return chainIq<EntityTimeResult>(client()->sendIq(std::move(iq)), this);
}
/// \cond
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::NodesResult> 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<QString> 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::InstantNodeResult> 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::SubscriptionsResult> 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::AffiliationsResult> 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::AffiliationsResult> 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::OptionsResult> 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::Result> 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) -> QFuture<Pub
request.setType(QXmppIq::Set);
request.setQueryType(QXmppPubSubIqBase::Publish);
- return chainIq(client()->sendIq(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) -> QFuture<Pu
request.setType(QXmppIq::Set);
request.setQueryType(QXmppPubSubIqBase::Publish);
- return chainIq(client()->sendIq(request), this,
+ return chainIq(client()->sendIq(std::move(request)), this,
[](const QXmppPubSubIq<> &iq) -> PublishItemsResult {
const auto itemToId = [](const QXmppPubSubItem &item) {
return item.id();
diff --git a/src/client/QXmppRosterManager.cpp b/src/client/QXmppRosterManager.cpp
index 0405056e..f1ad185d 100644
--- a/src/client/QXmppRosterManager.cpp
+++ b/src/client/QXmppRosterManager.cpp
@@ -284,7 +284,7 @@ QFuture<QXmppRosterManager::Result> QXmppRosterManager::addRosterItem(const QStr
QXmppRosterIq iq;
iq.setType(QXmppIq::Set);
iq.addItem(item);
- return client()->sendGenericIq(iq);
+ return client()->sendGenericIq(std::move(iq));
}
///
@@ -306,7 +306,7 @@ QFuture<QXmppRosterManager::Result> QXmppRosterManager::removeRosterItem(const Q
QXmppRosterIq iq;
iq.setType(QXmppIq::Set);
iq.addItem(item);
- return client()->sendGenericIq(iq);
+ return client()->sendGenericIq(std::move(iq));
}
///
@@ -340,7 +340,7 @@ QFuture<QXmppRosterManager::Result> QXmppRosterManager::renameRosterItem(const Q
QXmppRosterIq iq;
iq.setType(QXmppIq::Set);
iq.addItem(item);
- return client()->sendGenericIq(iq);
+ return client()->sendGenericIq(std::move(iq));
}
///
@@ -357,7 +357,7 @@ QFuture<QXmpp::SendResult> QXmppRosterManager::subscribeTo(const QString &bareJi
packet.setTo(QXmppUtils::jidToBareJid(bareJid));
packet.setType(QXmppPresence::Subscribe);
packet.setStatusText(reason);
- return client()->send(packet);
+ return client()->send(std::move(packet));
}
///
@@ -374,7 +374,7 @@ QFuture<QXmpp::SendResult> QXmppRosterManager::unsubscribeFrom(const QString &ba
packet.setTo(QXmppUtils::jidToBareJid(bareJid));
packet.setType(QXmppPresence::Unsubscribe);
packet.setStatusText(reason);
- return client()->send(packet);
+ return client()->send(std::move(packet));
}
///
diff --git a/src/client/QXmppUploadRequestManager.cpp b/src/client/QXmppUploadRequestManager.cpp
index 439062b7..cf26ffd5 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>(client()->sendIq(iq), this);
+ return chainIq<SlotResult>(client()->sendIq(std::move(iq)), this);
}
/// Returns true if an HTTP File Upload service has been discovered.