Use raw literals, range based loops and auto

7 files changed, 31 insertions, 33 deletions

diff --git a/src/base/QXmppJingleIq.cpp b/src/base/QXmppJingleIq.cpp
index 4fcd5bec..14ec748a 100644
--- a/src/base/QXmppJingleIq.cpp
+++ b/src/base/QXmppJingleIq.cpp
@@ -488,10 +488,10 @@ bool QXmppJingleIq::Content::parseSdp(const QString &sdp)
                 }
                 const int id = attrValue.left(spIdx).toInt();
                 const QString paramStr = attrValue.mid(spIdx + 1);
-                for (int i = 0; i < payloads.size(); ++i) {
-                    if (payloads[i].id() == id) {
+                for (auto &payload : payloads) {
+                    if (payload.id() == id) {
                         QMap<QString, QString> params;
-                        if (payloads[i].name() == "telephone-event") {
+                        if (payload.name() == "telephone-event") {
                             params.insert("events", paramStr);
                         } else {
                             foreach (const QString p, paramStr.split(QRegExp(";\\s*"))) {
@@ -500,7 +500,7 @@ bool QXmppJingleIq::Content::parseSdp(const QString &sdp)
                                     params.insert(bits[0], bits[1]);
                             }
                         }
-                        payloads[i].setParameters(params);
+                        payload.setParameters(params);
                     }
                 }
             } else if (attrName == "rtpmap") {
@@ -514,13 +514,13 @@ bool QXmppJingleIq::Content::parseSdp(const QString &sdp)
                     continue;
 
                 const QStringList args = bits[1].split('/');
-                for (int i = 0; i < payloads.size(); ++i) {
-                    if (payloads[i].id() == id) {
-                        payloads[i].setName(args[0]);
+                for (auto &payload : payloads) {
+                    if (payload.id() == id) {
+                        payload.setName(args[0]);
                         if (args.size() > 1)
-                            payloads[i].setClockrate(args[1].toInt());
+                            payload.setClockrate(args[1].toInt());
                         if (args.size() > 2)
-                            payloads[i].setChannels(args[2].toInt());
+                            payload.setChannels(args[2].toInt());
                     }
                 }
             } else if (attrName == "ice-ufrag") {
diff --git a/src/base/QXmppLogger.cpp b/src/base/QXmppLogger.cpp
index f429b969..cb9e257d 100644
--- a/src/base/QXmppLogger.cpp
+++ b/src/base/QXmppLogger.cpp
@@ -77,7 +77,7 @@ static void relaySignals(QXmppLoggable *from, QXmppLoggable *to)
 QXmppLoggable::QXmppLoggable(QObject *parent)
     : QObject(parent)
 {
-    QXmppLoggable *logParent = qobject_cast<QXmppLoggable*>(parent);
+    auto *logParent = qobject_cast<QXmppLoggable*>(parent);
     if (logParent) {
         relaySignals(this, logParent);
     }
@@ -86,7 +86,7 @@ QXmppLoggable::QXmppLoggable(QObject *parent)
 /// \cond
 void QXmppLoggable::childEvent(QChildEvent *event)
 {
-    QXmppLoggable *child = qobject_cast<QXmppLoggable*>(event->child());
+    auto *child = qobject_cast<QXmppLoggable*>(event->child());
     if (!child)
         return;
 
diff --git a/src/base/QXmppRtpChannel.cpp b/src/base/QXmppRtpChannel.cpp
index f80c7c4d..443f439e 100644
--- a/src/base/QXmppRtpChannel.cpp
+++ b/src/base/QXmppRtpChannel.cpp
@@ -249,7 +249,7 @@ QXmppRtpAudioChannel::QXmppRtpAudioChannel(QObject *parent)
     : QIODevice(parent)
     , d(new QXmppRtpAudioChannelPrivate())
 {
-    QXmppLoggable *logParent = qobject_cast<QXmppLoggable*>(parent);
+    auto *logParent = qobject_cast<QXmppLoggable*>(parent);
     if (logParent) {
         connect(this, SIGNAL(logMessage(QXmppLogger::MessageType,QString)),
                 logParent, SIGNAL(logMessage(QXmppLogger::MessageType,QString)));
@@ -571,9 +571,9 @@ void QXmppRtpAudioChannel::startTone(QXmppRtpAudioChannel::Tone tone)
 
 void QXmppRtpAudioChannel::stopTone(QXmppRtpAudioChannel::Tone tone)
 {
-    for (int i = 0; i < d->outgoingTones.size(); ++i) {
-        if (d->outgoingTones[i].tone == tone) {
-            d->outgoingTones[i].finished = true;
+    for (auto &outgoingTone : d->outgoingTones) {
+        if (outgoingTone.tone == tone) {
+            outgoingTone.finished = true;
             break;
         }
     }
diff --git a/src/base/QXmppSocks.cpp b/src/base/QXmppSocks.cpp
index 6ba6fffd..35e8f807 100644
--- a/src/base/QXmppSocks.cpp
+++ b/src/base/QXmppSocks.cpp
@@ -226,7 +226,7 @@ quint16 QXmppSocksServer::serverPort() const
 
 void QXmppSocksServer::slotNewConnection()
 {
-    QTcpServer *server = qobject_cast<QTcpServer*>(sender());
+    auto *server = qobject_cast<QTcpServer*>(sender());
     if (!server)
         return;
 
@@ -241,7 +241,7 @@ void QXmppSocksServer::slotNewConnection()
 
 void QXmppSocksServer::slotReadyRead()
 {
-    QTcpSocket *socket = qobject_cast<QTcpSocket*>(sender());
+    auto *socket = qobject_cast<QTcpSocket*>(sender());
     if (!socket || !m_states.contains(socket))
         return;
 
diff --git a/src/base/QXmppStream.cpp b/src/base/QXmppStream.cpp
index e3fa5bfd..b4060ee7 100644
--- a/src/base/QXmppStream.cpp
+++ b/src/base/QXmppStream.cpp
@@ -229,7 +229,7 @@ void QXmppStream::_q_socketReadyRead()
     }
 
     // FIXME : maybe these QRegExps could be static?
-    QRegExp startStreamRegex("^(<\\?xml.*\\?>)?\\s*<stream:stream.*>");
+    QRegExp startStreamRegex(R"(^(<\?xml.*\?>)?\s*<stream:stream.*>)");
     startStreamRegex.setMinimal(true);
     QRegExp endStreamRegex("</stream:stream>$");
     endStreamRegex.setMinimal(true);
diff --git a/src/base/QXmppStun.cpp b/src/base/QXmppStun.cpp
index 36fc4d26..69917845 100644
--- a/src/base/QXmppStun.cpp
+++ b/src/base/QXmppStun.cpp
@@ -1439,7 +1439,7 @@ void QXmppTurnAllocation::setState(AllocationState state)
 
 void QXmppTurnAllocation::transactionFinished()
 {
-    QXmppStunTransaction *transaction = qobject_cast<QXmppStunTransaction*>(sender());
+    auto *transaction = qobject_cast<QXmppStunTransaction*>(sender());
     if (!transaction || !m_transactions.removeAll(transaction))
         return;
     transaction->deleteLater();
@@ -1825,7 +1825,7 @@ bool QXmppIceComponentPrivate::addRemoteCandidate(const QXmppJingleCandidate &ca
         if (!isCompatibleAddress(local.host(), candidate.host()))
             continue;
 
-        CandidatePair *pair = new CandidatePair(component, config->iceControlling, q);
+        auto *pair = new CandidatePair(component, config->iceControlling, q);
         pair->remote = candidate;
         pair->transport = transport;
         pairs << pair;
@@ -1885,7 +1885,7 @@ void QXmppIceComponentPrivate::setSockets(QList<QUdpSocket*> sockets)
     foreach (QUdpSocket *socket, sockets) {
         socket->setParent(q);
 
-        QXmppUdpTransport *transport = new QXmppUdpTransport(socket, q);
+        auto *transport = new QXmppUdpTransport(socket, q);
         check = QObject::connect(transport, SIGNAL(datagramReceived(QByteArray,QHostAddress,quint16)),
                                  q, SLOT(handleDatagram(QByteArray,QHostAddress,quint16)));
         Q_ASSERT(check);
@@ -1908,7 +1908,7 @@ void QXmppIceComponentPrivate::setSockets(QList<QUdpSocket*> sockets)
                 continue;
 
             request.setId(QXmppUtils::generateRandomBytes(STUN_ID_SIZE));
-            QXmppStunTransaction *transaction = new QXmppStunTransaction(request, q);
+            auto *transaction = new QXmppStunTransaction(request, q);
             stunTransactions.insert(transaction, transport);
         }
     }
@@ -2059,7 +2059,7 @@ QList<QXmppJingleCandidate> QXmppIceComponent::localCandidates() const
 
 void QXmppIceComponent::handleDatagram(const QByteArray &buffer, const QHostAddress &remoteHost, quint16 remotePort)
 {
-    QXmppIceTransport *transport = qobject_cast<QXmppIceTransport*>(sender());
+    auto *transport = qobject_cast<QXmppIceTransport*>(sender());
     if (!transport)
         return;
 
@@ -2248,7 +2248,7 @@ void QXmppIceComponent::handleDatagram(const QByteArray &buffer, const QHostAddr
 
 void QXmppIceComponent::transactionFinished()
 {
-    QXmppStunTransaction *transaction = qobject_cast<QXmppStunTransaction*>(sender());
+    auto *transaction = qobject_cast<QXmppStunTransaction*>(sender());
     transaction->deleteLater();
 
     // ICE checks
@@ -2350,11 +2350,10 @@ static QList<QUdpSocket*> reservePort(const QList<QHostAddress> &addresses, quin
 {
     QList<QUdpSocket*> sockets;
     foreach (const QHostAddress &address, addresses) {
-        QUdpSocket *socket = new QUdpSocket(parent);
+        auto *socket = new QUdpSocket(parent);
         sockets << socket;
         if (!socket->bind(address, port)) {
-            for (int i = 0; i < sockets.size(); ++i)
-                delete sockets[i];
+            qDeleteAll(sockets);
             sockets.clear();
             break;
         }
@@ -2439,8 +2438,7 @@ QList<QUdpSocket*> QXmppIceComponent::reservePorts(const QList<QHostAddress> &ad
 
         // cleanup if we failed
         if (sockets.size() != expectedSize) {
-            for (int i = 0; i < sockets.size(); ++i)
-                delete sockets[i];
+            qDeleteAll(sockets);
             sockets.clear();
         }
     }
@@ -2478,7 +2476,7 @@ void QXmppIceComponent::updateGatheringState()
 
 void QXmppIceComponent::writeStun(const QXmppStunMessage &message)
 {
-    QXmppStunTransaction *transaction = qobject_cast<QXmppStunTransaction*>(sender());
+    auto *transaction = qobject_cast<QXmppStunTransaction*>(sender());
 
     // ICE checks
     CandidatePair *pair = d->findPair(transaction);
@@ -2573,7 +2571,7 @@ void QXmppIceConnection::addComponent(int component)
         return;
     }
 
-    QXmppIceComponent *socket = new QXmppIceComponent(component, d, this);
+    auto *socket = new QXmppIceComponent(component, d, this);
     socket->d->setTurnServer(d->turnHost, d->turnPort);
     socket->d->setTurnUser(d->turnUser);
     socket->d->setTurnPassword(d->turnPassword);
diff --git a/src/base/QXmppUtils.cpp b/src/base/QXmppUtils.cpp
index 6b443c86..a46694b0 100644
--- a/src/base/QXmppUtils.cpp
+++ b/src/base/QXmppUtils.cpp
@@ -228,8 +228,8 @@ QString QXmppUtils::jidToBareJid(const QString& jid)
 quint32 QXmppUtils::generateCrc32(const QByteArray &in)
 {
     quint32 result = 0xffffffff;
-    for(int n = 0; n < in.size(); ++n)
-        result = (result >> 8) ^ (crctable[(result & 0xff) ^ (quint8)in[n]]);
+    for(char n : in)
+        result = (result >> 8) ^ (crctable[(result & 0xff) ^ (quint8)n]);
     return result ^= 0xffffffff;
 }