Fix possibly detaching containers

4 files changed, 7 insertions, 4 deletions

diff --git a/src/client/QXmppClient.cpp b/src/client/QXmppClient.cpp
index 9787f4b5..6f993a46 100644
--- a/src/client/QXmppClient.cpp
+++ b/src/client/QXmppClient.cpp
@@ -753,7 +753,7 @@ QXmppVersionManager &QXmppClient::versionManager()
 
 void QXmppClient::_q_elementReceived(const QDomElement &element, bool &handled)
 {
-    for (auto *extension : d->extensions) {
+    for (auto *extension : std::as_const(d->extensions)) {
         if (extension->handleStanza(element)) {
             handled = true;
             return;
diff --git a/src/client/QXmppMucManager.cpp b/src/client/QXmppMucManager.cpp
index cee37e94..71a5d436 100644
--- a/src/client/QXmppMucManager.cpp
+++ b/src/client/QXmppMucManager.cpp
@@ -96,7 +96,8 @@ bool QXmppMucManager::handleStanza(const QDomElement &element)
 
             QXmppMucRoom *room = d->rooms.value(iq.from());
             if (room && iq.type() == QXmppIq::Result && room->d->permissionsQueue.remove(iq.id())) {
-                for (const auto &item : iq.items()) {
+                const auto items = iq.items();
+                for (const auto &item : items) {
                     const QString jid = item.jid();
                     if (!room->d->permissions.contains(jid))
                         room->d->permissions.insert(jid, item);
diff --git a/src/client/QXmppRemoteMethod.cpp b/src/client/QXmppRemoteMethod.cpp
index 76ec1ea1..71a48bdd 100644
--- a/src/client/QXmppRemoteMethod.cpp
+++ b/src/client/QXmppRemoteMethod.cpp
@@ -48,7 +48,8 @@ void QXmppRemoteMethod::gotResult(const QXmppRpcResponseIq &iq)
     if (iq.id() == m_payload.id()) {
         m_result.hasError = false;
         // FIXME: we don't handle multiple responses
-        m_result.result = iq.values().first();
+        const auto values = iq.values();
+        m_result.result = values.first();
         emit callDone();
     }
 }
diff --git a/src/client/QXmppUploadRequestManager.cpp b/src/client/QXmppUploadRequestManager.cpp
index d9c5caae..113003b8 100644
--- a/src/client/QXmppUploadRequestManager.cpp
+++ b/src/client/QXmppUploadRequestManager.cpp
@@ -288,7 +288,8 @@ void QXmppUploadRequestManager::handleDiscoInfo(const QXmppDiscoveryIq &iq)
     if (!iq.features().contains(ns_http_upload))
         return;
 
-    for (const QXmppDiscoveryIq::Identity &identity : iq.identities()) {
+    const auto identities = iq.identities();
+    for (const QXmppDiscoveryIq::Identity &identity : identities) {
         if (identity.category() == QStringLiteral("store") &&
             identity.type() == QStringLiteral("file")) {
             QXmppUploadService service;