summaryrefslogtreecommitdiffstats
path: root/src/network/access
diff options
context:
space:
mode:
authorMarkus Goetz <Markus.Goetz@nokia.com>2011-04-14 10:27:07 +0200
committerMarkus Goetz <Markus.Goetz@nokia.com>2011-05-03 16:47:11 +0200
commit8e9aa019bb2183d0a8f56c3fdbaf829f0a4efff6 (patch)
treea7648812ef75a331010f0b07cb0575e388e5267d /src/network/access
parent100b7565aafbd6d264e906eba77509891e607831 (diff)
QNAM HTTP: Removes some comments
Diffstat (limited to 'src/network/access')
-rw-r--r--src/network/access/qnetworkreplyhttpimpl.cpp21
1 files changed, 4 insertions, 17 deletions
diff --git a/src/network/access/qnetworkreplyhttpimpl.cpp b/src/network/access/qnetworkreplyhttpimpl.cpp
index 122c213f63..4b5d310cf0 100644
--- a/src/network/access/qnetworkreplyhttpimpl.cpp
+++ b/src/network/access/qnetworkreplyhttpimpl.cpp
@@ -439,7 +439,7 @@ QNetworkReplyHttpImplPrivate::QNetworkReplyHttpImplPrivate()
, pendingDownloadDataEmissions(new QAtomicInt())
, pendingDownloadProgressEmissions(new QAtomicInt())
#ifndef QT_NO_OPENSSL
- , pendingIgnoreAllSslErrors(false)
+ , pendingIgnoreAllSslErrors(false)
#endif
{
@@ -605,7 +605,6 @@ void QNetworkReplyHttpImplPrivate::postRequest()
QThread *thread = 0;
if (synchronous) {
// A synchronous HTTP request uses its own thread
- qDebug() << "sync!";
thread = new QThread();
QObject::connect(thread, SIGNAL(finished()), thread, SLOT(deleteLater()));
thread->start();
@@ -949,8 +948,6 @@ void QNetworkReplyHttpImplPrivate::replyDownloadData(QByteArray d)
{
Q_Q(QNetworkReplyHttpImpl);
- qDebug() << "QNetworkReplyHttpImplPrivate::replyDownloadData" << d.size();
-
// If we're closed just ignore this data
if (!q->isOpen())
return;
@@ -975,10 +972,6 @@ void QNetworkReplyHttpImplPrivate::replyDownloadData(QByteArray d)
QByteDataBuffer pendingDownloadDataCopy = pendingDownloadData;
pendingDownloadData.clear();
- // FIXME
- //writeDownstreamData(pendingDownloadDataCopy);
- // instead we do:
-
if (cacheEnabled && !cacheSaveDevice) {
initCacheSaveDevice();
}
@@ -998,23 +991,17 @@ void QNetworkReplyHttpImplPrivate::replyDownloadData(QByteArray d)
bytesDownloaded += bytesWritten;
lastBytesDownloaded = bytesDownloaded;
- //appendDownstreamDataSignalEmissions();
- // instead:
+
QVariant totalSize = cookedHeaders.value(QNetworkRequest::ContentLengthHeader);
if (preMigrationDownloaded != Q_INT64_C(-1))
totalSize = totalSize.toLongLong() + preMigrationDownloaded;
-// pauseNotificationHandling();
- // important: At the point of this readyRead(), the data parameter list must be empty,
- // else implicit sharing will trigger memcpy when the user is reading data!
+
emit q->readyRead();
// emit readyRead before downloadProgress incase this will cause events to be
// processed and we get into a recursive call (as in QProgressDialog).
emit q->downloadProgress(bytesDownloaded,
totalSize.isNull() ? Q_INT64_C(-1) : totalSize.toLongLong());
-// resumeNotificationHandling();
-
-
}
void QNetworkReplyHttpImplPrivate::replyFinished()
@@ -1042,6 +1029,7 @@ void QNetworkReplyHttpImplPrivate::checkForRedirect(const int statusCode)
QUrl url = QUrl::fromEncoded(header);
if (!url.isValid())
url = QUrl(QLatin1String(header));
+ // FIXME?
//redirectionRequested(url);
q->setAttribute(QNetworkRequest::RedirectionTargetAttribute, url);
}
@@ -1053,7 +1041,6 @@ void QNetworkReplyHttpImplPrivate::replyDownloadMetaData
QSharedPointer<char> db,
qint64 contentLength)
{
- qDebug() << "QNetworkReplyHttpImplPrivate::replyDownloadMetaData" << contentLength << sc;
Q_Q(QNetworkReplyHttpImpl);
statusCode = sc;