1 files changed, 15 insertions, 15 deletions
diff --git a/utils/rbutilqt/test/test-httpget.cpp b/utils/rbutilqt/test/test-httpget.cpp
index 62aace0352..26945e4e15 100644
--- a/utils/rbutilqt/test/test-httpget.cpp
+++ b/utils/rbutilqt/test/test-httpget.cpp
@@ -51,8 +51,8 @@
            // works asynchronously, this means that all the communication is done
            // in the two slots readClient() and discardClient().
            QTcpSocket* s = new QTcpSocket(this);
-            connect(s, SIGNAL(readyRead()), this, SLOT(readClient()));
+            connect(s, &QIODevice::readyRead, this, &HttpDaemon::readClient);
-            connect(s, SIGNAL(disconnected()), this, SLOT(discardClient()));
+            connect(s, &QAbstractSocket::disconnected, this, &HttpDaemon::discardClient);
            s->setSocketDescriptor(socket);
        }
        QList<QString> lastRequestData(void)
@@ -183,8 +183,8 @@ void TestHttpGet::init(void)
    m_port = QString("%1").arg(m_daemon->port()).toLatin1();
    m_cachedir = temporaryFolder();
    m_getter = new HttpGet(this);
-    m_doneSpy = new QSignalSpy(m_getter, SIGNAL(done(bool)));
+    m_doneSpy = new QSignalSpy(m_getter, &HttpGet::done);
-    m_progressSpy = new QSignalSpy(m_getter, SIGNAL(dataReadProgress(int, int)));
+    m_progressSpy = new QSignalSpy(m_getter, &HttpGet::dataReadProgress);
    m_waitTimeoutOccured = false;
 }
@@ -201,7 +201,7 @@ void TestHttpGet::cleanup(void)
 void TestHttpGet::testFileUrlRequest(void)
 {
-    QTimer::singleShot(TEST_HTTP_TIMEOUT, this, SLOT(waitTimeout(void)));
+    QTimer::singleShot(TEST_HTTP_TIMEOUT, this, &TestHttpGet::waitTimeout);
    QString teststring = "The quick brown fox jumps over the lazy dog.";
    QTemporaryFile datafile;
@@ -239,7 +239,7 @@ void TestHttpGet::testUncachedRepeatedRequest(void)
        "<html></html>\r\n\r\n");
    m_daemon->setResponsesToSend(responses);
-    QTimer::singleShot(TEST_HTTP_TIMEOUT, this, SLOT(waitTimeout(void)));
+    QTimer::singleShot(TEST_HTTP_TIMEOUT, this, &TestHttpGet::waitTimeout);
    m_getter->getFile(QUrl("http://localhost:" + m_port + "/test1.txt"));
    while(m_doneSpy->count() == 0 && m_waitTimeoutOccured == false)
@@ -287,7 +287,7 @@ void TestHttpGet::testCachedRequest(void)
        "\r\n");
    m_daemon->setResponsesToSend(responses);
-    QTimer::singleShot(TEST_HTTP_TIMEOUT, this, SLOT(waitTimeout(void)));
+    QTimer::singleShot(TEST_HTTP_TIMEOUT, this, &TestHttpGet::waitTimeout);
    m_getter->setCache(m_cachedir);
    m_getter->getFile(QUrl("http://localhost:" + m_port + "/test1.txt"));
@@ -336,7 +336,7 @@ void TestHttpGet::testUserAgent(void)
        "<html></html>\r\n\r\n");
    m_daemon->setResponsesToSend(responses);
-    QTimer::singleShot(TEST_HTTP_TIMEOUT, this, SLOT(waitTimeout(void)));
+    QTimer::singleShot(TEST_HTTP_TIMEOUT, this, &TestHttpGet::waitTimeout);
    m_getter->setGlobalUserAgent(TEST_USER_AGENT);
    m_getter->setCache(m_cachedir);
@@ -376,7 +376,7 @@ void TestHttpGet::testUncachedMovedRequest(void)
        "<html></html>\r\n\r\n");
    m_daemon->setResponsesToSend(responses);
-    QTimer::singleShot(TEST_HTTP_TIMEOUT, this, SLOT(waitTimeout(void)));
+    QTimer::singleShot(TEST_HTTP_TIMEOUT, this, &TestHttpGet::waitTimeout);
    m_getter->getFile(QUrl("http://localhost:" + m_port + "/test1.php?var=1&b=foo"));
    while(m_doneSpy->count() == 0 && m_waitTimeoutOccured == false)
@@ -391,7 +391,7 @@ void TestHttpGet::testUncachedMovedRequest(void)
 void TestHttpGet::testResponseCode(void)
 {
-    QTimer::singleShot(TEST_HTTP_TIMEOUT, this, SLOT(waitTimeout(void)));
+    QTimer::singleShot(TEST_HTTP_TIMEOUT, this, &TestHttpGet::waitTimeout);
    m_getter->getFile(QUrl("http://localhost:" + m_port + "/test1.txt"));
    while(m_doneSpy->count() == 0 && m_waitTimeoutOccured == false)
@@ -416,7 +416,7 @@ void TestHttpGet::testContentToBuffer(void)
        TEST_BINARY_BLOB);
    m_daemon->setResponsesToSend(responses);
-    QTimer::singleShot(TEST_HTTP_TIMEOUT, this, SLOT(waitTimeout(void)));
+    QTimer::singleShot(TEST_HTTP_TIMEOUT, this, &TestHttpGet::waitTimeout);
    m_getter->getFile(QUrl("http://localhost:" + m_port + "/test1.txt"));
    while(m_doneSpy->count() == 0 && m_waitTimeoutOccured == false)
@@ -443,7 +443,7 @@ void TestHttpGet::testContentToFile(void)
        TEST_BINARY_BLOB);
    m_daemon->setResponsesToSend(responses);
-    QTimer::singleShot(TEST_HTTP_TIMEOUT, this, SLOT(waitTimeout(void)));
+    QTimer::singleShot(TEST_HTTP_TIMEOUT, this, &TestHttpGet::waitTimeout);
    m_getter->setFile(&tf);
    m_getter->getFile(QUrl("http://localhost:" + m_port + "/test1.txt"));
@@ -462,7 +462,7 @@ void TestHttpGet::testContentToFile(void)
 void TestHttpGet::testNoServer(void)
 {
-    QTimer::singleShot(TEST_HTTP_TIMEOUT, this, SLOT(waitTimeout(void)));
+    QTimer::singleShot(TEST_HTTP_TIMEOUT, this, &TestHttpGet::waitTimeout);
    m_getter->getFile(QUrl("http://localhost:53/test1.txt"));
    while(m_doneSpy->count() == 0 && m_waitTimeoutOccured == false)
        QCoreApplication::processEvents();
@@ -494,7 +494,7 @@ void TestHttpGet::testServerTimestamp(void)
    m_daemon->setResponsesToSend(responses);
-    QTimer::singleShot(TEST_HTTP_TIMEOUT, this, SLOT(waitTimeout(void)));
+    QTimer::singleShot(TEST_HTTP_TIMEOUT, this, &TestHttpGet::waitTimeout);
    int count = m_doneSpy->count();
    for(int i = 0; i < responses.size(); ++i) {
@@ -523,7 +523,7 @@ void TestHttpGet::testMovedQuery(void)
        "<html></html>\r\n\r\n");
    m_daemon->setResponsesToSend(responses);
-    QTimer::singleShot(TEST_HTTP_TIMEOUT, this, SLOT(waitTimeout(void)));
+    QTimer::singleShot(TEST_HTTP_TIMEOUT, this, &TestHttpGet::waitTimeout);
    m_getter->getFile(QUrl("http://localhost:" + m_port + "/test1.php?var=1&b=foo"));
    while(m_doneSpy->count() == 0 && m_waitTimeoutOccured == false)

diff --git a/utils/rbutilqt/test/test-httpget.cpp b/utils/rbutilqt/test/test-httpget.cpp index 62aace0352..26945e4e15 100644 --- a/utils/rbutilqt/test/test-httpget.cpp +++ b/utils/rbutilqt/test/test-httpget.cpp
@@ -51,8 +51,8 @@
51	// works asynchronously, this means that all the communication is done	51	// works asynchronously, this means that all the communication is done
52	// in the two slots readClient() and discardClient().	52	// in the two slots readClient() and discardClient().
53	QTcpSocket* s = new QTcpSocket(this);	53	QTcpSocket* s = new QTcpSocket(this);
54	connect(s, SIGNAL(readyRead()), this, SLOT(readClient()));	54	connect(s, &QIODevice::readyRead, this, &HttpDaemon::readClient);
55	connect(s, SIGNAL(disconnected()), this, SLOT(discardClient()));	55	connect(s, &QAbstractSocket::disconnected, this, &HttpDaemon::discardClient);
56	s->setSocketDescriptor(socket);	56	s->setSocketDescriptor(socket);
57	}	57	}
58	QList<QString> lastRequestData(void)	58	QList<QString> lastRequestData(void)
@@ -183,8 +183,8 @@ void TestHttpGet::init(void)
183	m_port = QString("%1").arg(m_daemon->port()).toLatin1();	183	m_port = QString("%1").arg(m_daemon->port()).toLatin1();
184	m_cachedir = temporaryFolder();	184	m_cachedir = temporaryFolder();
185	m_getter = new HttpGet(this);	185	m_getter = new HttpGet(this);
186	m_doneSpy = new QSignalSpy(m_getter, SIGNAL(done(bool)));	186	m_doneSpy = new QSignalSpy(m_getter, &HttpGet::done);
187	m_progressSpy = new QSignalSpy(m_getter, SIGNAL(dataReadProgress(int, int)));	187	m_progressSpy = new QSignalSpy(m_getter, &HttpGet::dataReadProgress);
188	m_waitTimeoutOccured = false;	188	m_waitTimeoutOccured = false;
189	}	189	}
190		190
@@ -201,7 +201,7 @@ void TestHttpGet::cleanup(void)
201		201
202	void TestHttpGet::testFileUrlRequest(void)	202	void TestHttpGet::testFileUrlRequest(void)
203	{	203	{
204	QTimer::singleShot(TEST_HTTP_TIMEOUT, this, SLOT(waitTimeout(void)));	204	QTimer::singleShot(TEST_HTTP_TIMEOUT, this, &TestHttpGet::waitTimeout);
205		205
206	QString teststring = "The quick brown fox jumps over the lazy dog.";	206	QString teststring = "The quick brown fox jumps over the lazy dog.";
207	QTemporaryFile datafile;	207	QTemporaryFile datafile;
@@ -239,7 +239,7 @@ void TestHttpGet::testUncachedRepeatedRequest(void)
239	"<html></html>\r\n\r\n");	239	"<html></html>\r\n\r\n");
240	m_daemon->setResponsesToSend(responses);	240	m_daemon->setResponsesToSend(responses);
241		241
242	QTimer::singleShot(TEST_HTTP_TIMEOUT, this, SLOT(waitTimeout(void)));	242	QTimer::singleShot(TEST_HTTP_TIMEOUT, this, &TestHttpGet::waitTimeout);
243		243
244	m_getter->getFile(QUrl("http://localhost:" + m_port + "/test1.txt"));	244	m_getter->getFile(QUrl("http://localhost:" + m_port + "/test1.txt"));
245	while(m_doneSpy->count() == 0 && m_waitTimeoutOccured == false)	245	while(m_doneSpy->count() == 0 && m_waitTimeoutOccured == false)
@@ -287,7 +287,7 @@ void TestHttpGet::testCachedRequest(void)
287	"\r\n");	287	"\r\n");
288	m_daemon->setResponsesToSend(responses);	288	m_daemon->setResponsesToSend(responses);
289		289
290	QTimer::singleShot(TEST_HTTP_TIMEOUT, this, SLOT(waitTimeout(void)));	290	QTimer::singleShot(TEST_HTTP_TIMEOUT, this, &TestHttpGet::waitTimeout);
291		291
292	m_getter->setCache(m_cachedir);	292	m_getter->setCache(m_cachedir);
293	m_getter->getFile(QUrl("http://localhost:" + m_port + "/test1.txt"));	293	m_getter->getFile(QUrl("http://localhost:" + m_port + "/test1.txt"));
@@ -336,7 +336,7 @@ void TestHttpGet::testUserAgent(void)
336	"<html></html>\r\n\r\n");	336	"<html></html>\r\n\r\n");
337	m_daemon->setResponsesToSend(responses);	337	m_daemon->setResponsesToSend(responses);
338		338
339	QTimer::singleShot(TEST_HTTP_TIMEOUT, this, SLOT(waitTimeout(void)));	339	QTimer::singleShot(TEST_HTTP_TIMEOUT, this, &TestHttpGet::waitTimeout);
340		340
341	m_getter->setGlobalUserAgent(TEST_USER_AGENT);	341	m_getter->setGlobalUserAgent(TEST_USER_AGENT);
342	m_getter->setCache(m_cachedir);	342	m_getter->setCache(m_cachedir);
@@ -376,7 +376,7 @@ void TestHttpGet::testUncachedMovedRequest(void)
376	"<html></html>\r\n\r\n");	376	"<html></html>\r\n\r\n");
377	m_daemon->setResponsesToSend(responses);	377	m_daemon->setResponsesToSend(responses);
378		378
379	QTimer::singleShot(TEST_HTTP_TIMEOUT, this, SLOT(waitTimeout(void)));	379	QTimer::singleShot(TEST_HTTP_TIMEOUT, this, &TestHttpGet::waitTimeout);
380		380
381	m_getter->getFile(QUrl("http://localhost:" + m_port + "/test1.php?var=1&b=foo"));	381	m_getter->getFile(QUrl("http://localhost:" + m_port + "/test1.php?var=1&b=foo"));
382	while(m_doneSpy->count() == 0 && m_waitTimeoutOccured == false)	382	while(m_doneSpy->count() == 0 && m_waitTimeoutOccured == false)
@@ -391,7 +391,7 @@ void TestHttpGet::testUncachedMovedRequest(void)
391		391
392	void TestHttpGet::testResponseCode(void)	392	void TestHttpGet::testResponseCode(void)
393	{	393	{
394	QTimer::singleShot(TEST_HTTP_TIMEOUT, this, SLOT(waitTimeout(void)));	394	QTimer::singleShot(TEST_HTTP_TIMEOUT, this, &TestHttpGet::waitTimeout);
395		395
396	m_getter->getFile(QUrl("http://localhost:" + m_port + "/test1.txt"));	396	m_getter->getFile(QUrl("http://localhost:" + m_port + "/test1.txt"));
397	while(m_doneSpy->count() == 0 && m_waitTimeoutOccured == false)	397	while(m_doneSpy->count() == 0 && m_waitTimeoutOccured == false)
@@ -416,7 +416,7 @@ void TestHttpGet::testContentToBuffer(void)
416	TEST_BINARY_BLOB);	416	TEST_BINARY_BLOB);
417	m_daemon->setResponsesToSend(responses);	417	m_daemon->setResponsesToSend(responses);
418		418
419	QTimer::singleShot(TEST_HTTP_TIMEOUT, this, SLOT(waitTimeout(void)));	419	QTimer::singleShot(TEST_HTTP_TIMEOUT, this, &TestHttpGet::waitTimeout);
420		420
421	m_getter->getFile(QUrl("http://localhost:" + m_port + "/test1.txt"));	421	m_getter->getFile(QUrl("http://localhost:" + m_port + "/test1.txt"));
422	while(m_doneSpy->count() == 0 && m_waitTimeoutOccured == false)	422	while(m_doneSpy->count() == 0 && m_waitTimeoutOccured == false)
@@ -443,7 +443,7 @@ void TestHttpGet::testContentToFile(void)
443	TEST_BINARY_BLOB);	443	TEST_BINARY_BLOB);
444	m_daemon->setResponsesToSend(responses);	444	m_daemon->setResponsesToSend(responses);
445		445
446	QTimer::singleShot(TEST_HTTP_TIMEOUT, this, SLOT(waitTimeout(void)));	446	QTimer::singleShot(TEST_HTTP_TIMEOUT, this, &TestHttpGet::waitTimeout);
447		447
448	m_getter->setFile(&tf);	448	m_getter->setFile(&tf);
449	m_getter->getFile(QUrl("http://localhost:" + m_port + "/test1.txt"));	449	m_getter->getFile(QUrl("http://localhost:" + m_port + "/test1.txt"));
@@ -462,7 +462,7 @@ void TestHttpGet::testContentToFile(void)
462		462
463	void TestHttpGet::testNoServer(void)	463	void TestHttpGet::testNoServer(void)
464	{	464	{
465	QTimer::singleShot(TEST_HTTP_TIMEOUT, this, SLOT(waitTimeout(void)));	465	QTimer::singleShot(TEST_HTTP_TIMEOUT, this, &TestHttpGet::waitTimeout);
466	m_getter->getFile(QUrl("http://localhost:53/test1.txt"));	466	m_getter->getFile(QUrl("http://localhost:53/test1.txt"));
467	while(m_doneSpy->count() == 0 && m_waitTimeoutOccured == false)	467	while(m_doneSpy->count() == 0 && m_waitTimeoutOccured == false)
468	QCoreApplication::processEvents();	468	QCoreApplication::processEvents();
@@ -494,7 +494,7 @@ void TestHttpGet::testServerTimestamp(void)
494		494
495	m_daemon->setResponsesToSend(responses);	495	m_daemon->setResponsesToSend(responses);
496		496
497	QTimer::singleShot(TEST_HTTP_TIMEOUT, this, SLOT(waitTimeout(void)));	497	QTimer::singleShot(TEST_HTTP_TIMEOUT, this, &TestHttpGet::waitTimeout);
498		498
499	int count = m_doneSpy->count();	499	int count = m_doneSpy->count();
500	for(int i = 0; i < responses.size(); ++i) {	500	for(int i = 0; i < responses.size(); ++i) {
@@ -523,7 +523,7 @@ void TestHttpGet::testMovedQuery(void)
523	"<html></html>\r\n\r\n");	523	"<html></html>\r\n\r\n");
524	m_daemon->setResponsesToSend(responses);	524	m_daemon->setResponsesToSend(responses);
525		525
526	QTimer::singleShot(TEST_HTTP_TIMEOUT, this, SLOT(waitTimeout(void)));	526	QTimer::singleShot(TEST_HTTP_TIMEOUT, this, &TestHttpGet::waitTimeout);
527		527
528	m_getter->getFile(QUrl("http://localhost:" + m_port + "/test1.php?var=1&b=foo"));	528	m_getter->getFile(QUrl("http://localhost:" + m_port + "/test1.php?var=1&b=foo"));
529	while(m_doneSpy->count() == 0 && m_waitTimeoutOccured == false)	529	while(m_doneSpy->count() == 0 && m_waitTimeoutOccured == false)