normalise signal/slot signatures [QtNetwork tests]

Change-Id: I2491cfe421a811d00759224da03580b3dcc2a091
Reviewed-by: Shane Kearns <shane.kearns@accenture.com>

3 files changed, 25 insertions, 25 deletions

diff --git a/tests/auto/network/access/qftp/tst_qftp.cpp b/tests/auto/network/access/qftp/tst_qftp.cpp
index 5da4a9d67f..702d56db54 100644
--- a/tests/auto/network/access/qftp/tst_qftp.cpp
+++ b/tests/auto/network/access/qftp/tst_qftp.cpp
@@ -966,11 +966,11 @@ void tst_QFtp::mkdir2()
 
     QEventLoop loop;
     connect(ftp, SIGNAL(done(bool)), &loop, SLOT(quit()));
-    connect(ftp, SIGNAL(commandFinished(int, bool)), this, SLOT(mkdir2Slot(int, bool)));
+    connect(ftp, SIGNAL(commandFinished(int,bool)), this, SLOT(mkdir2Slot(int,bool)));
     QTimer::singleShot(5000, &loop, SLOT(quit()));
 
     QSignalSpy commandStartedSpy(ftp, SIGNAL(commandStarted(int)));
-    QSignalSpy commandFinishedSpy(ftp, SIGNAL(commandFinished(int, bool)));
+    QSignalSpy commandFinishedSpy(ftp, SIGNAL(commandFinished(int,bool)));
 
     loop.exec();
 
@@ -1933,12 +1933,12 @@ QFtp *tst_QFtp::newFtp()
              SLOT(done(bool)) );
     connect( nFtp, SIGNAL(stateChanged(int)),
              SLOT(stateChanged(int)) );
-    connect( nFtp, SIGNAL(listInfo(const QUrlInfo&)),
-             SLOT(listInfo(const QUrlInfo&)) );
+    connect( nFtp, SIGNAL(listInfo(QUrlInfo)),
+             SLOT(listInfo(QUrlInfo)) );
     connect( nFtp, SIGNAL(readyRead()),
              SLOT(readyRead()) );
-    connect( nFtp, SIGNAL(dataTransferProgress(qint64, qint64)),
-             SLOT(dataTransferProgress(qint64, qint64)) );
+    connect( nFtp, SIGNAL(dataTransferProgress(qint64,qint64)),
+             SLOT(dataTransferProgress(qint64,qint64)) );
 
     return nFtp;
 }
@@ -2072,7 +2072,7 @@ void tst_QFtp::queueMoreCommandsInDoneSlot()
 
     QFtp ftp;
     QSignalSpy doneSpy(&ftp, SIGNAL(done(bool)));
-    QSignalSpy commandFinishedSpy(&ftp, SIGNAL(commandFinished(int, bool)));
+    QSignalSpy commandFinishedSpy(&ftp, SIGNAL(commandFinished(int,bool)));
 
     this->ftp = &ftp;
     connect(&ftp, SIGNAL(done(bool)), this, SLOT(cdUpSlot(bool)));
diff --git a/tests/auto/network/access/qhttpnetworkconnection/tst_qhttpnetworkconnection.cpp b/tests/auto/network/access/qhttpnetworkconnection/tst_qhttpnetworkconnection.cpp
index b77634e8e6..948f8078b3 100644
--- a/tests/auto/network/access/qhttpnetworkconnection/tst_qhttpnetworkconnection.cpp
+++ b/tests/auto/network/access/qhttpnetworkconnection/tst_qhttpnetworkconnection.cpp
@@ -335,8 +335,8 @@ void tst_QHttpNetworkConnection::put()
 
     QHttpNetworkReply *reply = connection.sendRequest(request);
     connect(reply, SIGNAL(finished()), SLOT(finishedReply()));
-    connect(reply, SIGNAL(finishedWithError(QNetworkReply::NetworkError, const QString &)),
-        SLOT(finishedWithError(QNetworkReply::NetworkError, const QString &)));
+    connect(reply, SIGNAL(finishedWithError(QNetworkReply::NetworkError,QString)),
+        SLOT(finishedWithError(QNetworkReply::NetworkError,QString)));
 
     QTime stopWatch;
     stopWatch.start();
@@ -561,15 +561,15 @@ void tst_QHttpNetworkConnection::get401()
 
     QHttpNetworkRequest request(protocol + host + path);
     QHttpNetworkReply *reply = connection.sendRequest(request);
-    connect(reply, SIGNAL(authenticationRequired(const QHttpNetworkRequest&, QAuthenticator *)),
-                           SLOT(challenge401(const QHttpNetworkRequest&, QAuthenticator *)));
+    connect(reply, SIGNAL(authenticationRequired(QHttpNetworkRequest,QAuthenticator*)),
+                           SLOT(challenge401(QHttpNetworkRequest,QAuthenticator*)));
 
     finishedCalled = false;
     finishedWithErrorCalled = false;
 
     connect(reply, SIGNAL(finished()), SLOT(finishedReply()));
-    connect(reply, SIGNAL(finishedWithError(QNetworkReply::NetworkError, const QString &)),
-        SLOT(finishedWithError(QNetworkReply::NetworkError, const QString &)));
+    connect(reply, SIGNAL(finishedWithError(QNetworkReply::NetworkError,QString)),
+        SLOT(finishedWithError(QNetworkReply::NetworkError,QString)));
 
     QTime stopWatch;
     stopWatch.start();
@@ -722,8 +722,8 @@ void tst_QHttpNetworkConnection::ignoresslerror()
 
     QHttpNetworkRequest request(protocol + host + path);
     QHttpNetworkReply *reply = connection.sendRequest(request);
-    connect(reply, SIGNAL(sslErrors(const QList<QSslError>&)),
-        SLOT(sslErrors(const QList<QSslError>&)));
+    connect(reply, SIGNAL(sslErrors(QList<QSslError>)),
+        SLOT(sslErrors(QList<QSslError>)));
 
     finishedWithErrorCalled = false;
 
@@ -778,8 +778,8 @@ void tst_QHttpNetworkConnection::nossl()
     netErrorCode = QNetworkReply::NoError;
 
     connect(reply, SIGNAL(finished()), SLOT(finishedReply()));
-    connect(reply, SIGNAL(finishedWithError(QNetworkReply::NetworkError, const QString &)),
-        SLOT(finishedWithError(QNetworkReply::NetworkError, const QString &)));
+    connect(reply, SIGNAL(finishedWithError(QNetworkReply::NetworkError,QString)),
+        SLOT(finishedWithError(QNetworkReply::NetworkError,QString)));
 
     QTime stopWatch;
     stopWatch.start();
diff --git a/tests/auto/network/access/qnetworkreply/tst_qnetworkreply.cpp b/tests/auto/network/access/qnetworkreply/tst_qnetworkreply.cpp
index a5a79060ee..284768ea13 100644
--- a/tests/auto/network/access/qnetworkreply/tst_qnetworkreply.cpp
+++ b/tests/auto/network/access/qnetworkreply/tst_qnetworkreply.cpp
@@ -4346,7 +4346,7 @@ public:
             connect(serverSocket, SIGNAL(encrypted()), this, SLOT(encryptedSlot()));
             connect(serverSocket, SIGNAL(readyRead()), this, SLOT(readyReadSlot()));
             serverSocket->setProtocol(QSsl::AnyProtocol);
-            connect(serverSocket, SIGNAL(sslErrors(const QList<QSslError>&)), serverSocket, SLOT(ignoreSslErrors()));
+            connect(serverSocket, SIGNAL(sslErrors(QList<QSslError>)), serverSocket, SLOT(ignoreSslErrors()));
             serverSocket->setLocalCertificate(testDataDir + "/certs/server.pem");
             serverSocket->setPrivateKey(testDataDir + "/certs/server.key");
             serverSocket->startServerEncryption();
@@ -4396,7 +4396,7 @@ void tst_QNetworkReply::ioPostToHttpsUploadProgress()
 
     QSignalSpy spy(reply.data(), SIGNAL(uploadProgress(qint64,qint64)));
     connect(&server, SIGNAL(newEncryptedConnection()), &QTestEventLoop::instance(), SLOT(exitLoop()));
-    connect(reply, SIGNAL(sslErrors(const QList<QSslError>&)), reply.data(), SLOT(ignoreSslErrors()));
+    connect(reply, SIGNAL(sslErrors(QList<QSslError>)), reply.data(), SLOT(ignoreSslErrors()));
 
     // get the request started and the incoming socket connected
     QTestEventLoop::instance().enterLoop(10);
@@ -5611,8 +5611,8 @@ void tst_QNetworkReply::ignoreSslErrorsListWithSlot()
     QFETCH(QList<QSslError>, expectedSslErrors);
     // store the errors to ignore them later in the slot connected below
     storedExpectedSslErrors = expectedSslErrors;
-    connect(&manager, SIGNAL(sslErrors(QNetworkReply *, const QList<QSslError> &)),
-            this, SLOT(ignoreSslErrorListSlot(QNetworkReply *, const QList<QSslError> &)));
+    connect(&manager, SIGNAL(sslErrors(QNetworkReply*,QList<QSslError>)),
+            this, SLOT(ignoreSslErrorListSlot(QNetworkReply*,QList<QSslError>)));
 
 
     QVERIFY(waitForFinish(reply) != Timeout);
@@ -6141,10 +6141,10 @@ void tst_QNetworkReply::authenticationCacheAfterCancel()
 #endif
     manager.setProxy(proxy);
     QSignalSpy authSpy(&manager, SIGNAL(authenticationRequired(QNetworkReply*,QAuthenticator*)));
-    QSignalSpy proxyAuthSpy(&manager, SIGNAL(proxyAuthenticationRequired(const QNetworkProxy &, QAuthenticator *)));
+    QSignalSpy proxyAuthSpy(&manager, SIGNAL(proxyAuthenticationRequired(QNetworkProxy,QAuthenticator*)));
 
     AuthenticationCacheHelper helper;
-    connect(&manager, SIGNAL(proxyAuthenticationRequired(const QNetworkProxy &, QAuthenticator *)), &helper, SLOT(proxyAuthenticationRequired(const QNetworkProxy &, QAuthenticator *)));
+    connect(&manager, SIGNAL(proxyAuthenticationRequired(QNetworkProxy,QAuthenticator*)), &helper, SLOT(proxyAuthenticationRequired(QNetworkProxy,QAuthenticator*)));
     connect(&manager, SIGNAL(authenticationRequired(QNetworkReply*,QAuthenticator*)), &helper, SLOT(authenticationRequired(QNetworkReply*,QAuthenticator*)));
 
     QNetworkRequest request(url);
@@ -6266,7 +6266,7 @@ void tst_QNetworkReply::authenticationWithDifferentRealm()
     connect(&manager, SIGNAL(sslErrors(QNetworkReply*,QList<QSslError>)),
             SLOT(sslErrors(QNetworkReply*,QList<QSslError>)));
 #endif
-    connect(&manager, SIGNAL(proxyAuthenticationRequired(const QNetworkProxy &, QAuthenticator *)), &helper, SLOT(proxyAuthenticationRequired(const QNetworkProxy &, QAuthenticator *)));
+    connect(&manager, SIGNAL(proxyAuthenticationRequired(QNetworkProxy,QAuthenticator*)), &helper, SLOT(proxyAuthenticationRequired(QNetworkProxy,QAuthenticator*)));
     connect(&manager, SIGNAL(authenticationRequired(QNetworkReply*,QAuthenticator*)), &helper, SLOT(authenticationRequired(QNetworkReply*,QAuthenticator*)));
 
     helper.httpUserName = "httptest";
@@ -6630,7 +6630,7 @@ void tst_QNetworkReply::synchronousRequestSslFailure()
             QNetworkRequest::SynchronousRequestAttribute,
             true);
     QNetworkReplyPtr reply;
-    QSignalSpy sslErrorsSpy(&manager, SIGNAL(sslErrors(QNetworkReply *, const QList<QSslError> &)));
+    QSignalSpy sslErrorsSpy(&manager, SIGNAL(sslErrors(QNetworkReply*,QList<QSslError>)));
     runSimpleRequest(QNetworkAccessManager::GetOperation, request, reply, 0);
     QVERIFY(reply->isFinished());
     QCOMPARE(reply->error(), QNetworkReply::SslHandshakeFailedError);