Make socket descriptors qintptr.

Windows x64 uses 64 bits integer for sockets, to ensure compatibility we
should use ptr sized integers for our socket descriptors.

Task-number: QTBUG-19004
Change-Id: I4b56023874a4f1bad107c66c054fecfedde33d88
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>

5 files changed, 14 insertions, 14 deletions

diff --git a/tests/auto/network/socket/qlocalsocket/tst_qlocalsocket.cpp b/tests/auto/network/socket/qlocalsocket/tst_qlocalsocket.cpp
index c7dcd1a646..87cfaeed6c 100644
--- a/tests/auto/network/socket/qlocalsocket/tst_qlocalsocket.cpp
+++ b/tests/auto/network/socket/qlocalsocket/tst_qlocalsocket.cpp
@@ -264,7 +264,7 @@ void tst_QLocalSocket::socket_basic()
     QCOMPARE(socket.isValid(), false);
     QVERIFY(socket.readBufferSize() == 0);
     socket.setReadBufferSize(0);
-    //QCOMPARE(socket.socketDescriptor(), -1);
+    //QCOMPARE(socket.socketDescriptor(), (qintptr)-1);
     QCOMPARE(socket.state(), QLocalSocket::UnconnectedState);
     QCOMPARE(socket.waitForConnected(0), false);
     QCOMPARE(socket.waitForDisconnected(0), false);
@@ -632,7 +632,7 @@ void tst_QLocalSocket::hitMaximumConnections()
 void tst_QLocalSocket::setSocketDescriptor()
 {
     LocalSocket socket;
-    quintptr minusOne = -1;
+    qintptr minusOne = -1;
     socket.setSocketDescriptor(minusOne, QLocalSocket::ConnectingState, QIODevice::Append);
     QCOMPARE(socket.socketDescriptor(), minusOne);
     QCOMPARE(socket.state(), QLocalSocket::ConnectingState);
diff --git a/tests/auto/network/socket/qtcpserver/tst_qtcpserver.cpp b/tests/auto/network/socket/qtcpserver/tst_qtcpserver.cpp
index 265b0658f4..0f4e60e258 100644
--- a/tests/auto/network/socket/qtcpserver/tst_qtcpserver.cpp
+++ b/tests/auto/network/socket/qtcpserver/tst_qtcpserver.cpp
@@ -191,7 +191,7 @@ void tst_QTcpServer::constructing()
     QCOMPARE(socket.serverAddress(), QHostAddress());
     QCOMPARE(socket.maxPendingConnections(), 30);
     QCOMPARE(socket.hasPendingConnections(), false);
-    QCOMPARE(socket.socketDescriptor(), -1);
+    QCOMPARE(socket.socketDescriptor(), (qintptr)-1);
     QCOMPARE(socket.serverError(), QAbstractSocket::UnknownSocketError);
 
     // Check the state of the socket layer?
@@ -510,7 +510,7 @@ public:
     bool ok;
 
 protected:
-    void incomingConnection(int socketDescriptor)
+    void incomingConnection(qintptr socketDescriptor)
     {
         // how a user woulddo it (qabstractsocketengine is not public)
         unsigned long arg = 0;
diff --git a/tests/auto/network/socket/qtcpsocket/tst_qtcpsocket.cpp b/tests/auto/network/socket/qtcpsocket/tst_qtcpsocket.cpp
index 457fae1a1b..9fbc99eec0 100644
--- a/tests/auto/network/socket/qtcpsocket/tst_qtcpsocket.cpp
+++ b/tests/auto/network/socket/qtcpsocket/tst_qtcpsocket.cpp
@@ -458,7 +458,7 @@ void tst_QTcpSocket::constructing()
     QCOMPARE((int) socket->bytesAvailable(), 0);
     QCOMPARE(socket->canReadLine(), false);
     QCOMPARE(socket->readLine(), QByteArray());
-    QCOMPARE(socket->socketDescriptor(), -1);
+    QCOMPARE(socket->socketDescriptor(), (qintptr)-1);
     QCOMPARE((int) socket->localPort(), 0);
     QVERIFY(socket->localAddress() == QHostAddress());
     QCOMPARE((int) socket->peerPort(), 0);
@@ -538,9 +538,9 @@ void tst_QTcpSocket::bind()
 void tst_QTcpSocket::setInvalidSocketDescriptor()
 {
     QTcpSocket *socket = newSocket();
-    QCOMPARE(socket->socketDescriptor(), -1);
+    QCOMPARE(socket->socketDescriptor(), (qintptr)-1);
     QVERIFY(!socket->setSocketDescriptor(-5, QTcpSocket::UnconnectedState));
-    QCOMPARE(socket->socketDescriptor(), -1);
+    QCOMPARE(socket->socketDescriptor(), (qintptr)-1);
 
     QCOMPARE(socket->error(), QTcpSocket::UnsupportedSocketOperationError);
 
@@ -577,17 +577,17 @@ void tst_QTcpSocket::setSocketDescriptor()
     QVERIFY(sock != INVALID_SOCKET);
     QTcpSocket *socket = newSocket();
     QVERIFY(socket->setSocketDescriptor(sock, QTcpSocket::UnconnectedState));
-    QCOMPARE(socket->socketDescriptor(), (int)sock);
+    QCOMPARE(socket->socketDescriptor(), (qintptr)sock);
 
     qt_qhostinfo_clear_cache(); //avoid the HostLookupState being skipped due to address being in cache from previous test.
     socket->connectToHost(QtNetworkSettings::serverName(), 143);
     QCOMPARE(socket->state(), QTcpSocket::HostLookupState);
-    QCOMPARE(socket->socketDescriptor(), (int)sock);
+    QCOMPARE(socket->socketDescriptor(), (qintptr)sock);
     QVERIFY(socket->waitForConnected(10000));
     // skip this, it has been broken for years, see task 260735
     // if somebody complains, consider fixing it, but it might break existing applications.
     QEXPECT_FAIL("", "bug has been around for years, will not fix without need", Continue);
-    QCOMPARE(socket->socketDescriptor(), (int)sock);
+    QCOMPARE(socket->socketDescriptor(), (qintptr)sock);
     delete socket;
 #ifdef Q_OS_WIN
     delete dummy;
@@ -600,7 +600,7 @@ void tst_QTcpSocket::socketDescriptor()
 {
     QTcpSocket *socket = newSocket();
 
-    QCOMPARE(socket->socketDescriptor(), -1);
+    QCOMPARE(socket->socketDescriptor(), (qintptr)-1);
     socket->connectToHost(QtNetworkSettings::serverName(), 143);
     QVERIFY((socket->state() == QAbstractSocket::HostLookupState && socket->socketDescriptor() == -1) ||
             (socket->state() == QAbstractSocket::ConnectingState && socket->socketDescriptor() != -1));
@@ -1025,7 +1025,7 @@ void tst_QTcpSocket::openCloseOpenClose()
         QCOMPARE((int) socket->bytesAvailable(), 0);
         QCOMPARE(socket->canReadLine(), false);
         QCOMPARE(socket->readLine(), QByteArray());
-        QCOMPARE(socket->socketDescriptor(), -1);
+        QCOMPARE(socket->socketDescriptor(), (qintptr)-1);
         QCOMPARE((int) socket->localPort(), 0);
         QVERIFY(socket->localAddress() == QHostAddress());
         QCOMPARE((int) socket->peerPort(), 0);
diff --git a/tests/auto/network/socket/qudpsocket/tst_qudpsocket.cpp b/tests/auto/network/socket/qudpsocket/tst_qudpsocket.cpp
index cbcbe042ff..b51e24b9a5 100644
--- a/tests/auto/network/socket/qudpsocket/tst_qudpsocket.cpp
+++ b/tests/auto/network/socket/qudpsocket/tst_qudpsocket.cpp
@@ -195,7 +195,7 @@ void tst_QUdpSocket::constructing()
     QCOMPARE((int) socket.bytesAvailable(), 0);
     QCOMPARE(socket.canReadLine(), false);
     QCOMPARE(socket.readLine(), QByteArray());
-    QCOMPARE(socket.socketDescriptor(), -1);
+    QCOMPARE(socket.socketDescriptor(), (qintptr)-1);
     QCOMPARE(socket.error(), QUdpSocket::UnknownSocketError);
     QCOMPARE(socket.errorString(), QString("Unknown error"));
 
diff --git a/tests/auto/network/ssl/qsslsocket/tst_qsslsocket.cpp b/tests/auto/network/ssl/qsslsocket/tst_qsslsocket.cpp
index f5a4f535d6..b6ec5d2610 100644
--- a/tests/auto/network/ssl/qsslsocket/tst_qsslsocket.cpp
+++ b/tests/auto/network/ssl/qsslsocket/tst_qsslsocket.cpp
@@ -396,7 +396,7 @@ void tst_QSslSocket::constructing()
     QCOMPARE(socket.peerPort(), quint16(0));
     QCOMPARE(socket.proxy().type(), QNetworkProxy::DefaultProxy);
     QCOMPARE(socket.readBufferSize(), qint64(0));
-    QCOMPARE(socket.socketDescriptor(), -1);
+    QCOMPARE(socket.socketDescriptor(), (qintptr)-1);
     QCOMPARE(socket.socketType(), QAbstractSocket::TcpSocket);
     QVERIFY(!socket.waitForConnected(10));
     QTest::ignoreMessage(QtWarningMsg, "QSslSocket::waitForDisconnected() is not allowed in UnconnectedState");