From 876c924cde7b8fe129d0f3e1b76cf0a2de9fb856 Mon Sep 17 00:00:00 2001
From: Jonah Brüchert <jbb.prv@gmx.de>
Date: Sat, 19 Oct 2019 17:23:08 +0200
Subject: Use raw literals, range based loops and auto

---
 tests/qxmppcallmanager/tst_qxmppcallmanager.cpp      |  4 ++--
 tests/qxmppiq/tst_qxmppiq.cpp                        |  8 ++++----
 tests/qxmppjingleiq/tst_qxmppjingleiq.cpp            |  2 +-
 tests/qxmppmessage/tst_qxmppmessage.cpp              | 20 ++++++++++----------
 tests/qxmpprosteriq/tst_qxmpprosteriq.cpp            | 16 ++++++++--------
 tests/qxmppstanza/tst_qxmppstanza.cpp                |  4 ++--
 .../tst_qxmpptransfermanager.cpp                     |  4 ++--
 7 files changed, 29 insertions(+), 29 deletions(-)

(limited to 'tests')

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*)));
-- 
cgit v1.2.3