aboutsummaryrefslogtreecommitdiff
path: root/src/client/QXmppTransferManager.cpp
diff options
context:
space:
mode:
authorLinus Jahn <lnj@kaidan.im>2021-08-01 14:08:09 +0200
committerLinus Jahn <lnj@kaidan.im>2021-08-01 14:18:30 +0200
commit68bcfe6531bec574f31a07a31cd385c8f77ac756 (patch)
tree6f3851af86eb8ebab0bd9de0c0bb7394ddee393d /src/client/QXmppTransferManager.cpp
parentc672fdcadce13f0a2180576d89c8144818ccdbd1 (diff)
Use qMakePair() again to fix compile errors
With some configurations QPair(a, b) (without template parameters) causes errors, but it works with qMakePair(). Fixes #360.
Diffstat (limited to 'src/client/QXmppTransferManager.cpp')
-rw-r--r--src/client/QXmppTransferManager.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/client/QXmppTransferManager.cpp b/src/client/QXmppTransferManager.cpp
index 7cf78b7f..886ab3dd 100644
--- a/src/client/QXmppTransferManager.cpp
+++ b/src/client/QXmppTransferManager.cpp
@@ -1318,9 +1318,9 @@ QXmppTransferJob *QXmppTransferManager::sendFile(const QString &jid, QIODevice *
QXmppDataForm::Field methodField(QXmppDataForm::Field::ListSingleField);
methodField.setKey("stream-method");
if (d->supportedMethods & QXmppTransferJob::InBandMethod)
- methodField.setOptions(methodField.options() << QPair(QString(), QString::fromLatin1(ns_ibb)));
+ methodField.setOptions(methodField.options() << qMakePair(QString(), QString::fromLatin1(ns_ibb)));
if (d->supportedMethods & QXmppTransferJob::SocksMethod)
- methodField.setOptions(methodField.options() << QPair(QString(), QString::fromLatin1(ns_bytestreams)));
+ methodField.setOptions(methodField.options() << qMakePair(QString(), QString::fromLatin1(ns_bytestreams)));
form.setFields(QList<QXmppDataForm::Field>() << methodField);
// start job