diff options
author | Alex Trotsenko <alex1973tr@gmail.com> | 2015-04-03 18:26:04 +0300 |
---|---|---|
committer | Alex Trotsenko <alex1973tr@gmail.com> | 2015-04-07 06:42:42 +0000 |
commit | add3c14a28c80f6807164d689b921efcbaeff5bc (patch) | |
tree | afa66987f7117da69a54e151ade728bd809dd3b5 | |
parent | 0b6bfe8c448179ccf9272a309d6b9ddbdc055960 (diff) |
QAbstractSocket: fix some 64-bit issues in debug code
Change-Id: I78b307b2841353f84b033a815035436ec3eef3b0
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
-rw-r--r-- | src/network/socket/qabstractsocket.cpp | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/src/network/socket/qabstractsocket.cpp b/src/network/socket/qabstractsocket.cpp index 18dbed5a16..f5dcdcba1c 100644 --- a/src/network/socket/qabstractsocket.cpp +++ b/src/network/socket/qabstractsocket.cpp @@ -1265,8 +1265,8 @@ bool QAbstractSocketPrivate::readFromSocket() bytesToRead = readBufferMaxSize - buffer.size(); #if defined(QABSTRACTSOCKET_DEBUG) - qDebug("QAbstractSocketPrivate::readFromSocket() about to read %d bytes", - int(bytesToRead)); + qDebug("QAbstractSocketPrivate::readFromSocket() about to read %lld bytes", + bytesToRead); #endif // Read from the socket, store data in the read buffer. @@ -1277,10 +1277,10 @@ bool QAbstractSocketPrivate::readFromSocket() buffer.chop(bytesToRead); return true; } - buffer.chop(int(bytesToRead - (readBytes < 0 ? qint64(0) : readBytes))); + buffer.chop(bytesToRead - (readBytes < 0 ? qint64(0) : readBytes)); #if defined(QABSTRACTSOCKET_DEBUG) - qDebug("QAbstractSocketPrivate::readFromSocket() got %d bytes, buffer size = %d", - int(readBytes), buffer.size()); + qDebug("QAbstractSocketPrivate::readFromSocket() got %lld bytes, buffer size = %lld", + readBytes, buffer.size()); #endif if (!socketEngine->isValid()) { @@ -1726,7 +1726,7 @@ qint64 QAbstractSocket::bytesAvailable() const available += d->socketEngine->bytesAvailable(); #if defined(QABSTRACTSOCKET_DEBUG) - qDebug("QAbstractSocket::bytesAvailable() == %llu", available); + qDebug("QAbstractSocket::bytesAvailable() == %lld", available); #endif return available; } @@ -1805,8 +1805,8 @@ bool QAbstractSocket::canReadLine() const { bool hasLine = d_func()->buffer.canReadLine(); #if defined (QABSTRACTSOCKET_DEBUG) - qDebug("QAbstractSocket::canReadLine() == %s, buffer size = %d, size = %d", hasLine ? "true" : "false", - d_func()->buffer.size(), d_func()->buffer.size()); + qDebug("QAbstractSocket::canReadLine() == %s, buffer size = %lld, size = %lld", + hasLine ? "true" : "false", d_func()->buffer.size(), d_func()->buffer.size()); #endif return hasLine || QIODevice::canReadLine(); } |