Merge branch '1.4'

3 files changed, 4 insertions, 4 deletions

diff --git a/src/client/QXmppInvokable.cpp b/src/client/QXmppInvokable.cpp
index 4a60c317..e407aa4f 100644
--- a/src/client/QXmppInvokable.cpp
+++ b/src/client/QXmppInvokable.cpp
@@ -96,7 +96,7 @@ QVariant QXmppInvokable::dispatch(const QByteArray &method, const QList<QVariant
 QList<QByteArray> QXmppInvokable::paramTypes(const QList<QVariant> &params)
 {
     QList<QByteArray> types;
-    for (const auto &variant : qAsConst(params))
+    for (const auto &variant : std::as_const(params))
         types << variant.typeName();
     return types;
 }
diff --git a/src/client/QXmppMucManager.cpp b/src/client/QXmppMucManager.cpp
index 636f4288..a19cc139 100644
--- a/src/client/QXmppMucManager.cpp
+++ b/src/client/QXmppMucManager.cpp
@@ -474,7 +474,7 @@ bool QXmppMucRoom::requestPermissions()
 
     d->permissions.clear();
     d->permissionsQueue.clear();
-    for (const auto &affiliation : qAsConst(affiliations)) {
+    for (const auto &affiliation : std::as_const(affiliations)) {
         QXmppMucItem item;
         item.setAffiliation(affiliation);
 
@@ -499,7 +499,7 @@ bool QXmppMucRoom::setPermissions(const QList<QXmppMucItem> &permissions)
     QList<QXmppMucItem> items;
 
     // Process changed members
-    for (const auto &item : qAsConst(permissions)) {
+    for (const auto &item : std::as_const(permissions)) {
         const QString jid = item.jid();
         if (d->permissions.value(jid).affiliation() != item.affiliation())
             items << item;
diff --git a/src/client/QXmppOutgoingClient.cpp b/src/client/QXmppOutgoingClient.cpp
index 583d93ed..a8bfb62d 100644
--- a/src/client/QXmppOutgoingClient.cpp
+++ b/src/client/QXmppOutgoingClient.cpp
@@ -457,7 +457,7 @@ void QXmppOutgoingClient::handleStanza(const QDomElement &nodeRecv)
             // determine SASL Authentication mechanism to use
             QStringList commonMechanisms;
             QString usedMechanism;
-            for (const auto &mechanism : qAsConst(supportedMechanisms)) {
+            for (const auto &mechanism : std::as_const(supportedMechanisms)) {
                 if (features.authMechanisms().contains(mechanism))
                     commonMechanisms << mechanism;
             }