diff options
author | Markus Goetz <Markus.Goetz@nokia.com> | 2011-04-08 13:41:57 +0200 |
---|---|---|
committer | Markus Goetz <Markus.Goetz@nokia.com> | 2011-05-03 16:34:58 +0200 |
commit | 43b6320a5a1e740e7b3dbc8fe623bd83903ad172 (patch) | |
tree | 00d29347ce293e7ddcbf3d1ce5f913077a80df08 /src/network/access/qnetworkreplyhttpimpl.cpp | |
parent | 0b7df2875409a1a164ea531b39a0a450dc4e0f02 (diff) |
QNAM: Fix proxy code after refactoring
Diffstat (limited to 'src/network/access/qnetworkreplyhttpimpl.cpp')
-rw-r--r-- | src/network/access/qnetworkreplyhttpimpl.cpp | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/src/network/access/qnetworkreplyhttpimpl.cpp b/src/network/access/qnetworkreplyhttpimpl.cpp index 9971dbb9b3..5e9d53b7f1 100644 --- a/src/network/access/qnetworkreplyhttpimpl.cpp +++ b/src/network/access/qnetworkreplyhttpimpl.cpp @@ -600,10 +600,10 @@ void QNetworkReplyHttpImplPrivate::postRequest() if (transparentProxy.type() == QNetworkProxy::DefaultProxy && cacheProxy.type() == QNetworkProxy::DefaultProxy) { // unsuitable proxies - QMetaObject::invokeMethod(q, "error", synchronous ? Qt::DirectConnection : Qt::QueuedConnection, + QMetaObject::invokeMethod(q, "_q_error", synchronous ? Qt::DirectConnection : Qt::QueuedConnection, Q_ARG(QNetworkReply::NetworkError, QNetworkReply::ProxyNotFoundError), Q_ARG(QString, q->tr("No suitable proxy found"))); - QMetaObject::invokeMethod(q, "finished", synchronous ? Qt::DirectConnection : Qt::QueuedConnection); + QMetaObject::invokeMethod(q, "_q_finished", synchronous ? Qt::DirectConnection : Qt::QueuedConnection); return; } #endif @@ -1811,6 +1811,12 @@ void QNetworkReplyHttpImplPrivate::finished() //resumeNotificationHandling(); } +void QNetworkReplyHttpImplPrivate::_q_error(QNetworkReplyImpl::NetworkError code, const QString &errorMessage) +{ + this->error(code, errorMessage); +} + + void QNetworkReplyHttpImplPrivate::error(QNetworkReplyImpl::NetworkError code, const QString &errorMessage) { Q_Q(QNetworkReplyHttpImpl); |