From 09ca03e1aab7de1dbfcc61b3f95bbf2ede56f89e Mon Sep 17 00:00:00 2001 From: Timur Pocheptsov Date: Thu, 23 Feb 2017 10:18:43 +0100 Subject: QNAM - rename Redirect*s*Nnn to RedirectNnn As discussed in API code-review. Change-Id: Ib54cfd43d5bef8c7d99a7fb3b09a9d16dc1dc1dc Reviewed-by: Edward Welbourne --- src/network/access/qhttpnetworkrequest.cpp | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) (limited to 'src/network/access/qhttpnetworkrequest.cpp') diff --git a/src/network/access/qhttpnetworkrequest.cpp b/src/network/access/qhttpnetworkrequest.cpp index 7862d464e1d..60b566299f9 100644 --- a/src/network/access/qhttpnetworkrequest.cpp +++ b/src/network/access/qhttpnetworkrequest.cpp @@ -49,7 +49,7 @@ QHttpNetworkRequestPrivate::QHttpNetworkRequestPrivate(QHttpNetworkRequest::Oper : QHttpNetworkHeaderPrivate(newUrl), operation(op), priority(pri), uploadByteDevice(0), autoDecompress(false), pipeliningAllowed(false), spdyAllowed(false), http2Allowed(false), withCredentials(true), preConnect(false), redirectCount(0), - redirectsPolicy(QNetworkRequest::ManualRedirectsPolicy) + redirectPolicy(QNetworkRequest::ManualRedirectPolicy) { } @@ -67,7 +67,7 @@ QHttpNetworkRequestPrivate::QHttpNetworkRequestPrivate(const QHttpNetworkRequest ssl(other.ssl), preConnect(other.preConnect), redirectCount(other.redirectCount), - redirectsPolicy(other.redirectsPolicy) + redirectPolicy(other.redirectPolicy) { } @@ -90,7 +90,7 @@ bool QHttpNetworkRequestPrivate::operator==(const QHttpNetworkRequestPrivate &ot && (withCredentials == other.withCredentials) && (ssl == other.ssl) && (preConnect == other.preConnect) - && (redirectsPolicy == other.redirectsPolicy); + && (redirectPolicy == other.redirectPolicy); } QByteArray QHttpNetworkRequest::methodName() const @@ -231,17 +231,17 @@ void QHttpNetworkRequest::setPreConnect(bool preConnect) bool QHttpNetworkRequest::isFollowRedirects() const { - return d->redirectsPolicy != QNetworkRequest::ManualRedirectsPolicy; + return d->redirectPolicy != QNetworkRequest::ManualRedirectPolicy; } -void QHttpNetworkRequest::setRedirectsPolicy(QNetworkRequest::RedirectsPolicy policy) +void QHttpNetworkRequest::setRedirectPolicy(QNetworkRequest::RedirectPolicy policy) { - d->redirectsPolicy = policy; + d->redirectPolicy = policy; } -QNetworkRequest::RedirectsPolicy QHttpNetworkRequest::redirectsPolicy() const +QNetworkRequest::RedirectPolicy QHttpNetworkRequest::redirectPolicy() const { - return d->redirectsPolicy; + return d->redirectPolicy; } int QHttpNetworkRequest::redirectCount() const -- cgit v1.2.3