summaryrefslogtreecommitdiffstats
path: root/src/network/socket/qhttpsocketengine_p.h
diff options
context:
space:
mode:
authorJonas M. Gastal <jgastal@profusion.mobi>2012-01-05 10:38:39 -0200
committerQt by Nokia <qt-info@nokia.com>2012-01-05 15:07:51 +0100
commitbf7f17060773803f332e8c729a70f47b94243890 (patch)
treee4c6f80001859748372f19b647ed77dc348e2564 /src/network/socket/qhttpsocketengine_p.h
parenteb0ce0d5c123c010c978c96683cfd6b651540b07 (diff)
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>
Diffstat (limited to 'src/network/socket/qhttpsocketengine_p.h')
-rw-r--r--src/network/socket/qhttpsocketengine_p.h6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/network/socket/qhttpsocketengine_p.h b/src/network/socket/qhttpsocketengine_p.h
index a8484b8920..1a93956bd2 100644
--- a/src/network/socket/qhttpsocketengine_p.h
+++ b/src/network/socket/qhttpsocketengine_p.h
@@ -80,11 +80,11 @@ public:
~QHttpSocketEngine();
bool initialize(QAbstractSocket::SocketType type, QAbstractSocket::NetworkLayerProtocol protocol = QAbstractSocket::IPv4Protocol);
- bool initialize(int socketDescriptor, QAbstractSocket::SocketState socketState = QAbstractSocket::ConnectedState);
+ bool initialize(qintptr socketDescriptor, QAbstractSocket::SocketState socketState = QAbstractSocket::ConnectedState);
void setProxy(const QNetworkProxy &networkProxy);
- int socketDescriptor() const;
+ qintptr socketDescriptor() const;
bool isValid() const;
@@ -191,7 +191,7 @@ class Q_AUTOTEST_EXPORT QHttpSocketEngineHandler : public QSocketEngineHandler
public:
virtual QAbstractSocketEngine *createSocketEngine(QAbstractSocket::SocketType socketType,
const QNetworkProxy &, QObject *parent);
- virtual QAbstractSocketEngine *createSocketEngine(int socketDescripter, QObject *parent);
+ virtual QAbstractSocketEngine *createSocketEngine(qintptr socketDescripter, QObject *parent);
};
#endif