diff options
author | Markus Goetz <Markus.Goetz@nokia.com> | 2011-04-13 14:10:41 +0200 |
---|---|---|
committer | Markus Goetz <Markus.Goetz@nokia.com> | 2011-05-03 16:47:03 +0200 |
commit | ea4df8586e16efd82eb3ae5b71857c950cbb717f (patch) | |
tree | 2c79eed9d5a568e9ea671ca55a531e05fab1b242 /src/network | |
parent | aef6239e7d7cff1ed162408998a897cf112be47e (diff) |
QNAM: Function re-ordering
Diffstat (limited to 'src/network')
-rw-r--r-- | src/network/access/qnetworkreplyhttpimpl.cpp | 64 | ||||
-rw-r--r-- | src/network/access/qnetworkreplyhttpimpl_p.h | 11 |
2 files changed, 36 insertions, 39 deletions
diff --git a/src/network/access/qnetworkreplyhttpimpl.cpp b/src/network/access/qnetworkreplyhttpimpl.cpp index eb4adb8cd0..5034176a3f 100644 --- a/src/network/access/qnetworkreplyhttpimpl.cpp +++ b/src/network/access/qnetworkreplyhttpimpl.cpp @@ -359,6 +359,38 @@ bool QNetworkReplyHttpImpl::canReadLine () const return d->downloadMultiBuffer.canReadLine(); } +#ifndef QT_NO_OPENSSL +void QNetworkReplyHttpImpl::ignoreSslErrors() +{ + Q_D(QNetworkReplyHttpImpl); + + d->pendingIgnoreAllSslErrors = true; +} + +void QNetworkReplyHttpImpl::ignoreSslErrorsImplementation(const QList<QSslError> &errors) +{ + Q_D(QNetworkReplyHttpImpl); + + // the pending list is set if QNetworkReply::ignoreSslErrors(const QList<QSslError> &errors) + // is called before QNetworkAccessManager::get() (or post(), etc.) + d->pendingIgnoreSslErrorsList = errors; +} + +void QNetworkReplyHttpImpl::setSslConfigurationImplementation(const QSslConfiguration &newconfig) +{ + // Setting a SSL configuration on a reply is not supported. The user needs to set + // her/his QSslConfiguration on the QNetworkRequest. + Q_UNUSED(newconfig); +} + +QSslConfiguration QNetworkReplyHttpImpl::sslConfigurationImplementation() const +{ + Q_D(const QNetworkReplyHttpImpl); + qDebug() << "sslConfigurationImplementation"; + return d->sslConfiguration; +} +#endif + QNetworkReplyHttpImplPrivate::QNetworkReplyHttpImplPrivate() // FIXME order etc : QNetworkReplyPrivate() @@ -1265,38 +1297,6 @@ bool QNetworkReplyHttpImplPrivate::sendCacheContents(const QNetworkCacheMetaData return true; } -#ifndef QT_NO_OPENSSL -void QNetworkReplyHttpImpl::ignoreSslErrors() -{ - Q_D(QNetworkReplyHttpImpl); - - d->pendingIgnoreAllSslErrors = true; -} - -void QNetworkReplyHttpImpl::ignoreSslErrorsImplementation(const QList<QSslError> &errors) -{ - Q_D(QNetworkReplyHttpImpl); - - // the pending list is set if QNetworkReply::ignoreSslErrors(const QList<QSslError> &errors) - // is called before QNetworkAccessManager::get() (or post(), etc.) - d->pendingIgnoreSslErrorsList = errors; -} - -void QNetworkReplyHttpImpl::setSslConfigurationImplementation(const QSslConfiguration &newconfig) -{ - // Setting a SSL configuration on a reply is not supported. The user needs to set - // her/his QSslConfiguration on the QNetworkRequest. - Q_UNUSED(newconfig); -} - -QSslConfiguration QNetworkReplyHttpImpl::sslConfigurationImplementation() const -{ - Q_D(const QNetworkReplyHttpImpl); - qDebug() << "sslConfigurationImplementation"; - return d->sslConfiguration; -} -#endif - QNetworkCacheMetaData QNetworkReplyHttpImplPrivate::fetchCacheMetaData(const QNetworkCacheMetaData &oldMetaData) const { Q_Q(const QNetworkReplyHttpImpl); diff --git a/src/network/access/qnetworkreplyhttpimpl_p.h b/src/network/access/qnetworkreplyhttpimpl_p.h index 63ad2b9750..0420ffd313 100644 --- a/src/network/access/qnetworkreplyhttpimpl_p.h +++ b/src/network/access/qnetworkreplyhttpimpl_p.h @@ -180,18 +180,14 @@ public: void _q_finished(); - // ? - void consume(qint64 count); - - void setDownloadBuffer(QSharedPointer<char> sp, qint64 size); - char* getDownloadBuffer(qint64 size); - // FIXME void finished(); void error(QNetworkReply::NetworkError code, const QString &errorString); void _q_error(QNetworkReply::NetworkError code, const QString &errorString); void metaDataChanged(); + void redirectionRequested(const QUrl &target); + void checkForRedirect(const int statusCode); // incoming from user @@ -249,6 +245,8 @@ public: QByteDataBuffer pendingDownloadData; // For signal compression qint64 bytesDownloaded; qint64 lastBytesDownloaded; + void setDownloadBuffer(QSharedPointer<char> sp, qint64 size); + char* getDownloadBuffer(qint64 size); // only used when the "zero copy" style is used. Else downloadMultiBuffer is used. // Please note that the whole "zero copy" download buffer API is private right now. Do not use it. @@ -279,7 +277,6 @@ public: void postRequest(); - void checkForRedirect(const int statusCode); public: // From HTTP thread: |