Avoid creating temporary containers with keys()/values()

3 files changed, 14 insertions, 14 deletions

diff --git a/src/base/QXmppJingleIq.cpp b/src/base/QXmppJingleIq.cpp
index d039dd5c..16537b1e 100644
--- a/src/base/QXmppJingleIq.cpp
+++ b/src/base/QXmppJingleIq.cpp
@@ -1428,10 +1428,10 @@ void QXmppJinglePayloadType::toXml(QXmlStreamWriter *writer) const
     if (d->ptime > 0)
         helperToXmlAddAttribute(writer, QStringLiteral("ptime"), QString::number(d->ptime));
 
-    for (const auto &key : d->parameters.keys()) {
+    for (auto itr = d->parameters.begin(); itr != d->parameters.end(); itr++) {
         writer->writeStartElement(QStringLiteral("parameter"));
-        writer->writeAttribute(QStringLiteral("name"), key);
-        writer->writeAttribute(QStringLiteral("value"), d->parameters.value(key));
+        writer->writeAttribute(QStringLiteral("name"), itr.key());
+        writer->writeAttribute(QStringLiteral("value"), itr.value());
         writer->writeEndElement();
     }
     writer->writeEndElement();
diff --git a/src/base/QXmppSasl.cpp b/src/base/QXmppSasl.cpp
index 74d67593..be4dc76e 100644
--- a/src/base/QXmppSasl.cpp
+++ b/src/base/QXmppSasl.cpp
@@ -922,11 +922,11 @@ QMap<QByteArray, QByteArray> QXmppSaslDigestMd5::parseMessage(const QByteArray &
 QByteArray QXmppSaslDigestMd5::serializeMessage(const QMap<QByteArray, QByteArray> &map)
 {
     QByteArray ba;
-    for (const auto &key : map.keys()) {
+    for (auto itr = map.begin(); itr != map.end(); itr++) {
         if (!ba.isEmpty())
             ba.append(',');
-        ba.append(key + QByteArrayLiteral("="));
-        QByteArray value = map[key];
+        ba.append(itr.key() + QByteArrayLiteral("="));
+        auto value = itr.value();
         const char *separators = "()<>@,;:\\\"/[]?={} \t";
         bool quote = false;
         for (const char *c = separators; *c; c++) {
diff --git a/src/base/QXmppStun.cpp b/src/base/QXmppStun.cpp
index 748ac799..cd0dc384 100644
--- a/src/base/QXmppStun.cpp
+++ b/src/base/QXmppStun.cpp
@@ -1362,16 +1362,16 @@ void QXmppTurnAllocation::refresh()
 ///
 void QXmppTurnAllocation::refreshChannels()
 {
-    for (const auto &channel : m_channels.keys()) {
+    for (auto itr = m_channels.cbegin(); itr != m_channels.cend(); itr++) {
         QXmppStunMessage request;
         request.setType(QXmppStunMessage::ChannelBind | QXmppStunMessage::Request);
         request.setId(QXmppUtils::generateRandomBytes(STUN_ID_SIZE));
         request.setNonce(m_nonce);
         request.setRealm(m_realm);
         request.setUsername(m_username);
-        request.setChannelNumber(channel);
-        request.xorPeerHost = m_channels[channel].first;
-        request.xorPeerPort = m_channels[channel].second;
+        request.setChannelNumber(itr.key());
+        request.xorPeerHost = itr.value().first;
+        request.xorPeerPort = itr.value().second;
         m_transactions << new QXmppStunTransaction(request, this);
     }
 }
@@ -2063,10 +2063,10 @@ void QXmppIceComponent::handleDatagram(const QByteArray &buffer, const QHostAddr
 
     // check if it's STUN
     QXmppStunTransaction *stunTransaction = nullptr;
-    for (auto *t : d->stunTransactions.keys()) {
-        if (t->request().id() == messageId &&
-            d->stunTransactions.value(t).transport == transport) {
-            stunTransaction = t;
+    for (auto itr = d->stunTransactions.cbegin(); itr != d->stunTransactions.cend(); itr++) {
+        if (itr.key()->request().id() == messageId &&
+            itr.value().transport == transport) {
+            stunTransaction = itr.key();
             break;
         }
     }