From b11317a64339f5a4bcffc8234ecaf15c7fb416f2 Mon Sep 17 00:00:00 2001 From: Axel Waggershauser Date: Fri, 15 Mar 2013 00:42:15 +0100 Subject: Whitespace cleanup: remove trailing whitespace Remove all trailing whitespace from the following list of files: *.cpp *.h *.conf *.qdoc *.pro *.pri *.mm *.rc *.pl *.qps *.xpm *.txt *README excluding 3rdparty, test-data and auto generated code. Note A): the only non 3rdparty c++-files that still have trailing whitespace after this change are: * src/corelib/codecs/cp949codetbl_p.h * src/corelib/codecs/qjpunicode.cpp * src/corelib/codecs/qbig5codec.cpp * src/corelib/xml/qxmlstream_p.h * src/tools/qdoc/qmlparser/qqmljsgrammar.cpp * src/tools/uic/ui4.cpp * tests/auto/other/qtokenautomaton/tokenizers/* * tests/benchmarks/corelib/tools/qstring/data.cpp * util/lexgen/tokenizer.cpp Note B): in about 30 files some overlapping 'leading tab' and 'TAB character in non-leading whitespace' issues have been fixed to make the sanity bot happy. Plus some general ws-fixes here and there as asked for during review. Change-Id: Ia713113c34d82442d6ce4d93d8b1cf545075d11d Reviewed-by: Oswald Buddenhagen --- src/network/access/qhttpnetworkconnection.cpp | 2 +- src/network/access/qhttpnetworkconnectionchannel_p.h | 2 +- src/network/access/qnetworkaccessdebugpipebackend.cpp | 2 +- src/network/access/qnetworkaccessmanager.cpp | 18 +++++++++--------- 4 files changed, 12 insertions(+), 12 deletions(-) (limited to 'src/network/access') diff --git a/src/network/access/qhttpnetworkconnection.cpp b/src/network/access/qhttpnetworkconnection.cpp index 509f8b3251..a279990f4c 100644 --- a/src/network/access/qhttpnetworkconnection.cpp +++ b/src/network/access/qhttpnetworkconnection.cpp @@ -923,7 +923,7 @@ void QHttpNetworkConnectionPrivate::_q_startNextRequest() fillPipeline(channels[i].socket); // If there is not already any connected channels we need to connect a new one. - // We do not pair the channel with the request until we know if it is + // We do not pair the channel with the request until we know if it is // connected or not. This is to reuse connected channels before we connect new once. int queuedRequest = highPriorityQueue.count() + lowPriorityQueue.count(); for (int i = 0; i < channelCount; ++i) { diff --git a/src/network/access/qhttpnetworkconnectionchannel_p.h b/src/network/access/qhttpnetworkconnectionchannel_p.h index 3577d76df5..c8138b5453 100644 --- a/src/network/access/qhttpnetworkconnectionchannel_p.h +++ b/src/network/access/qhttpnetworkconnectionchannel_p.h @@ -146,7 +146,7 @@ public: QHttpNetworkConnectionChannel(); QAbstractSocket::NetworkLayerProtocol networkLayerPreference; - + void setConnection(QHttpNetworkConnection *c); QPointer connection; diff --git a/src/network/access/qnetworkaccessdebugpipebackend.cpp b/src/network/access/qnetworkaccessdebugpipebackend.cpp index d9d3200564..b6c04dddea 100644 --- a/src/network/access/qnetworkaccessdebugpipebackend.cpp +++ b/src/network/access/qnetworkaccessdebugpipebackend.cpp @@ -143,7 +143,7 @@ void QNetworkAccessDebugPipeBackend::pushFromSocketToDownstream() buffer.resize(ReadBufferSize); qint64 haveRead = socket.read(buffer.data(), ReadBufferSize); - + if (haveRead == -1) { hasDownloadFinished = true; // this ensures a good last downloadProgress is emitted diff --git a/src/network/access/qnetworkaccessmanager.cpp b/src/network/access/qnetworkaccessmanager.cpp index 123b354131..83cb729589 100644 --- a/src/network/access/qnetworkaccessmanager.cpp +++ b/src/network/access/qnetworkaccessmanager.cpp @@ -672,8 +672,8 @@ QNetworkReply *QNetworkAccessManager::head(const QNetworkRequest &request) /*! Posts a request to obtain the contents of the target \a request - and returns a new QNetworkReply object opened for reading which emits the - \l{QIODevice::readyRead()}{readyRead()} signal whenever new data + and returns a new QNetworkReply object opened for reading which emits the + \l{QIODevice::readyRead()}{readyRead()} signal whenever new data arrives. The contents as well as associated headers will be downloaded. @@ -687,11 +687,11 @@ QNetworkReply *QNetworkAccessManager::get(const QNetworkRequest &request) /*! Sends an HTTP POST request to the destination specified by \a request - and returns a new QNetworkReply object opened for reading that will - contain the reply sent by the server. The contents of the \a data + and returns a new QNetworkReply object opened for reading that will + contain the reply sent by the server. The contents of the \a data device will be uploaded to the server. - \a data must be open for reading and must remain valid until the + \a data must be open for reading and must remain valid until the finished() signal is emitted for this reply. \note Sending a POST request on protocols other than HTTP and @@ -707,7 +707,7 @@ QNetworkReply *QNetworkAccessManager::post(const QNetworkRequest &request, QIODe /*! \overload - Sends the contents of the \a data byte array to the destination + Sends the contents of the \a data byte array to the destination specified by \a request. */ QNetworkReply *QNetworkAccessManager::post(const QNetworkRequest &request, const QByteArray &data) @@ -770,8 +770,8 @@ QNetworkReply *QNetworkAccessManager::put(const QNetworkRequest &request, QHttpM this reply. Whether anything will be available for reading from the returned - object is protocol dependent. For HTTP, the server may send a - small HTML page indicating the upload was successful (or not). + object is protocol dependent. For HTTP, the server may send a + small HTML page indicating the upload was successful (or not). Other protocols will probably have content in their replies. \note For HTTP, this request will send a PUT request, which most servers @@ -807,7 +807,7 @@ QNetworkReply *QNetworkAccessManager::put(const QNetworkRequest &request, const Sends a request to delete the resource identified by the URL of \a request. - \note This feature is currently available for HTTP only, performing an + \note This feature is currently available for HTTP only, performing an HTTP DELETE request. \sa get(), post(), put(), sendCustomRequest() -- cgit v1.2.3