diff options
author | Markus Goetz <Markus.Goetz@nokia.com> | 2009-08-27 13:43:17 (GMT) |
---|---|---|
committer | Markus Goetz <Markus.Goetz@nokia.com> | 2009-08-27 13:45:21 (GMT) |
commit | 2e21223f7ebef714191dedfe2c5ea31ee033f226 (patch) | |
tree | e1ad1d00f7aa4c08d21d0aedc379af75db31f692 /src/network/access/qhttpnetworkconnection.cpp | |
parent | 99823eb61a873c5ef0f6a3e1c213fb0d197c6de7 (diff) | |
download | Qt-2e21223f7ebef714191dedfe2c5ea31ee033f226.zip Qt-2e21223f7ebef714191dedfe2c5ea31ee033f226.tar.gz Qt-2e21223f7ebef714191dedfe2c5ea31ee033f226.tar.bz2 |
QNAM HTTP Code: Moved isSocket* functions to channel object
Cleaner code.
Reviewed-by: TrustMe
Diffstat (limited to 'src/network/access/qhttpnetworkconnection.cpp')
-rw-r--r-- | src/network/access/qhttpnetworkconnection.cpp | 26 |
1 files changed, 1 insertions, 25 deletions
diff --git a/src/network/access/qhttpnetworkconnection.cpp b/src/network/access/qhttpnetworkconnection.cpp index 6ef124f..b51c0bb 100644 --- a/src/network/access/qhttpnetworkconnection.cpp +++ b/src/network/access/qhttpnetworkconnection.cpp @@ -129,30 +129,6 @@ int QHttpNetworkConnectionPrivate::indexOf(QAbstractSocket *socket) const return 0; } -bool QHttpNetworkConnectionPrivate::isSocketBusy(QAbstractSocket *socket) const -{ - int i = indexOf(socket); - return (channels[i].state & QHttpNetworkConnectionChannel::BusyState); -} - -bool QHttpNetworkConnectionPrivate::isSocketWriting(QAbstractSocket *socket) const -{ - int i = indexOf(socket); - return (i != -1 && (channels[i].state & QHttpNetworkConnectionChannel::WritingState)); -} - -bool QHttpNetworkConnectionPrivate::isSocketWaiting(QAbstractSocket *socket) const -{ - int i = indexOf(socket); - return (i != -1 && (channels[i].state & QHttpNetworkConnectionChannel::WaitingState)); -} - -bool QHttpNetworkConnectionPrivate::isSocketReading(QAbstractSocket *socket) const -{ - int i = indexOf(socket); - return (i != -1 && (channels[i].state & QHttpNetworkConnectionChannel::ReadingState)); -} - qint64 QHttpNetworkConnectionPrivate::uncompressedBytesAvailable(const QHttpNetworkReply &reply) const { return reply.d_func()->responseData.byteAmount(); @@ -674,7 +650,7 @@ void QHttpNetworkConnectionPrivate::_q_startNextRequest() for (int i = 0; i < channelCount; ++i) { QAbstractSocket *chSocket = channels[i].socket; // send the request using the idle socket - if (!isSocketBusy(chSocket)) { + if (!channels[i].isSocketBusy()) { socket = chSocket; break; } |