1 files changed, 9 insertions, 13 deletions
diff --git a/tests/auto/network/socket/qlocalsocket/tst_qlocalsocket.cpp b/tests/auto/network/socket/qlocalsocket/tst_qlocalsocket.cpp
index d7480a4109..9362195839 100644
--- a/tests/auto/network/socket/qlocalsocket/tst_qlocalsocket.cpp
+++ b/tests/auto/network/socket/qlocalsocket/tst_qlocalsocket.cpp
@@ -54,9 +54,8 @@ class tst_QLocalSocket : public QObject
 {
     Q_OBJECT
 
-public Q_SLOTS:
-    void init();
-    void cleanup();
+public:
+    tst_QLocalSocket();
 
 private slots:
     // basics
@@ -116,7 +115,7 @@ private slots:
 
 };
 
-void tst_QLocalSocket::init()
+tst_QLocalSocket::tst_QLocalSocket()
 {
     qRegisterMetaType<QLocalSocket::LocalSocketState>("QLocalSocket::LocalSocketState");
     qRegisterMetaType<QLocalSocket::LocalSocketError>("QLocalSocket::LocalSocketError");
@@ -124,10 +123,6 @@ void tst_QLocalSocket::init()
     qRegisterMetaType<QFile::Permissions>("QFile::Permissions");
 }
 
-void tst_QLocalSocket::cleanup()
-{
-}
-
 class LocalServer : public QLocalServer
 {
     Q_OBJECT
@@ -190,7 +185,7 @@ private slots:
     }
     void slotError(QLocalSocket::LocalSocketError newError)
     {
-        QVERIFY(errorString() != "Unknown error");
+        QVERIFY(errorString() != QLatin1String("Unknown error"));
         QCOMPARE(error(), newError);
     }
     void slotStateChanged(QLocalSocket::LocalSocketState newState)
@@ -328,8 +323,9 @@ void tst_QLocalSocket::listenAndConnect_data()
         int connections = i;
         if (i == 2)
             connections = 5;
-        QTest::newRow(QString("null %1").arg(i).toLatin1()) << QString() << false << connections;
-        QTest::newRow(QString("tst_localsocket %1").arg(i).toLatin1()) << "tst_localsocket" << true << connections;
+        const QByteArray iB = QByteArray::number(i);
+        QTest::newRow(("null " + iB).constData()) << QString() << false << connections;
+        QTest::newRow(("tst_localsocket " + iB).constData()) << "tst_localsocket" << true << connections;
     }
 }
 
@@ -535,7 +531,7 @@ void tst_QLocalSocket::sendData()
     if (server.hasPendingConnections()) {
         QString testLine = "test";
         for (int i = 0; i < 50000; ++i)
-            testLine += "a";
+            testLine += QLatin1Char('a');
         QLocalSocket *serverSocket = server.nextPendingConnection();
         QVERIFY(serverSocket);
         QCOMPARE(serverSocket->state(), QLocalSocket::ConnectedState);
@@ -1237,7 +1233,7 @@ void tst_QLocalSocket::verifyListenWithDescriptor()
         QVERIFY2(server.fullServerName().at(0) == at, "abstract sockets should start with a '@'");
     } else {
         QCOMPARE(server.fullServerName(), path);
-        if (path.contains(QLatin1String("/"))) {
+        if (path.contains(QLatin1Char('/'))) {
             QVERIFY2(server.serverName() == path.mid(path.lastIndexOf(QLatin1Char('/'))+1), "server name invalid short name");
         } else {
             QVERIFY2(server.serverName() == path, "servier name doesn't match the path provided");