Use raw literals, range based loops and auto

26 files changed, 97 insertions, 99 deletions

diff --git a/examples/example_3_transferHandling/example_3_transferHandling.cpp b/examples/example_3_transferHandling/example_3_transferHandling.cpp
index dc4c81c8..e31068b0 100644
--- a/examples/example_3_transferHandling/example_3_transferHandling.cpp
+++ b/examples/example_3_transferHandling/example_3_transferHandling.cpp
@@ -93,7 +93,7 @@ void xmppClient::slotFileReceived(QXmppTransferJob *job)
     Q_ASSERT(check);
 
     // allocate a buffer to receive the file
-    QBuffer *buffer = new QBuffer(this);
+    auto *buffer = new QBuffer(this);
     buffer->open(QIODevice::WriteOnly);
     job->accept(buffer);
 }
diff --git a/examples/example_5_rpcInterface/main.cpp b/examples/example_5_rpcInterface/main.cpp
index 593d4dcd..967c2d86 100644
--- a/examples/example_5_rpcInterface/main.cpp
+++ b/examples/example_5_rpcInterface/main.cpp
@@ -39,7 +39,7 @@ int main(int argc, char *argv[])
     QXmppClient client;
 
     // add RPC extension and register interface
-    QXmppRpcManager *manager = new QXmppRpcManager;
+    auto *manager = new QXmppRpcManager;
     client.addExtension(manager);
     manager->addInvokableInterface(new RemoteInterface(&client));
 
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;
 }
 
diff --git a/src/client/QXmppCallManager.cpp b/src/client/QXmppCallManager.cpp
index 0a1d490f..e5e1b901 100644
--- a/src/client/QXmppCallManager.cpp
+++ b/src/client/QXmppCallManager.cpp
@@ -293,17 +293,17 @@ QXmppCallPrivate::Stream *QXmppCallPrivate::createStream(const QString &media)
     Q_UNUSED(check);
     Q_ASSERT(manager);
 
-    Stream *stream = new Stream;
+    auto *stream = new Stream;
     stream->media = media;
 
     // RTP channel
     QObject *channelObject = nullptr;
     if (media == AUDIO_MEDIA) {
-        QXmppRtpAudioChannel *audioChannel = new QXmppRtpAudioChannel(q);
+        auto *audioChannel = new QXmppRtpAudioChannel(q);
         stream->channel = audioChannel;
         channelObject = audioChannel;
     } else if (media == VIDEO_MEDIA) {
-        QXmppRtpVideoChannel *videoChannel = new QXmppRtpVideoChannel(q);
+        auto *videoChannel = new QXmppRtpVideoChannel(q);
         stream->channel = videoChannel;
         channelObject = videoChannel;
     } else {
@@ -573,7 +573,7 @@ void QXmppCall::hangup()
 void QXmppCall::localCandidatesChanged()
 {
     // find the stream
-    QXmppIceConnection *conn = qobject_cast<QXmppIceConnection*>(sender());
+    auto *conn = qobject_cast<QXmppIceConnection*>(sender());
     QXmppCallPrivate::Stream *stream = nullptr;
     foreach (QXmppCallPrivate::Stream *ptr, d->streams) {
         if (ptr->connection == conn) {
@@ -799,7 +799,7 @@ QXmppCall *QXmppCallManager::call(const QString &jid)
         return nullptr;
     }
 
-    QXmppCall *call = new QXmppCall(jid, QXmppCall::OutgoingDirection, this);
+    auto *call = new QXmppCall(jid, QXmppCall::OutgoingDirection, this);
     call->d->sid = QXmppUtils::generateStanzaHash();
 
     // register call
diff --git a/src/client/QXmppClient.cpp b/src/client/QXmppClient.cpp
index e5bd5473..deef3dbc 100644
--- a/src/client/QXmppClient.cpp
+++ b/src/client/QXmppClient.cpp
@@ -78,7 +78,7 @@ QXmppClientPrivate::QXmppClientPrivate(QXmppClient *qq)
 
 void QXmppClientPrivate::addProperCapability(QXmppPresence& presence)
 {
-    QXmppDiscoveryManager* ext = q->findExtension<QXmppDiscoveryManager>();
+    auto* ext = q->findExtension<QXmppDiscoveryManager>();
     if(ext) {
         presence.setCapabilityHash("sha-1");
         presence.setCapabilityNode(ext->clientCapabilitiesNode());
diff --git a/src/client/QXmppClient.h b/src/client/QXmppClient.h
index de4bb3d5..5f765602 100644
--- a/src/client/QXmppClient.h
+++ b/src/client/QXmppClient.h
@@ -127,10 +127,10 @@ public:
     template<typename T>
     T* findExtension()
     {
-        QList<QXmppClientExtension*> list = extensions();
-        for (int i = 0; i < list.size(); ++i)
+        const QList<QXmppClientExtension*> list = extensions();
+        for (auto ext : list)
         {
-            T* extension = qobject_cast<T*>(list.at(i));
+            T* extension = qobject_cast<T*>(ext);
             if(extension)
                 return extension;
         }
diff --git a/src/client/QXmppOutgoingClient.cpp b/src/client/QXmppOutgoingClient.cpp
index 3e8b4034..3a454e79 100644
--- a/src/client/QXmppOutgoingClient.cpp
+++ b/src/client/QXmppOutgoingClient.cpp
@@ -187,7 +187,7 @@ QXmppOutgoingClient::QXmppOutgoingClient(QObject *parent)
     Q_UNUSED(check);
 
     // initialise socket
-    QSslSocket *socket = new QSslSocket(this);
+    auto *socket = new QSslSocket(this);
     setSocket(socket);
 
     check = connect(socket, SIGNAL(disconnected()),
diff --git a/src/client/QXmppTransferManager.cpp b/src/client/QXmppTransferManager.cpp
index e69d1941..57e19fdd 100644
--- a/src/client/QXmppTransferManager.cpp
+++ b/src/client/QXmppTransferManager.cpp
@@ -263,7 +263,7 @@ void QXmppTransferJob::accept(const QString &filePath)
 {
     if (d->direction == IncomingDirection && d->state == OfferState && !d->iodevice)
     {
-        QFile *file = new QFile(filePath, this);
+        auto *file = new QFile(filePath, this);
         if (!file->open(QIODevice::WriteOnly))
         {
             warning(QString("Could not write to %1").arg(filePath));
@@ -1143,7 +1143,7 @@ void QXmppTransferManager::_q_iqReceived(const QXmppIq &iq)
         // handle IQ from proxy
         if (ptr->direction() == QXmppTransferJob::OutgoingDirection && ptr->d->socksProxy.jid() == iq.from() && ptr->d->requestId == iq.id())
         {
-            QXmppTransferOutgoingJob *job = static_cast<QXmppTransferOutgoingJob*>(ptr);
+            auto *job = static_cast<QXmppTransferOutgoingJob*>(ptr);
             if (job->d->socksSocket)
             {
                 // proxy connection activation result
@@ -1198,7 +1198,7 @@ void QXmppTransferManager::_q_jobDestroyed(QObject *object)
 
 void QXmppTransferManager::_q_jobError(QXmppTransferJob::Error error)
 {
-    QXmppTransferJob *job = qobject_cast<QXmppTransferJob *>(sender());
+    auto *job = qobject_cast<QXmppTransferJob *>(sender());
     if (!job || !d->jobs.contains(job))
         return;
 
@@ -1217,7 +1217,7 @@ void QXmppTransferManager::_q_jobError(QXmppTransferJob::Error error)
 
 void QXmppTransferManager::_q_jobFinished()
 {
-    QXmppTransferJob *job = qobject_cast<QXmppTransferJob *>(sender());
+    auto *job = qobject_cast<QXmppTransferJob *>(sender());
     if (!job || !d->jobs.contains(job))
         return;
 
@@ -1229,7 +1229,7 @@ void QXmppTransferManager::_q_jobStateChanged(QXmppTransferJob::State state)
     bool check;
     Q_UNUSED(check);
 
-    QXmppTransferJob *job = qobject_cast<QXmppTransferJob *>(sender());
+    auto *job = qobject_cast<QXmppTransferJob *>(sender());
     if (!job || !d->jobs.contains(job))
         return;
 
@@ -1360,7 +1360,7 @@ QXmppTransferJob *QXmppTransferManager::sendFile(const QString &jid, QIODevice *
         return nullptr;
     }
 
-    QXmppTransferOutgoingJob *job = new QXmppTransferOutgoingJob(jid, client(), this);
+    auto *job = new QXmppTransferOutgoingJob(jid, client(), this);
     if (sid.isEmpty())
         job->d->sid = QXmppUtils::generateStanzaHash();
     else
diff --git a/src/server/QXmppIncomingClient.cpp b/src/server/QXmppIncomingClient.cpp
index e563ef1c..aadc6d9e 100644
--- a/src/server/QXmppIncomingClient.cpp
+++ b/src/server/QXmppIncomingClient.cpp
@@ -393,7 +393,7 @@ void QXmppIncomingClient::handleStanza(const QDomElement &nodeRecv)
 
 void QXmppIncomingClient::onDigestReply()
 {
-    QXmppPasswordReply *reply = qobject_cast<QXmppPasswordReply*>(sender());
+    auto *reply = qobject_cast<QXmppPasswordReply*>(sender());
     if (!reply)
         return;
     reply->deleteLater();
@@ -424,7 +424,7 @@ void QXmppIncomingClient::onDigestReply()
 
 void QXmppIncomingClient::onPasswordReply()
 {
-    QXmppPasswordReply *reply = qobject_cast<QXmppPasswordReply*>(sender());
+    auto *reply = qobject_cast<QXmppPasswordReply*>(sender());
     if (!reply)
         return;
     reply->deleteLater();
diff --git a/src/server/QXmppIncomingServer.cpp b/src/server/QXmppIncomingServer.cpp
index e1223d86..1e413600 100644
--- a/src/server/QXmppIncomingServer.cpp
+++ b/src/server/QXmppIncomingServer.cpp
@@ -159,7 +159,7 @@ void QXmppIncomingServer::handleStanza(const QDomElement &stanza)
             debug(QString("Received a dialback result from '%1' on %2").arg(domain, d->origin()));
 
             // establish dialback connection
-            QXmppOutgoingServer *stream = new QXmppOutgoingServer(d->domain, this);
+            auto *stream = new QXmppOutgoingServer(d->domain, this);
             bool check = connect(stream, SIGNAL(dialbackResponseReceived(QXmppDialback)),
                                  this, SLOT(slotDialbackResponseReceived(QXmppDialback)));
             Q_ASSERT(check);
@@ -201,7 +201,7 @@ bool QXmppIncomingServer::isConnected() const
 
 void QXmppIncomingServer::slotDialbackResponseReceived(const QXmppDialback &dialback)
 {
-    QXmppOutgoingServer *stream = qobject_cast<QXmppOutgoingServer*>(sender());
+    auto *stream = qobject_cast<QXmppOutgoingServer*>(sender());
     if (!stream ||
         dialback.command() != QXmppDialback::Verify ||
         dialback.id() != d->localStreamId ||
diff --git a/src/server/QXmppOutgoingServer.cpp b/src/server/QXmppOutgoingServer.cpp
index 5df14368..af5ed01b 100644
--- a/src/server/QXmppOutgoingServer.cpp
+++ b/src/server/QXmppOutgoingServer.cpp
@@ -61,7 +61,7 @@ QXmppOutgoingServer::QXmppOutgoingServer(const QString &domain, QObject *parent)
     Q_UNUSED(check);
 
     // socket initialisation
-    QSslSocket *socket = new QSslSocket(this);
+    auto *socket = new QSslSocket(this);
     setSocket(socket);
 
     check = connect(socket, SIGNAL(disconnected()),
diff --git a/src/server/QXmppPasswordChecker.cpp b/src/server/QXmppPasswordChecker.cpp
index 758e604f..026d69cc 100644
--- a/src/server/QXmppPasswordChecker.cpp
+++ b/src/server/QXmppPasswordChecker.cpp
@@ -162,7 +162,7 @@ void QXmppPasswordReply::setPassword(const QString &password)
 
 QXmppPasswordReply *QXmppPasswordChecker::checkPassword(const QXmppPasswordRequest &request)
 {
-    QXmppPasswordReply *reply = new QXmppPasswordReply;
+    auto *reply = new QXmppPasswordReply;
 
     QString secret;
     QXmppPasswordReply::Error error = getPassword(request, secret);
@@ -187,7 +187,7 @@ QXmppPasswordReply *QXmppPasswordChecker::checkPassword(const QXmppPasswordReque
 
 QXmppPasswordReply *QXmppPasswordChecker::getDigest(const QXmppPasswordRequest &request)
 {
-    QXmppPasswordReply *reply = new QXmppPasswordReply;
+    auto *reply = new QXmppPasswordReply;
 
     QString secret;
     QXmppPasswordReply::Error error = getPassword(request, secret);
diff --git a/src/server/QXmppServer.cpp b/src/server/QXmppServer.cpp
index 82bc5d37..283d3917 100644
--- a/src/server/QXmppServer.cpp
+++ b/src/server/QXmppServer.cpp
@@ -166,7 +166,7 @@ bool QXmppServerPrivate::routeData(const QString &to, const QByteArray &data)
 
         // if we did not find an outgoing server,
         // we need to establish the S2S connection
-        QXmppOutgoingServer *conn = new QXmppOutgoingServer(domain, nullptr);
+        auto *conn = new QXmppOutgoingServer(domain, nullptr);
         conn->setLocalStreamKey(QXmppUtils::generateStanzaHash().toLatin1());
         conn->moveToThread(q->thread());
         conn->setParent(q);
@@ -266,7 +266,7 @@ void QXmppServerPrivate::loadExtensions(QXmppServer *server)
     if (!loaded) {
         QObjectList plugins = QPluginLoader::staticInstances();
         foreach (QObject *object, plugins) {
-            QXmppServerPlugin *plugin = qobject_cast<QXmppServerPlugin*>(object);
+            auto *plugin = qobject_cast<QXmppServerPlugin*>(object);
             if (!plugin)
                 continue;
 
@@ -547,7 +547,7 @@ bool QXmppServer::listenForClients(const QHostAddress &address, quint16 port)
     }
 
     // create new server
-    QXmppSslServer *server = new QXmppSslServer(this);
+    auto *server = new QXmppSslServer(this);
     server->addCaCertificates(d->caCertificates);
     server->setLocalCertificate(d->localCertificate);
     server->setPrivateKey(d->privateKey);
@@ -610,7 +610,7 @@ bool QXmppServer::listenForServers(const QHostAddress &address, quint16 port)
     }
 
     // create new server
-    QXmppSslServer *server = new QXmppSslServer(this);
+    auto *server = new QXmppSslServer(this);
     server->addCaCertificates(d->caCertificates);
     server->setLocalCertificate(d->localCertificate);
     server->setPrivateKey(d->privateKey);
@@ -704,7 +704,7 @@ void QXmppServer::_q_clientConnection(QSslSocket *socket)
         return;
     }
 
-    QXmppIncomingClient *stream = new QXmppIncomingClient(socket, d->domain, this);
+    auto *stream = new QXmppIncomingClient(socket, d->domain, this);
     stream->setInactivityTimeout(120);
     socket->setParent(stream);
     addIncomingClient(stream);
@@ -715,7 +715,7 @@ void QXmppServer::_q_clientConnection(QSslSocket *socket)
 
 void QXmppServer::_q_clientConnected()
 {
-    QXmppIncomingClient *client = qobject_cast<QXmppIncomingClient*>(sender());
+    auto *client = qobject_cast<QXmppIncomingClient*>(sender());
     if (!client)
         return;
 
@@ -739,7 +739,7 @@ void QXmppServer::_q_clientConnected()
 
 void QXmppServer::_q_clientDisconnected()
 {
-    QXmppIncomingClient *client  = qobject_cast<QXmppIncomingClient *>(sender());
+    auto *client  = qobject_cast<QXmppIncomingClient *>(sender());
     if (!client)
         return;
 
@@ -771,7 +771,7 @@ void QXmppServer::_q_clientDisconnected()
 
 void QXmppServer::_q_dialbackRequestReceived(const QXmppDialback &dialback)
 {
-    QXmppIncomingServer *stream = qobject_cast<QXmppIncomingServer *>(sender());
+    auto *stream = qobject_cast<QXmppIncomingServer *>(sender());
     if (!stream)
         return;
 
@@ -806,7 +806,7 @@ void QXmppServer::handleElement(const QDomElement &element)
 
 void QXmppServer::_q_outgoingServerDisconnected()
 {
-    QXmppOutgoingServer *outgoing = qobject_cast<QXmppOutgoingServer *>(sender());
+    auto *outgoing = qobject_cast<QXmppOutgoingServer *>(sender());
     if (!outgoing)
         return;
 
@@ -831,7 +831,7 @@ void QXmppServer::_q_serverConnection(QSslSocket *socket)
         return;
     }
 
-    QXmppIncomingServer *stream = new QXmppIncomingServer(socket, d->domain, this);
+    auto *stream = new QXmppIncomingServer(socket, d->domain, this);
     socket->setParent(stream);
 
     check = connect(stream, SIGNAL(disconnected()),
@@ -855,7 +855,7 @@ void QXmppServer::_q_serverConnection(QSslSocket *socket)
 
 void QXmppServer::_q_serverDisconnected()
 {
-    QXmppIncomingServer *incoming = qobject_cast<QXmppIncomingServer *>(sender());
+    auto *incoming = qobject_cast<QXmppIncomingServer *>(sender());
     if (!incoming)
         return;
 
@@ -893,7 +893,7 @@ QXmppSslServer::~QXmppSslServer()
 
 void QXmppSslServer::incomingConnection(qintptr socketDescriptor)
 {
-    QSslSocket *socket = new QSslSocket;
+    auto *socket = new QSslSocket;
     if (!socket->setSocketDescriptor(socketDescriptor)) {
         delete socket;
         return;
diff --git a/tests/qxmppcallmanager/tst_qxmppcallmanager.cpp b/tests/qxmppcallmanager/tst_qxmppcallmanager.cpp
index d5542c8e..5de6a8c9 100644
--- a/tests/qxmppcallmanager/tst_qxmppcallmanager.cpp
+++ b/tests/qxmppcallmanager/tst_qxmppcallmanager.cpp
@@ -77,7 +77,7 @@ void tst_QXmppCallManager::testCall()
 
     // prepare sender
     QXmppClient sender;
-    QXmppCallManager *senderManager = new QXmppCallManager;
+    auto *senderManager = new QXmppCallManager;
     sender.addExtension(senderManager);
     sender.setLogger(&logger);
 
@@ -97,7 +97,7 @@ void tst_QXmppCallManager::testCall()
 
     // prepare receiver
     QXmppClient receiver;
-    QXmppCallManager *receiverManager = new QXmppCallManager;
+    auto *receiverManager = new QXmppCallManager;
     connect(receiverManager, SIGNAL(callReceived(QXmppCall*)),
             this, SLOT(acceptCall(QXmppCall*)));
     receiver.addExtension(receiverManager);
diff --git a/tests/qxmppiq/tst_qxmppiq.cpp b/tests/qxmppiq/tst_qxmppiq.cpp
index fcf526e5..4f88e276 100644
--- a/tests/qxmppiq/tst_qxmppiq.cpp
+++ b/tests/qxmppiq/tst_qxmppiq.cpp
@@ -41,19 +41,19 @@ void tst_QXmppIq::testBasic_data()
     QTest::addColumn<int>("type");
 
     QTest::newRow("get")
-        << QByteArray("<iq to=\"foo@example.com/QXmpp\" from=\"bar@example.com/QXmpp\" type=\"get\"/>")
+        << QByteArray(R"(<iq to="foo@example.com/QXmpp" from="bar@example.com/QXmpp" type="get"/>)")
         << int(QXmppIq::Get);
 
     QTest::newRow("set")
-        << QByteArray("<iq to=\"foo@example.com/QXmpp\" from=\"bar@example.com/QXmpp\" type=\"set\"/>")
+        << QByteArray(R"(<iq to="foo@example.com/QXmpp" from="bar@example.com/QXmpp" type="set"/>)")
         << int(QXmppIq::Set);
 
     QTest::newRow("result")
-        << QByteArray("<iq to=\"foo@example.com/QXmpp\" from=\"bar@example.com/QXmpp\" type=\"result\"/>")
+        << QByteArray(R"(<iq to="foo@example.com/QXmpp" from="bar@example.com/QXmpp" type="result"/>)")
         << int(QXmppIq::Result);
 
     QTest::newRow("error")
-        << QByteArray("<iq to=\"foo@example.com/QXmpp\" from=\"bar@example.com/QXmpp\" type=\"error\"/>")
+        << QByteArray(R"(<iq to="foo@example.com/QXmpp" from="bar@example.com/QXmpp" type="error"/>)")
         << int(QXmppIq::Error);
 }
 
diff --git a/tests/qxmppjingleiq/tst_qxmppjingleiq.cpp b/tests/qxmppjingleiq/tst_qxmppjingleiq.cpp
index cd955c6a..0c7925ee 100644
--- a/tests/qxmppjingleiq/tst_qxmppjingleiq.cpp
+++ b/tests/qxmppjingleiq/tst_qxmppjingleiq.cpp
@@ -431,7 +431,7 @@ void tst_QXmppJingleIq::testTerminate()
 
 void tst_QXmppJingleIq::testAudioPayloadType()
 {
-    const QByteArray xml("<payload-type id=\"103\" name=\"L16\" channels=\"2\" clockrate=\"16000\"/>");
+    const QByteArray xml(R"(<payload-type id="103" name="L16" channels="2" clockrate="16000"/>)");
     QXmppJinglePayloadType payload;
     parsePacket(payload, xml);
     QCOMPARE(payload.id(), static_cast<unsigned char>(103));
diff --git a/tests/qxmppmessage/tst_qxmppmessage.cpp b/tests/qxmppmessage/tst_qxmppmessage.cpp
index 3d22d309..a5b595d3 100644
--- a/tests/qxmppmessage/tst_qxmppmessage.cpp
+++ b/tests/qxmppmessage/tst_qxmppmessage.cpp
@@ -66,23 +66,23 @@ void tst_QXmppMessage::testBasic_data()
     QTest::addColumn<QString>("thread");
 
     QTest::newRow("error")
-        << QByteArray("<message to=\"foo@example.com/QXmpp\" from=\"bar@example.com/QXmpp\" type=\"error\"/>")
+        << QByteArray(R"(<message to="foo@example.com/QXmpp" from="bar@example.com/QXmpp" type="error"/>)")
         << int(QXmppMessage::Error)
         << QString() << QString() << QString();
     QTest::newRow("normal")
-        << QByteArray("<message to=\"foo@example.com/QXmpp\" from=\"bar@example.com/QXmpp\" type=\"normal\"/>")
+        << QByteArray(R"(<message to="foo@example.com/QXmpp" from="bar@example.com/QXmpp" type="normal"/>)")
         << int(QXmppMessage::Normal)
         << QString() << QString() << QString();
     QTest::newRow("chat")
-        << QByteArray("<message to=\"foo@example.com/QXmpp\" from=\"bar@example.com/QXmpp\" type=\"chat\"/>")
+        << QByteArray(R"(<message to="foo@example.com/QXmpp" from="bar@example.com/QXmpp" type="chat"/>)")
         << int(QXmppMessage::Chat)
         << QString() << QString() << QString();
     QTest::newRow("groupchat")
-        << QByteArray("<message to=\"foo@example.com/QXmpp\" from=\"bar@example.com/QXmpp\" type=\"groupchat\"/>")
+        << QByteArray(R"(<message to="foo@example.com/QXmpp" from="bar@example.com/QXmpp" type="groupchat"/>)")
         << int(QXmppMessage::GroupChat)
         << QString() << QString() << QString();
     QTest::newRow("headline")
-        << QByteArray("<message to=\"foo@example.com/QXmpp\" from=\"bar@example.com/QXmpp\" type=\"headline\"/>")
+        << QByteArray(R"(<message to="foo@example.com/QXmpp" from="bar@example.com/QXmpp" type="headline"/>)")
         << int(QXmppMessage::Headline)
         << QString() << QString() << QString();
 
@@ -364,23 +364,23 @@ void tst_QXmppMessage::testState_data()
         << int(QXmppMessage::None);
 
     QTest::newRow("active")
-        << QByteArray("<message type=\"normal\"><active xmlns=\"http://jabber.org/protocol/chatstates\"/></message>")
+        << QByteArray(R"(<message type="normal"><active xmlns="http://jabber.org/protocol/chatstates"/></message>)")
         << int(QXmppMessage::Active);
 
     QTest::newRow("inactive")
-        << QByteArray("<message type=\"normal\"><inactive xmlns=\"http://jabber.org/protocol/chatstates\"/></message>")
+        << QByteArray(R"(<message type="normal"><inactive xmlns="http://jabber.org/protocol/chatstates"/></message>)")
         << int(QXmppMessage::Inactive);
 
     QTest::newRow("gone")
-        << QByteArray("<message type=\"normal\"><gone xmlns=\"http://jabber.org/protocol/chatstates\"/></message>")
+        << QByteArray(R"(<message type="normal"><gone xmlns="http://jabber.org/protocol/chatstates"/></message>)")
         << int(QXmppMessage::Gone);
 
     QTest::newRow("composing")
-        << QByteArray("<message type=\"normal\"><composing xmlns=\"http://jabber.org/protocol/chatstates\"/></message>")
+        << QByteArray(R"(<message type="normal"><composing xmlns="http://jabber.org/protocol/chatstates"/></message>)")
         << int(QXmppMessage::Composing);
 
     QTest::newRow("paused")
-        << QByteArray("<message type=\"normal\"><paused xmlns=\"http://jabber.org/protocol/chatstates\"/></message>")
+        << QByteArray(R"(<message type="normal"><paused xmlns="http://jabber.org/protocol/chatstates"/></message>)")
         << int(QXmppMessage::Paused);
 }
 
diff --git a/tests/qxmpprosteriq/tst_qxmpprosteriq.cpp b/tests/qxmpprosteriq/tst_qxmpprosteriq.cpp
index f8db1dea..34af928e 100644
--- a/tests/qxmpprosteriq/tst_qxmpprosteriq.cpp
+++ b/tests/qxmpprosteriq/tst_qxmpprosteriq.cpp
@@ -43,23 +43,23 @@ void tst_QXmppRosterIq::testItem_data()
     QTest::addColumn<int>("subscriptionType");
 
     QTest::newRow("none")
-        << QByteArray("<item jid=\"foo@example.com\" subscription=\"none\"/>")
+        << QByteArray(R"(<item jid="foo@example.com" subscription="none"/>)")
         << ""
         << int(QXmppRosterIq::Item::None);
     QTest::newRow("from")
-        << QByteArray("<item jid=\"foo@example.com\" subscription=\"from\"/>")
+        << QByteArray(R"(<item jid="foo@example.com" subscription="from"/>)")
         << ""
         << int(QXmppRosterIq::Item::From);
     QTest::newRow("to")
-        << QByteArray("<item jid=\"foo@example.com\" subscription=\"to\"/>")
+        << QByteArray(R"(<item jid="foo@example.com" subscription="to"/>)")
         << ""
         << int(QXmppRosterIq::Item::To);
     QTest::newRow("both")
-        << QByteArray("<item jid=\"foo@example.com\" subscription=\"both\"/>")
+        << QByteArray(R"(<item jid="foo@example.com" subscription="both"/>)")
         << ""
         << int(QXmppRosterIq::Item::Both);
     QTest::newRow("remove")
-        << QByteArray("<item jid=\"foo@example.com\" subscription=\"remove\"/>")
+        << QByteArray(R"(<item jid="foo@example.com" subscription="remove"/>)")
         << ""
         << int(QXmppRosterIq::Item::Remove);
     QTest::newRow("notset")
@@ -68,7 +68,7 @@ void tst_QXmppRosterIq::testItem_data()
         << int(QXmppRosterIq::Item::NotSet);
 
     QTest::newRow("name")
-        << QByteArray("<item jid=\"foo@example.com\" name=\"foo bar\"/>")
+        << QByteArray(R"(<item jid="foo@example.com" name="foo bar"/>)")
         << "foo bar"
         << int(QXmppRosterIq::Item::NotSet);
 }
@@ -95,11 +95,11 @@ void tst_QXmppRosterIq::testVersion_data()
     QTest::addColumn<QString>("version");
 
     QTest::newRow("noversion")
-        << QByteArray("<iq id=\"woodyisacat\" to=\"woody@zam.tw/cat\" type=\"result\"><query xmlns=\"jabber:iq:roster\"/></iq>")
+        << QByteArray(R"(<iq id="woodyisacat" to="woody@zam.tw/cat" type="result"><query xmlns="jabber:iq:roster"/></iq>)")
         << "";
 
     QTest::newRow("version")
-        << QByteArray("<iq id=\"woodyisacat\" to=\"woody@zam.tw/cat\" type=\"result\"><query xmlns=\"jabber:iq:roster\" ver=\"3345678\"/></iq>")
+        << QByteArray(R"(<iq id="woodyisacat" to="woody@zam.tw/cat" type="result"><query xmlns="jabber:iq:roster" ver="3345678"/></iq>)")
         << "3345678";
 }
 
diff --git a/tests/qxmppstanza/tst_qxmppstanza.cpp b/tests/qxmppstanza/tst_qxmppstanza.cpp
index 22878557..807a9c03 100644
--- a/tests/qxmppstanza/tst_qxmppstanza.cpp
+++ b/tests/qxmppstanza/tst_qxmppstanza.cpp
@@ -46,14 +46,14 @@ void tst_QXmppStanza::testExtendedAddress_data()
     QTest::addColumn<QString>("type");
 
     QTest::newRow("simple")
-        << QByteArray("<address jid=\"foo@example.com/QXmpp\" type=\"bcc\"/>")
+        << QByteArray(R"(<address jid="foo@example.com/QXmpp" type="bcc"/>)")
         << false
         << QString()
         << QString("foo@example.com/QXmpp")
         << QString("bcc");
 
     QTest::newRow("full")
-        << QByteArray("<address delivered=\"true\" desc=\"some description\" jid=\"foo@example.com/QXmpp\" type=\"bcc\"/>")
+        << QByteArray(R"(<address delivered="true" desc="some description" jid="foo@example.com/QXmpp" type="bcc"/>)")
         << true
         << QString("some description")
         << QString("foo@example.com/QXmpp")
diff --git a/tests/qxmpptransfermanager/tst_qxmpptransfermanager.cpp b/tests/qxmpptransfermanager/tst_qxmpptransfermanager.cpp
index 3d1d6f00..e5ac6784 100644
--- a/tests/qxmpptransfermanager/tst_qxmpptransfermanager.cpp
+++ b/tests/qxmpptransfermanager/tst_qxmpptransfermanager.cpp
@@ -106,7 +106,7 @@ void tst_QXmppTransferManager::testSendFile()
 
     // prepare sender
     QXmppClient sender;
-    QXmppTransferManager *senderManager = new QXmppTransferManager;
+    auto *senderManager = new QXmppTransferManager;
     senderManager->setSupportedMethods(senderMethods);
     sender.addExtension(senderManager);
     sender.setLogger(&logger);
@@ -127,7 +127,7 @@ void tst_QXmppTransferManager::testSendFile()
 
     // prepare receiver
     QXmppClient receiver;
-    QXmppTransferManager *receiverManager = new QXmppTransferManager;
+    auto *receiverManager = new QXmppTransferManager;
     receiverManager->setSupportedMethods(receiverMethods);
     connect(receiverManager, SIGNAL(fileReceived(QXmppTransferJob*)),
             this, SLOT(acceptFile(QXmppTransferJob*)));