From bf7f17060773803f332e8c729a70f47b94243890 Mon Sep 17 00:00:00 2001 From: "Jonas M. Gastal" Date: Thu, 5 Jan 2012 10:38:39 -0200 Subject: 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 Reviewed-by: Oswald Buddenhagen --- src/network/socket/qtcpserver.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'src/network/socket/qtcpserver.h') diff --git a/src/network/socket/qtcpserver.h b/src/network/socket/qtcpserver.h index 4900ba89fe..a322294f58 100644 --- a/src/network/socket/qtcpserver.h +++ b/src/network/socket/qtcpserver.h @@ -76,8 +76,8 @@ public: quint16 serverPort() const; QHostAddress serverAddress() const; - int socketDescriptor() const; - bool setSocketDescriptor(int socketDescriptor); + qintptr socketDescriptor() const; + bool setSocketDescriptor(qintptr socketDescriptor); bool waitForNewConnection(int msec = 0, bool *timedOut = 0); virtual bool hasPendingConnections() const; @@ -92,7 +92,7 @@ public: #endif protected: - virtual void incomingConnection(int handle); + virtual void incomingConnection(qintptr handle); void addPendingConnection(QTcpSocket* socket); Q_SIGNALS: -- cgit v1.2.3