From bdce61002255b5f8b3213e93175cefdfebfde2cc Mon Sep 17 00:00:00 2001 From: "Jonas M. Gastal" Date: Wed, 11 Jan 2012 13:06:14 -0200 Subject: Fixes examples/tests to use qinptr in QTcpServer::incomingConnection. This is a fix for problems introduced by bf7f170. Change-Id: If5dd8e031ef2efea578b3efb188c2e950e1ba41a Reviewed-by: Peter Hartmann Reviewed-by: Bradley T. Hughes --- tests/auto/network/access/qnetworkreply/tst_qnetworkreply.cpp | 6 +++--- tests/auto/network/socket/qtcpsocket/stressTest/Test.cpp | 2 +- tests/auto/network/socket/qtcpsocket/stressTest/Test.h | 2 +- tests/auto/network/ssl/qsslsocket/tst_qsslsocket.cpp | 8 ++++---- tests/baselineserver/src/baselineserver.cpp | 2 +- tests/baselineserver/src/baselineserver.h | 2 +- 6 files changed, 11 insertions(+), 11 deletions(-) (limited to 'tests') diff --git a/tests/auto/network/access/qnetworkreply/tst_qnetworkreply.cpp b/tests/auto/network/access/qnetworkreply/tst_qnetworkreply.cpp index a20a5763a3..6fae97dc6d 100644 --- a/tests/auto/network/access/qnetworkreply/tst_qnetworkreply.cpp +++ b/tests/auto/network/access/qnetworkreply/tst_qnetworkreply.cpp @@ -485,7 +485,7 @@ public: } protected: - void incomingConnection(int socketDescriptor) + void incomingConnection(qintptr socketDescriptor) { //qDebug() << "incomingConnection" << socketDescriptor << "doSsl:" << doSsl << "ipv6:" << ipv6; if (!doSsl) { @@ -807,7 +807,7 @@ public: return nextPendingConnection(); } } - virtual void incomingConnection(int socketDescriptor) + virtual void incomingConnection(qintptr socketDescriptor) { #ifndef QT_NO_OPENSSL if (doSsl) { @@ -4277,7 +4277,7 @@ class SslServer : public QTcpServer { Q_OBJECT public: SslServer() : socket(0) {}; - void incomingConnection(int socketDescriptor) { + void incomingConnection(qintptr socketDescriptor) { QSslSocket *serverSocket = new QSslSocket; serverSocket->setParent(this); diff --git a/tests/auto/network/socket/qtcpsocket/stressTest/Test.cpp b/tests/auto/network/socket/qtcpsocket/stressTest/Test.cpp index e17a167512..a112966b41 100644 --- a/tests/auto/network/socket/qtcpsocket/stressTest/Test.cpp +++ b/tests/auto/network/socket/qtcpsocket/stressTest/Test.cpp @@ -107,7 +107,7 @@ My4Server::My4Server(QObject *parent) } //------------------------------------------------------------------------------ -void My4Server::incomingConnection(int socketId) +void My4Server::incomingConnection(qintptr socketId) { m_socket = new My4Socket(this); m_socket->setSocketDescriptor(socketId); diff --git a/tests/auto/network/socket/qtcpsocket/stressTest/Test.h b/tests/auto/network/socket/qtcpsocket/stressTest/Test.h index c619454a3a..3adcbe4e5c 100644 --- a/tests/auto/network/socket/qtcpsocket/stressTest/Test.h +++ b/tests/auto/network/socket/qtcpsocket/stressTest/Test.h @@ -69,7 +69,7 @@ public: My4Server(QObject *parent = 0); protected: - void incomingConnection(int socket); + void incomingConnection(qintptr socket); private slots: void stopServer(); diff --git a/tests/auto/network/ssl/qsslsocket/tst_qsslsocket.cpp b/tests/auto/network/ssl/qsslsocket/tst_qsslsocket.cpp index 73d3754078..c2c234f608 100644 --- a/tests/auto/network/ssl/qsslsocket/tst_qsslsocket.cpp +++ b/tests/auto/network/ssl/qsslsocket/tst_qsslsocket.cpp @@ -912,7 +912,7 @@ public: QString m_certFile; protected: - void incomingConnection(int socketDescriptor) + void incomingConnection(qintptr socketDescriptor) { socket = new QSslSocket(this); socket->setProtocol(protocol); @@ -1332,7 +1332,7 @@ void tst_QSslSocket::wildcard() class SslServer2 : public QTcpServer { protected: - void incomingConnection(int socketDescriptor) + void incomingConnection(qintptr socketDescriptor) { QSslSocket *socket = new QSslSocket(this); socket->ignoreSslErrors(); @@ -1558,7 +1558,7 @@ public: QSslSocket *socket; protected: - void incomingConnection(int socketDescriptor) + void incomingConnection(qintptr socketDescriptor) { socket = new QSslSocket(this); connect(socket, SIGNAL(sslErrors(const QList &)), this, SLOT(ignoreErrorSlot())); @@ -1730,7 +1730,7 @@ public: QSslSocket *socket; protected: - void incomingConnection(int socketDescriptor) + void incomingConnection(qintptr socketDescriptor) { socket = new QSslSocket(this); diff --git a/tests/baselineserver/src/baselineserver.cpp b/tests/baselineserver/src/baselineserver.cpp index 533ed5d9d9..7adc335fb2 100644 --- a/tests/baselineserver/src/baselineserver.cpp +++ b/tests/baselineserver/src/baselineserver.cpp @@ -101,7 +101,7 @@ QString BaselineServer::settingsFilePath() return settingsFile; } -void BaselineServer::incomingConnection(int socketDescriptor) +void BaselineServer::incomingConnection(qintptr socketDescriptor) { QString runId = QDateTime::currentDateTime().toString(QLS("MMMdd-hhmmss")); if (runId == lastRunId) { diff --git a/tests/baselineserver/src/baselineserver.h b/tests/baselineserver/src/baselineserver.h index b9b08b29b4..a6065cc099 100644 --- a/tests/baselineserver/src/baselineserver.h +++ b/tests/baselineserver/src/baselineserver.h @@ -69,7 +69,7 @@ public: static QString settingsFilePath(); protected: - void incomingConnection(int socketDescriptor); + void incomingConnection(qintptr socketDescriptor); private slots: void heartbeat(); -- cgit v1.2.3