summaryrefslogtreecommitdiffstats
path: root/src/network/access/qnetworkrequest.cpp
diff options
context:
space:
mode:
authorTimur Pocheptsov <timur.pocheptsov@qt.io>2017-02-23 10:18:43 +0100
committerTimur Pocheptsov <timur.pocheptsov@qt.io>2017-02-23 20:24:17 +0000
commit09ca03e1aab7de1dbfcc61b3f95bbf2ede56f89e (patch)
tree64026afb80596f2977f76fc495cb0f623a41ada9 /src/network/access/qnetworkrequest.cpp
parent758a56e6628be36df3f11431f9a770c930b13f14 (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/qnetworkrequest.cpp')
-rw-r--r--src/network/access/qnetworkrequest.cpp48
1 files changed, 24 insertions, 24 deletions
diff --git a/src/network/access/qnetworkrequest.cpp b/src/network/access/qnetworkrequest.cpp
index 169695fa27d..e95187de301 100644
--- a/src/network/access/qnetworkrequest.cpp
+++ b/src/network/access/qnetworkrequest.cpp
@@ -289,9 +289,9 @@ QT_BEGIN_NAMESPACE
marked to be decompressed automatically.
(This value was introduced in 5.9.)
- \value RedirectsPolicyAttribute
+ \value RedirectPolicyAttribute
Requests only, type: QMetaType::Int, should be one of the
- QNetworkRequest::RedirectsPolicy values (default: ManualRedirectsPolicy).
+ QNetworkRequest::RedirectPolicy values (default: ManualRedirectPolicy).
This attribute obsoletes FollowRedirectsAttribute.
(This value was introduced in 5.9.)
@@ -343,33 +343,33 @@ QT_BEGIN_NAMESPACE
*/
/*!
- \enum QNetworkRequest::RedirectsPolicy
+ \enum QNetworkRequest::RedirectPolicy
\since 5.9
Indicates whether the Network Access API should automatically follow a
HTTP redirect response or not.
- \value ManualRedirectsPolicy Default value: not following any redirects.
-
- \value NoLessSafeRedirectsPolicy Only "http"->"http", "http" -> "https"
- or "https" -> "https" redirects are allowed.
- Equivalent to setting the old FollowRedirectsAttribute
- to true
-
- \value SameOriginRedirectsPolicy Require the same protocol, host and port.
- Note, http://example.com and http://example.com:80
- will fail with this policy (implicit/explicit ports
- are considered to be a mismatch).
-
- \value UserVerifiedRedirectsPolicy Client decides whether to follow each
- redirect by handling the redirected()
- signal, emitting redirectAllowed() on
- the QNetworkReply object to allow
- the redirect or aborting/finishing it to
- reject the redirect. This can be used,
- for example, to ask the user whether to
- accept the redirect, or to decide
- based on some app-specific configuration.
+ \value ManualRedirectPolicy Default value: not following any redirects.
+
+ \value NoLessSafeRedirectPolicy Only "http"->"http", "http" -> "https"
+ or "https" -> "https" redirects are allowed.
+ Equivalent to setting the old FollowRedirectsAttribute
+ to true
+
+ \value SameOriginRedirectPolicy Require the same protocol, host and port.
+ Note, http://example.com and http://example.com:80
+ will fail with this policy (implicit/explicit ports
+ are considered to be a mismatch).
+
+ \value UserVerifiedRedirectPolicy Client decides whether to follow each
+ redirect by handling the redirected()
+ signal, emitting redirectAllowed() on
+ the QNetworkReply object to allow
+ the redirect or aborting/finishing it to
+ reject the redirect. This can be used,
+ for example, to ask the user whether to
+ accept the redirect, or to decide
+ based on some app-specific configuration.
*/
class QNetworkRequestPrivate: public QSharedData, public QNetworkHeadersPrivate