diff options
author | Timur Pocheptsov <timur.pocheptsov@qt.io> | 2017-02-23 10:18:43 +0100 |
---|---|---|
committer | Timur Pocheptsov <timur.pocheptsov@qt.io> | 2017-02-23 20:24:17 +0000 |
commit | 09ca03e1aab7de1dbfcc61b3f95bbf2ede56f89e (patch) | |
tree | 64026afb80596f2977f76fc495cb0f623a41ada9 /src/network/access/qnetworkaccessmanager.cpp | |
parent | 758a56e6628be36df3f11431f9a770c930b13f14 (diff) |
QNAM - rename Redirect*s*Nnn to RedirectNnn
As discussed in API code-review.
Change-Id: Ib54cfd43d5bef8c7d99a7fb3b09a9d16dc1dc1dc
Reviewed-by: Edward Welbourne <edward.welbourne@qt.io>
Diffstat (limited to 'src/network/access/qnetworkaccessmanager.cpp')
-rw-r--r-- | src/network/access/qnetworkaccessmanager.cpp | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/src/network/access/qnetworkaccessmanager.cpp b/src/network/access/qnetworkaccessmanager.cpp index 0b03865df8..0a6270d417 100644 --- a/src/network/access/qnetworkaccessmanager.cpp +++ b/src/network/access/qnetworkaccessmanager.cpp @@ -1157,7 +1157,7 @@ void QNetworkAccessManager::connectToHost(const QString &hostName, quint16 port) /*! \since 5.9 - Sets the manager's redirects policy to be the \a policy specified. This policy + Sets the manager's redirect policy to be the \a policy specified. This policy will affect all subsequent requests created by the manager. Use this function to enable or disable HTTP redirects on the manager's level. @@ -1166,18 +1166,18 @@ void QNetworkAccessManager::connectToHost(const QString &hostName, quint16 port) the highest priority, next by priority is QNetworkRequest::FollowRedirectsAttribute. Finally, the manager's policy has the lowest priority. - For backwards compatibility the default value is QNetworkRequest::ManualRedirectsPolicy. + For backwards compatibility the default value is QNetworkRequest::ManualRedirectPolicy. This may change in the future and some type of auto-redirect policy will become the default; clients relying on manual redirect handling are encouraged to set this policy explicitly in their code. - \sa redirectsPolicy(), QNetworkRequest::RedirectsPolicy, + \sa redirectPolicy(), QNetworkRequest::RedirectPolicy, QNetworkRequest::FollowRedirectsAttribute */ -void QNetworkAccessManager::setRedirectsPolicy(QNetworkRequest::RedirectsPolicy policy) +void QNetworkAccessManager::setRedirectPolicy(QNetworkRequest::RedirectPolicy policy) { Q_D(QNetworkAccessManager); - d->redirectsPolicy = policy; + d->redirectPolicy = policy; } /*! @@ -1185,12 +1185,12 @@ void QNetworkAccessManager::setRedirectsPolicy(QNetworkRequest::RedirectsPolicy Returns the redirect policy that is used when creating new requests. - \sa setRedirectsPolicy(), QNetworkRequest::RedirectsPolicy + \sa setRedirectPolicy(), QNetworkRequest::RedirectPolicy */ -QNetworkRequest::RedirectsPolicy QNetworkAccessManager::redirectsPolicy() const +QNetworkRequest::RedirectPolicy QNetworkAccessManager::redirectPolicy() const { Q_D(const QNetworkAccessManager); - return d->redirectsPolicy; + return d->redirectPolicy; } /*! @@ -1280,12 +1280,12 @@ QNetworkReply *QNetworkAccessManager::createRequest(QNetworkAccessManager::Opera Q_D(QNetworkAccessManager); QNetworkRequest req(originalReq); - if (req.attribute(QNetworkRequest::RedirectsPolicyAttribute).isNull() + if (req.attribute(QNetworkRequest::RedirectPolicyAttribute).isNull() && req.attribute(QNetworkRequest::FollowRedirectsAttribute).isNull()) { // We only apply the general manager's policy if: - // - RedirectsPolicyAttribute is not set already on request and + // - RedirectPolicyAttribute is not set already on request and // - no FollowRedirectsAttribute is set. - req.setAttribute(QNetworkRequest::RedirectsPolicyAttribute, redirectsPolicy()); + req.setAttribute(QNetworkRequest::RedirectPolicyAttribute, redirectPolicy()); } bool isLocalFile = req.url().isLocalFile(); |