diff options
Diffstat (limited to 'src/network')
-rw-r--r-- | src/network/access/qnetworkreplyhttpimpl.cpp | 6 | ||||
-rw-r--r-- | src/network/access/qnetworkreplyhttpimpl_p.h | 3 |
2 files changed, 5 insertions, 4 deletions
diff --git a/src/network/access/qnetworkreplyhttpimpl.cpp b/src/network/access/qnetworkreplyhttpimpl.cpp index a021d51952..836b3c3fa4 100644 --- a/src/network/access/qnetworkreplyhttpimpl.cpp +++ b/src/network/access/qnetworkreplyhttpimpl.cpp @@ -1166,7 +1166,7 @@ void QNetworkReplyHttpImplPrivate::replyDownloadMetaData setCachingEnabled(true); } - metaDataChanged(); + _q_metaDataChanged(); } void QNetworkReplyHttpImplPrivate::replyDownloadProgressSlot(qint64 bytesReceived, qint64 bytesTotal) @@ -1359,7 +1359,7 @@ bool QNetworkReplyHttpImplPrivate::sendCacheContents(const QNetworkCacheMetaData // This needs to be emitted in the event loop because it can be reached at // the direct code path of qnam.get(...) before the user has a chance // to connect any signals. - QMetaObject::invokeMethod(q, "metaDataChanged", Qt::QueuedConnection); + QMetaObject::invokeMethod(q, "_q_metaDataChanged", Qt::QueuedConnection); QMetaObject::invokeMethod(q, "_q_cacheLoadReadyRead", Qt::QueuedConnection); @@ -1986,7 +1986,7 @@ void QNetworkReplyHttpImplPrivate::error(QNetworkReplyImpl::NetworkError code, c emit q->error(code); } -void QNetworkReplyHttpImplPrivate::metaDataChanged() +void QNetworkReplyHttpImplPrivate::_q_metaDataChanged() { // FIXME merge this with replyDownloadMetaData(); ? diff --git a/src/network/access/qnetworkreplyhttpimpl_p.h b/src/network/access/qnetworkreplyhttpimpl_p.h index baff7a943c..77d9c5a368 100644 --- a/src/network/access/qnetworkreplyhttpimpl_p.h +++ b/src/network/access/qnetworkreplyhttpimpl_p.h @@ -124,6 +124,7 @@ public: Q_PRIVATE_SLOT(d_func(), void uploadByteDeviceReadyReadSlot()) Q_PRIVATE_SLOT(d_func(), void emitReplyUploadProgress(qint64, qint64)) Q_PRIVATE_SLOT(d_func(), void _q_cacheSaveDeviceAboutToClose()) + Q_PRIVATE_SLOT(d_func(), void _q_metaDataChanged()) #ifndef QT_NO_SSL @@ -175,7 +176,7 @@ public: void finished(); void error(QNetworkReply::NetworkError code, const QString &errorString); void _q_error(QNetworkReply::NetworkError code, const QString &errorString); - void metaDataChanged(); + void _q_metaDataChanged(); void checkForRedirect(const int statusCode); |