diff options
| author | Joerg Bornemann <joerg.bornemann@nokia.com> | 2012-01-09 12:33:17 +0100 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-01-10 01:25:02 +0100 |
| commit | b03fa845a72ce0f4e0785c6ebeb430ded970426b (patch) | |
| tree | 6beb65723b8061e9e6909d6a78a85c895e538a53 /src/network/socket/qlocalsocket_win.cpp | |
| parent | 4c66ab91a95495b4f5cddb04380482ae75dd5904 (diff) | |
QLocalSocket: make socket descriptor qintptr
This is consistent with the other socket classes.
Also see commit bf7f17060773803f332e8c729a70f47b94243890.
Change-Id: Ic4bf01bd4abf778e21fe575c5304f86c9bee82fc
Reviewed-by: Jonas Gastal <jgastal@profusion.mobi>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
Diffstat (limited to 'src/network/socket/qlocalsocket_win.cpp')
| -rw-r--r-- | src/network/socket/qlocalsocket_win.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/network/socket/qlocalsocket_win.cpp b/src/network/socket/qlocalsocket_win.cpp index cb417990b1..3634eed4f3 100644 --- a/src/network/socket/qlocalsocket_win.cpp +++ b/src/network/socket/qlocalsocket_win.cpp @@ -189,7 +189,7 @@ void QLocalSocket::connectToServer(const QString &name, OpenMode openMode) // we have a valid handle d->serverName = name; - if (setSocketDescriptor((quintptr)localSocket, ConnectedState, openMode)) { + if (setSocketDescriptor((qintptr)localSocket, ConnectedState, openMode)) { d->handle = localSocket; emit connected(); } @@ -327,7 +327,7 @@ QLocalSocket::LocalSocketError QLocalSocket::error() const return d->error; } -bool QLocalSocket::setSocketDescriptor(quintptr socketDescriptor, +bool QLocalSocket::setSocketDescriptor(qintptr socketDescriptor, LocalSocketState socketState, OpenMode openMode) { Q_D(QLocalSocket); @@ -349,10 +349,10 @@ void QLocalSocketPrivate::_q_canWrite() q->close(); } -quintptr QLocalSocket::socketDescriptor() const +qintptr QLocalSocket::socketDescriptor() const { Q_D(const QLocalSocket); - return (quintptr)d->handle; + return (qintptr)d->handle; } qint64 QLocalSocket::readBufferSize() const |