Merge branch '1.4'

3 files changed, 4 insertions, 4 deletions

diff --git a/src/base/QXmppDataForm.cpp b/src/base/QXmppDataForm.cpp
index 5bdd594e..6c1ae804 100644
--- a/src/base/QXmppDataForm.cpp
+++ b/src/base/QXmppDataForm.cpp
@@ -352,7 +352,7 @@ QXmppDataForm::Media QXmppDataForm::Field::media() const
     QList<QPair<QString, QString>> pairUris;
     pairUris.reserve(d->mediaSources.size());
 
-    for (const auto &source : qAsConst(d->mediaSources)) {
+    for (const auto &source : std::as_const(d->mediaSources)) {
         pairUris << qMakePair<QString, QString>(
             source.contentType().name(),
             source.uri().toString());
diff --git a/src/base/QXmppMessage.cpp b/src/base/QXmppMessage.cpp
index 51b373af..9ec64d7f 100644
--- a/src/base/QXmppMessage.cpp
+++ b/src/base/QXmppMessage.cpp
@@ -1263,7 +1263,7 @@ void QXmppMessage::toXml(QXmlStreamWriter *xmlWriter) const
     }
 
     // XEP-0231: Bits of Binary
-    for (const auto &data : qAsConst(d->bitsOfBinaryData))
+    for (const auto &data : std::as_const(d->bitsOfBinaryData))
         data.toXmlElementFromChild(xmlWriter);
 
     // XEP-0280: Message Carbons
diff --git a/src/base/QXmppStreamFeatures.cpp b/src/base/QXmppStreamFeatures.cpp
index 90a5c82a..8235ec47 100644
--- a/src/base/QXmppStreamFeatures.cpp
+++ b/src/base/QXmppStreamFeatures.cpp
@@ -339,14 +339,14 @@ void QXmppStreamFeatures::toXml(QXmlStreamWriter *writer) const
     if (!d->compressionMethods.isEmpty()) {
         writer->writeStartElement(QStringLiteral("compression"));
         writer->writeDefaultNamespace(ns_compressFeature);
-        for (const auto &method : qAsConst(d->compressionMethods))
+        for (const auto &method : std::as_const(d->compressionMethods))
             writer->writeTextElement(QStringLiteral("method"), method);
         writer->writeEndElement();
     }
     if (!d->authMechanisms.isEmpty()) {
         writer->writeStartElement(QStringLiteral("mechanisms"));
         writer->writeDefaultNamespace(ns_sasl);
-        for (const auto &mechanism : qAsConst(d->authMechanisms))
+        for (const auto &mechanism : std::as_const(d->authMechanisms))
             writer->writeTextElement(QStringLiteral("mechanism"), mechanism);
         writer->writeEndElement();
     }