diff options
author | Sona Kurazyan <sona.kurazyan@qt.io> | 2022-04-12 15:03:54 +0200 |
---|---|---|
committer | Sona Kurazyan <sona.kurazyan@qt.io> | 2022-04-21 23:53:15 +0200 |
commit | 46d6cc47cfabecbaa000482a44d4f9fadf68abd6 (patch) | |
tree | fabdc2c6ddb973e95c859bf635d92cd38cb37f04 /src/network/access/qhttpnetworkconnection.cpp | |
parent | f2637e1a77a5965a23e54c07587885f5a04ec877 (diff) |
QtNetwork: use _L1 for for creating Latin-1 string literals
Task-number: QTBUG-98434
Change-Id: Ic235b92377203f7a1429ae7fd784c4a1fa893e9f
Reviewed-by: MÃ¥rten Nordheim <marten.nordheim@qt.io>
Diffstat (limited to 'src/network/access/qhttpnetworkconnection.cpp')
-rw-r--r-- | src/network/access/qhttpnetworkconnection.cpp | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/src/network/access/qhttpnetworkconnection.cpp b/src/network/access/qhttpnetworkconnection.cpp index 3f7442b189..7d38638eb5 100644 --- a/src/network/access/qhttpnetworkconnection.cpp +++ b/src/network/access/qhttpnetworkconnection.cpp @@ -66,6 +66,8 @@ QT_BEGIN_NAMESPACE +using namespace Qt::StringLiterals; + const int QHttpNetworkConnectionPrivate::defaultHttpChannelCount = 6; // The pipeline length. So there will be 4 requests in flight. @@ -318,12 +320,12 @@ void QHttpNetworkConnectionPrivate::prepareRequest(HttpMessagePair &messagePair) if (value.isEmpty()) { QString systemLocale = QLocale::system().name().replace(QChar::fromLatin1('_'),QChar::fromLatin1('-')); QString acceptLanguage; - if (systemLocale == QLatin1String("C")) + if (systemLocale == "C"_L1) acceptLanguage = QString::fromLatin1("en,*"); - else if (systemLocale.startsWith(QLatin1String("en-"))) - acceptLanguage = systemLocale + QLatin1String(",*"); + else if (systemLocale.startsWith("en-"_L1)) + acceptLanguage = systemLocale + ",*"_L1; else - acceptLanguage = systemLocale + QLatin1String(",en,*"); + acceptLanguage = systemLocale + ",en,*"_L1; request.setHeaderField("Accept-Language", std::move(acceptLanguage).toLatin1()); } @@ -567,7 +569,7 @@ QHttpNetworkConnectionPrivate::parseRedirectResponse(QHttpNetworkReply *reply) // Check redirect url protocol const QUrl priorUrl(reply->request().url()); - if (redirectUrl.scheme() == QLatin1String("http") || redirectUrl.scheme() == QLatin1String("https")) { + if (redirectUrl.scheme() == "http"_L1 || redirectUrl.scheme() == "https"_L1) { switch (reply->request().redirectPolicy()) { case QNetworkRequest::NoLessSafeRedirectPolicy: // Here we could handle https->http redirects as InsecureProtocolError. |