1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

QNAM HTTP: Removes some comments

Browse Source
This commit is contained in:
Markus Goetz 2011-04-14 10:27:07 +02:00
parent 100b7565aa
commit 8e9aa019bb
1 changed files with 4 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
src/network/access/qnetworkreplyhttpimpl.cpp
View File

@ -439,7 +439,7 @@ QNetworkReplyHttpImplPrivate::QNetworkReplyHttpImplPrivate()
, pendingDownloadDataEmissions(new QAtomicInt()) , pendingDownloadDataEmissions(new QAtomicInt())
, pendingDownloadProgressEmissions(new QAtomicInt()) , pendingDownloadProgressEmissions(new QAtomicInt())
#ifndef QT_NO_OPENSSL #ifndef QT_NO_OPENSSL
, pendingIgnoreAllSslErrors(false) , pendingIgnoreAllSslErrors(false)
#endif #endif
{ {
@ -605,7 +605,6 @@ void QNetworkReplyHttpImplPrivate::postRequest()
QThread *thread = 0; QThread *thread = 0;
if (synchronous) { if (synchronous) {
// A synchronous HTTP request uses its own thread // A synchronous HTTP request uses its own thread
qDebug() << "sync!";
thread = new QThread(); thread = new QThread();
QObject::connect(thread, SIGNAL(finished()), thread, SLOT(deleteLater())); QObject::connect(thread, SIGNAL(finished()), thread, SLOT(deleteLater()));
thread->start(); thread->start();
@ -949,8 +948,6 @@ void QNetworkReplyHttpImplPrivate::replyDownloadData(QByteArray d)
{ {
Q_Q(QNetworkReplyHttpImpl); Q_Q(QNetworkReplyHttpImpl);
qDebug() << "QNetworkReplyHttpImplPrivate::replyDownloadData" << d.size();
// If we're closed just ignore this data // If we're closed just ignore this data
if (!q->isOpen()) if (!q->isOpen())
return; return;
@ -975,10 +972,6 @@ void QNetworkReplyHttpImplPrivate::replyDownloadData(QByteArray d)
QByteDataBuffer pendingDownloadDataCopy = pendingDownloadData; QByteDataBuffer pendingDownloadDataCopy = pendingDownloadData;
pendingDownloadData.clear(); pendingDownloadData.clear();
// FIXME
//writeDownstreamData(pendingDownloadDataCopy);
// instead we do:
if (cacheEnabled && !cacheSaveDevice) { if (cacheEnabled && !cacheSaveDevice) {
initCacheSaveDevice(); initCacheSaveDevice();
} }
@ -998,23 +991,17 @@ void QNetworkReplyHttpImplPrivate::replyDownloadData(QByteArray d)
bytesDownloaded += bytesWritten; bytesDownloaded += bytesWritten;
lastBytesDownloaded = bytesDownloaded; lastBytesDownloaded = bytesDownloaded;
//appendDownstreamDataSignalEmissions();
// instead:
QVariant totalSize = cookedHeaders.value(QNetworkRequest::ContentLengthHeader); QVariant totalSize = cookedHeaders.value(QNetworkRequest::ContentLengthHeader);
if (preMigrationDownloaded != Q_INT64_C(-1)) if (preMigrationDownloaded != Q_INT64_C(-1))
totalSize = totalSize.toLongLong() + preMigrationDownloaded; 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 q->readyRead();
// emit readyRead before downloadProgress incase this will cause events to be // emit readyRead before downloadProgress incase this will cause events to be
// processed and we get into a recursive call (as in QProgressDialog). // processed and we get into a recursive call (as in QProgressDialog).
emit q->downloadProgress(bytesDownloaded, emit q->downloadProgress(bytesDownloaded,
totalSize.isNull() ? Q_INT64_C(-1) : totalSize.toLongLong()); totalSize.isNull() ? Q_INT64_C(-1) : totalSize.toLongLong());
// resumeNotificationHandling();
} }
void QNetworkReplyHttpImplPrivate::replyFinished() void QNetworkReplyHttpImplPrivate::replyFinished()
@ -1042,6 +1029,7 @@ void QNetworkReplyHttpImplPrivate::checkForRedirect(const int statusCode)
QUrl url = QUrl::fromEncoded(header); QUrl url = QUrl::fromEncoded(header);
if (!url.isValid()) if (!url.isValid())
url = QUrl(QLatin1String(header)); url = QUrl(QLatin1String(header));
// FIXME?
//redirectionRequested(url); //redirectionRequested(url);
q->setAttribute(QNetworkRequest::RedirectionTargetAttribute, url); q->setAttribute(QNetworkRequest::RedirectionTargetAttribute, url);
} }
@ -1053,7 +1041,6 @@ void QNetworkReplyHttpImplPrivate::replyDownloadMetaData
QSharedPointer<char> db, QSharedPointer<char> db,
qint64 contentLength) qint64 contentLength)
{ {
qDebug() << "QNetworkReplyHttpImplPrivate::replyDownloadMetaData" << contentLength << sc;
Q_Q(QNetworkReplyHttpImpl); Q_Q(QNetworkReplyHttpImpl);
statusCode = sc; statusCode = sc;