diff options
| author | Linus Jahn <lnj@kaidan.im> | 2021-08-01 14:08:09 +0200 |
|---|---|---|
| committer | Linus Jahn <lnj@kaidan.im> | 2021-08-01 14:18:30 +0200 |
| commit | 68bcfe6531bec574f31a07a31cd385c8f77ac756 (patch) | |
| tree | 6f3851af86eb8ebab0bd9de0c0bb7394ddee393d | |
| parent | c672fdcadce13f0a2180576d89c8144818ccdbd1 (diff) | |
| download | qxmpp-68bcfe6531bec574f31a07a31cd385c8f77ac756.tar.gz | |
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.
| -rw-r--r-- | src/base/QXmppDataForm.cpp | 2 | ||||
| -rw-r--r-- | src/client/QXmppCallManager.cpp | 2 | ||||
| -rw-r--r-- | src/client/QXmppTransferManager.cpp | 4 |
3 files changed, 4 insertions, 4 deletions
diff --git a/src/base/QXmppDataForm.cpp b/src/base/QXmppDataForm.cpp index a6c5cca9..74c176c5 100644 --- a/src/base/QXmppDataForm.cpp +++ b/src/base/QXmppDataForm.cpp @@ -880,7 +880,7 @@ void QXmppDataForm::parse(const QDomElement &element) for (auto element = fieldElement.firstChildElement("option"); !element.isNull(); element = element.nextSiblingElement("option")) { - options << QPair(element.attribute("label"), element.firstChildElement("value").text()); + options << qMakePair(element.attribute("label"), element.firstChildElement("value").text()); } field.setOptions(options); } diff --git a/src/client/QXmppCallManager.cpp b/src/client/QXmppCallManager.cpp index bd008ced..f4d3b897 100644 --- a/src/client/QXmppCallManager.cpp +++ b/src/client/QXmppCallManager.cpp @@ -182,7 +182,7 @@ void QXmppCallManager::setStunServers(const QList<QPair<QHostAddress, quint16>> void QXmppCallManager::setStunServer(const QHostAddress &host, quint16 port) { d->stunServers.clear(); - d->stunServers.push_back(QPair(host, port)); + d->stunServers.push_back(qMakePair(host, port)); } /// 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 |