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>

17 files changed, 124 insertions, 103 deletions

diff --git a/src/network/access/http2/http2protocol.cpp b/src/network/access/http2/http2protocol.cpp
index 5a2763a0e0..1ac1c8e1fb 100644
--- a/src/network/access/http2/http2protocol.cpp
+++ b/src/network/access/http2/http2protocol.cpp
@@ -50,6 +50,8 @@
 
 QT_BEGIN_NAMESPACE
 
+using namespace Qt::StringLiterals;
+
 QT_IMPL_METATYPE_EXTERN_TAGGED(Http2::Settings, Http2__Settings)
 
 Q_LOGGING_CATEGORY(QT_HTTP2, "qt.network.http2")
@@ -130,7 +132,7 @@ void qt_error(quint32 errorCode, QNetworkReply::NetworkError &error,
 {
     if (errorCode > quint32(HTTP_1_1_REQUIRED)) {
         error = QNetworkReply::ProtocolFailure;
-        errorMessage = QLatin1String("RST_STREAM with unknown error code (%1)");
+        errorMessage = "RST_STREAM with unknown error code (%1)"_L1;
         errorMessage = errorMessage.arg(errorCode);
         return;
     }
@@ -144,61 +146,61 @@ void qt_error(quint32 errorCode, QNetworkReply::NetworkError &error,
         break;
     case PROTOCOL_ERROR:
         error = QNetworkReply::ProtocolFailure;
-        errorMessage = QLatin1String("HTTP/2 protocol error");
+        errorMessage = "HTTP/2 protocol error"_L1;
         break;
     case INTERNAL_ERROR:
         error = QNetworkReply::InternalServerError;
-        errorMessage = QLatin1String("Internal server error");
+        errorMessage = "Internal server error"_L1;
         break;
     case FLOW_CONTROL_ERROR:
         error = QNetworkReply::ProtocolFailure;
-        errorMessage = QLatin1String("Flow control error");
+        errorMessage = "Flow control error"_L1;
         break;
     case SETTINGS_TIMEOUT:
         error = QNetworkReply::TimeoutError;
-        errorMessage = QLatin1String("SETTINGS ACK timeout error");
+        errorMessage = "SETTINGS ACK timeout error"_L1;
         break;
     case STREAM_CLOSED:
         error = QNetworkReply::ProtocolFailure;
-        errorMessage = QLatin1String("Server received frame(s) on a half-closed stream");
+        errorMessage = "Server received frame(s) on a half-closed stream"_L1;
         break;
     case FRAME_SIZE_ERROR:
         error = QNetworkReply::ProtocolFailure;
-        errorMessage = QLatin1String("Server received a frame with an invalid size");
+        errorMessage = "Server received a frame with an invalid size"_L1;
         break;
     case REFUSE_STREAM:
         error = QNetworkReply::ProtocolFailure;
-        errorMessage = QLatin1String("Server refused a stream");
+        errorMessage = "Server refused a stream"_L1;
         break;
     case CANCEL:
         error = QNetworkReply::ProtocolFailure;
-        errorMessage = QLatin1String("Stream is no longer needed");
+        errorMessage = "Stream is no longer needed"_L1;
         break;
     case COMPRESSION_ERROR:
         error = QNetworkReply::ProtocolFailure;
-        errorMessage = QLatin1String("Server is unable to maintain the "
-                                     "header compression context for the connection");
+        errorMessage = "Server is unable to maintain the "
+                       "header compression context for the connection"_L1;
         break;
     case CONNECT_ERROR:
         // TODO: in Qt6 we'll have to add more error codes in QNetworkReply.
         error = QNetworkReply::UnknownNetworkError;
-        errorMessage = QLatin1String("The connection established in response "
-                        "to a CONNECT request was reset or abnormally closed");
+        errorMessage = "The connection established in response "
+                       "to a CONNECT request was reset or abnormally closed"_L1;
         break;
     case ENHANCE_YOUR_CALM:
         error = QNetworkReply::UnknownServerError;
-        errorMessage = QLatin1String("Server dislikes our behavior, excessive load detected.");
+        errorMessage = "Server dislikes our behavior, excessive load detected."_L1;
         break;
     case INADEQUATE_SECURITY:
         error = QNetworkReply::ContentAccessDenied;
-        errorMessage = QLatin1String("The underlying transport has properties "
-                                     "that do not meet minimum security "
-                                     "requirements");
+        errorMessage = "The underlying transport has properties "
+                       "that do not meet minimum security "
+                       "requirements"_L1;
         break;
     case HTTP_1_1_REQUIRED:
         error = QNetworkReply::ProtocolFailure;
-        errorMessage = QLatin1String("Server requires that HTTP/1.1 "
-                                     "be used instead of HTTP/2.");
+        errorMessage = "Server requires that HTTP/1.1 "
+                       "be used instead of HTTP/2."_L1;
     }
 }
 
diff --git a/src/network/access/qhstsstore.cpp b/src/network/access/qhstsstore.cpp
index 67be8a2de2..0ff84c26f8 100644
--- a/src/network/access/qhstsstore.cpp
+++ b/src/network/access/qhstsstore.cpp
@@ -52,6 +52,8 @@
 
 QT_BEGIN_NAMESPACE
 
+using namespace Qt::StringLiterals;
+
 static QString host_name_to_settings_key(const QString &hostName)
 {
     const QByteArray hostNameAsHex(hostName.toUtf8().toHex());
@@ -136,13 +138,13 @@ QString QHstsStore::absoluteFilePath(const QString &dirName)
 {
     const QDir dir(dirName.isEmpty() ? QStandardPaths::writableLocation(QStandardPaths::CacheLocation)
                                      : dirName);
-    return dir.absoluteFilePath(QLatin1String("hstsstore"));
+    return dir.absoluteFilePath("hstsstore"_L1);
 }
 
 void QHstsStore::beginHstsGroups()
 {
-    store.beginGroup(QLatin1String("StrictTransportSecurity"));
-    store.beginGroup(QLatin1String("Policies"));
+    store.beginGroup("StrictTransportSecurity"_L1);
+    store.beginGroup("Policies"_L1);
 }
 
 void QHstsStore::endHstsGroups()
diff --git a/src/network/access/qhttp2protocolhandler.cpp b/src/network/access/qhttp2protocolhandler.cpp
index 4e104028b6..7c6d09d41c 100644
--- a/src/network/access/qhttp2protocolhandler.cpp
+++ b/src/network/access/qhttp2protocolhandler.cpp
@@ -65,6 +65,8 @@
 
 QT_BEGIN_NAMESPACE
 
+using namespace Qt::StringLiterals;
+
 namespace
 {
 
@@ -239,8 +241,7 @@ void QHttp2ProtocolHandler::_q_uploadDataReadyRead()
     auto &stream = activeStreams[streamID];
 
     if (!sendDATA(stream)) {
-        finishStreamWithError(stream, QNetworkReply::UnknownNetworkError,
-                              QLatin1String("failed to send DATA"));
+        finishStreamWithError(stream, QNetworkReply::UnknownNetworkError, "failed to send DATA"_L1);
         sendRST_STREAM(streamID, INTERNAL_ERROR);
         markAsReset(streamID);
         deleteActiveStream(streamID);
@@ -354,8 +355,7 @@ bool QHttp2ProtocolHandler::sendRequest()
     for (auto it = requests.begin(), endIt = requests.end(); it != endIt;) {
         const auto &pair = *it;
         const QString scheme(pair.first.url().scheme());
-        if (scheme == QLatin1String("preconnect-http")
-            || scheme == QLatin1String("preconnect-https")) {
+        if (scheme == "preconnect-http"_L1 || scheme == "preconnect-https"_L1) {
             m_connection->preConnectFinished();
             emit pair.second->finished();
             it = requests.erase(it);
@@ -410,14 +410,14 @@ bool QHttp2ProtocolHandler::sendRequest()
         Stream &newStream = activeStreams[newStreamID];
         if (!sendHEADERS(newStream)) {
             finishStreamWithError(newStream, QNetworkReply::UnknownNetworkError,
-                                  QLatin1String("failed to send HEADERS frame(s)"));
+                                  "failed to send HEADERS frame(s)"_L1);
             deleteActiveStream(newStreamID);
             continue;
         }
 
         if (newStream.data() && !sendDATA(newStream)) {
             finishStreamWithError(newStream, QNetworkReply::UnknownNetworkError,
-                                  QLatin1String("failed to send DATA frame(s)"));
+                                  "failed to send DATA frame(s)"_L1);
             sendRST_STREAM(newStreamID, INTERNAL_ERROR);
             markAsReset(newStreamID);
             deleteActiveStream(newStreamID);
@@ -616,8 +616,7 @@ void QHttp2ProtocolHandler::handleDATA()
         auto &stream = activeStreams[streamID];
 
         if (qint32(inboundFrame.payloadSize()) > stream.recvWindow) {
-            finishStreamWithError(stream, QNetworkReply::ProtocolFailure,
-                                  QLatin1String("flow control error"));
+            finishStreamWithError(stream, QNetworkReply::ProtocolFailure, "flow control error"_L1);
             sendRST_STREAM(streamID, FLOW_CONTROL_ERROR);
             markAsReset(streamID);
             deleteActiveStream(streamID);
@@ -891,7 +890,7 @@ void QHttp2ProtocolHandler::handleGOAWAY()
     // successful completion.
     if (errorCode == HTTP2_NO_ERROR) {
         error = QNetworkReply::ContentReSendError;
-        message = QLatin1String("Server stopped accepting new streams before this stream was established");
+        message = "Server stopped accepting new streams before this stream was established"_L1;
     }
 
     for (quint32 id = lastStreamID; id < nextID; id += 2) {
@@ -931,7 +930,7 @@ void QHttp2ProtocolHandler::handleWINDOW_UPDATE()
         auto &stream = activeStreams[streamID];
         if (!valid || sum_will_overflow(stream.sendWindow, delta)) {
             finishStreamWithError(stream, QNetworkReply::ProtocolFailure,
-                                  QLatin1String("invalid WINDOW_UPDATE delta"));
+                                  "invalid WINDOW_UPDATE delta"_L1);
             sendRST_STREAM(streamID, PROTOCOL_ERROR);
             markAsReset(streamID);
             deleteActiveStream(streamID);
@@ -986,7 +985,7 @@ void QHttp2ProtocolHandler::handleContinuedHEADERS()
                 // (these streams are in halfClosedLocal or open state) or
                 // remote-reserved streams from a server's PUSH_PROMISE.
                 finishStreamWithError(stream, QNetworkReply::ProtocolFailure,
-                                      QLatin1String("HEADERS on invalid stream"));
+                                      "HEADERS on invalid stream"_L1);
                 sendRST_STREAM(streamID, CANCEL);
                 markAsReset(streamID);
                 deleteActiveStream(streamID);
@@ -1077,7 +1076,7 @@ bool QHttp2ProtocolHandler::acceptSetting(Http2::Settings identifier, quint32 ne
         for (auto id : brokenStreams) {
             auto &stream = activeStreams[id];
             finishStreamWithError(stream, QNetworkReply::ProtocolFailure,
-                                  QLatin1String("SETTINGS window overflow"));
+                                  "SETTINGS window overflow"_L1);
             sendRST_STREAM(id, PROTOCOL_ERROR);
             markAsReset(id);
             deleteActiveStream(id);
@@ -1491,7 +1490,7 @@ void QHttp2ProtocolHandler::resumeSuspendedStreams()
         Stream &stream = activeStreams[streamID];
         if (!sendDATA(stream)) {
             finishStreamWithError(stream, QNetworkReply::UnknownNetworkError,
-                                  QLatin1String("failed to send DATA"));
+                                  "failed to send DATA"_L1);
             sendRST_STREAM(streamID, INTERNAL_ERROR);
             markAsReset(streamID);
             deleteActiveStream(streamID);
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.
diff --git a/src/network/access/qhttpnetworkreply.cpp b/src/network/access/qhttpnetworkreply.cpp
index d23dc1434f..af8a177819 100644
--- a/src/network/access/qhttpnetworkreply.cpp
+++ b/src/network/access/qhttpnetworkreply.cpp
@@ -50,6 +50,8 @@
 
 QT_BEGIN_NAMESPACE
 
+using namespace Qt::StringLiterals;
+
 QHttpNetworkReply::QHttpNetworkReply(const QUrl &url, QObject *parent)
     : QObject(*new QHttpNetworkReplyPrivate(url), parent)
 {
@@ -352,8 +354,7 @@ QHttpNetworkReplyPrivate::QHttpNetworkReplyPrivate(const QUrl &newUrl)
 
 {
     QString scheme = newUrl.scheme();
-    if (scheme == QLatin1String("preconnect-http")
-            || scheme == QLatin1String("preconnect-https"))
+    if (scheme == "preconnect-http"_L1 || scheme == "preconnect-https"_L1)
         // make sure we do not close the socket after preconnecting
         connectionCloseEnabled = false;
 }
diff --git a/src/network/access/qhttpprotocolhandler.cpp b/src/network/access/qhttpprotocolhandler.cpp
index 973c200736..ceff9fc7fd 100644
--- a/src/network/access/qhttpprotocolhandler.cpp
+++ b/src/network/access/qhttpprotocolhandler.cpp
@@ -44,6 +44,8 @@
 
 QT_BEGIN_NAMESPACE
 
+using namespace Qt::StringLiterals;
+
 QHttpProtocolHandler::QHttpProtocolHandler(QHttpNetworkConnectionChannel *channel)
     : QAbstractProtocolHandler(channel)
 {
@@ -273,8 +275,7 @@ bool QHttpProtocolHandler::sendRequest()
             return false;
         }
         QString scheme = m_channel->request.url().scheme();
-        if (scheme == QLatin1String("preconnect-http")
-            || scheme == QLatin1String("preconnect-https")) {
+        if (scheme == "preconnect-http"_L1 || scheme == "preconnect-https"_L1) {
             m_channel->state = QHttpNetworkConnectionChannel::IdleState;
             m_reply->d_func()->state = QHttpNetworkReplyPrivate::AllDoneState;
             m_channel->allDone();
diff --git a/src/network/access/qhttpthreaddelegate.cpp b/src/network/access/qhttpthreaddelegate.cpp
index 80ad5dfd42..94fa6e428c 100644
--- a/src/network/access/qhttpthreaddelegate.cpp
+++ b/src/network/access/qhttpthreaddelegate.cpp
@@ -52,6 +52,8 @@
 
 QT_BEGIN_NAMESPACE
 
+using namespace Qt::StringLiterals;
+
 static QNetworkReply::NetworkError statusCodeFromHttp(int httpStatusCode, const QUrl &url)
 {
     QNetworkReply::NetworkError code;
@@ -128,14 +130,12 @@ static QByteArray makeCacheKey(QUrl &url, QNetworkProxy *proxy, const QString &p
     QString result;
     QUrl copy = url;
     QString scheme = copy.scheme();
-    bool isEncrypted = scheme == QLatin1String("https")
-                       || scheme == QLatin1String("preconnect-https");
+    bool isEncrypted = scheme == "https"_L1 || scheme == "preconnect-https"_L1;
     copy.setPort(copy.port(isEncrypted ? 443 : 80));
-    if (scheme == QLatin1String("preconnect-http")) {
-        copy.setScheme(QLatin1String("http"));
-    } else if (scheme == QLatin1String("preconnect-https")) {
-        copy.setScheme(QLatin1String("https"));
-    }
+    if (scheme == "preconnect-http"_L1)
+        copy.setScheme("http"_L1);
+    else if (scheme == "preconnect-https"_L1)
+        copy.setScheme("https"_L1);
     result = copy.toString(QUrl::RemoveUserInfo | QUrl::RemovePath |
                            QUrl::RemoveQuery | QUrl::RemoveFragment | QUrl::FullyEncoded);
 
@@ -145,12 +145,12 @@ static QByteArray makeCacheKey(QUrl &url, QNetworkProxy *proxy, const QString &p
 
         switch (proxy->type()) {
         case QNetworkProxy::Socks5Proxy:
-            key.setScheme(QLatin1String("proxy-socks5"));
+            key.setScheme("proxy-socks5"_L1);
             break;
 
         case QNetworkProxy::HttpProxy:
         case QNetworkProxy::HttpCachingProxy:
-            key.setScheme(QLatin1String("proxy-http"));
+            key.setScheme("proxy-http"_L1);
             break;
 
         default:
diff --git a/src/network/access/qnetworkaccessauthenticationmanager.cpp b/src/network/access/qnetworkaccessauthenticationmanager.cpp
index 7b2e439fe3..c651301e9c 100644
--- a/src/network/access/qnetworkaccessauthenticationmanager.cpp
+++ b/src/network/access/qnetworkaccessauthenticationmanager.cpp
@@ -51,6 +51,8 @@
 
 QT_BEGIN_NAMESPACE
 
+using namespace Qt::StringLiterals;
+
 class QNetworkAuthenticationCache : private QList<QNetworkAuthenticationCredential>,
                                     public QNetworkAccessCache::CacheableObject
 {
@@ -105,16 +107,16 @@ static QByteArray proxyAuthenticationKey(const QNetworkProxy &proxy, const QStri
 
     switch (proxy.type()) {
     case QNetworkProxy::Socks5Proxy:
-        key.setScheme(QLatin1String("proxy-socks5"));
+        key.setScheme("proxy-socks5"_L1);
         break;
 
     case QNetworkProxy::HttpProxy:
     case QNetworkProxy::HttpCachingProxy:
-        key.setScheme(QLatin1String("proxy-http"));
+        key.setScheme("proxy-http"_L1);
         break;
 
     case QNetworkProxy::FtpCachingProxy:
-        key.setScheme(QLatin1String("proxy-ftp"));
+        key.setScheme("proxy-ftp"_L1);
         break;
 
     case QNetworkProxy::DefaultProxy:
diff --git a/src/network/access/qnetworkaccessdebugpipebackend.cpp b/src/network/access/qnetworkaccessdebugpipebackend.cpp
index 1dafc32060..c2987ac3d1 100644
--- a/src/network/access/qnetworkaccessdebugpipebackend.cpp
+++ b/src/network/access/qnetworkaccessdebugpipebackend.cpp
@@ -46,6 +46,8 @@
 
 QT_BEGIN_NAMESPACE
 
+using namespace Qt::StringLiterals;
+
 #ifdef QT_BUILD_INTERNAL
 
 enum {
@@ -74,7 +76,7 @@ QNetworkAccessDebugPipeBackendFactory::create(QNetworkAccessManager::Operation o
     }
 
     QUrl url = request.url();
-    if (url.scheme() == QLatin1String("debugpipe"))
+    if (url.scheme() == "debugpipe"_L1)
         return new QNetworkAccessDebugPipeBackend;
     return nullptr;
 }
@@ -109,7 +111,7 @@ void QNetworkAccessDebugPipeBackend::open()
     // socket bytes written -> we can push more from upstream to socket
     connect(&socket, SIGNAL(bytesWritten(qint64)), SLOT(socketBytesWritten(qint64)));
 
-    bareProtocol = QUrlQuery(url()).queryItemValue(QLatin1String("bare")) == QLatin1String("1");
+    bareProtocol = QUrlQuery(url()).queryItemValue("bare"_L1) == "1"_L1;
 
     if (operation() == QNetworkAccessManager::PutOperation) {
         createUploadByteDevice();
diff --git a/src/network/access/qnetworkaccessfilebackend.cpp b/src/network/access/qnetworkaccessfilebackend.cpp
index 8f089bec3c..1fe74b79cb 100644
--- a/src/network/access/qnetworkaccessfilebackend.cpp
+++ b/src/network/access/qnetworkaccessfilebackend.cpp
@@ -47,6 +47,8 @@
 
 QT_BEGIN_NAMESPACE
 
+using namespace Qt::StringLiterals;
+
 QStringList QNetworkAccessFileBackendFactory::supportedSchemes() const
 {
     QStringList schemes;
@@ -74,9 +76,9 @@ QNetworkAccessFileBackendFactory::create(QNetworkAccessManager::Operation op,
     }
 
     QUrl url = request.url();
-    if (url.scheme().compare(QLatin1String("qrc"), Qt::CaseInsensitive) == 0
+    if (url.scheme().compare("qrc"_L1, Qt::CaseInsensitive) == 0
 #if defined(Q_OS_ANDROID)
-            || url.scheme().compare(QLatin1String("assets"), Qt::CaseInsensitive) == 0
+            || url.scheme().compare("assets"_L1, Qt::CaseInsensitive) == 0
 #endif
             || url.isLocalFile()) {
         return new QNetworkAccessFileBackend;
@@ -112,7 +114,7 @@ void QNetworkAccessFileBackend::open()
 {
     QUrl url = this->url();
 
-    if (url.host() == QLatin1String("localhost"))
+    if (url.host() == "localhost"_L1)
         url.setHost(QString());
 #if !defined(Q_OS_WIN)
     // do not allow UNC paths on Unix
@@ -125,17 +127,17 @@ void QNetworkAccessFileBackend::open()
     }
 #endif // !defined(Q_OS_WIN)
     if (url.path().isEmpty())
-        url.setPath(QLatin1String("/"));
+        url.setPath("/"_L1);
     setUrl(url);
 
     QString fileName = url.toLocalFile();
     if (fileName.isEmpty()) {
-        if (url.scheme() == QLatin1String("qrc")) {
+        if (url.scheme() == "qrc"_L1) {
             fileName = u':' + url.path();
         } else {
 #if defined(Q_OS_ANDROID)
-            if (url.scheme() == QLatin1String("assets"))
-                fileName = QLatin1String("assets:") + url.path();
+            if (url.scheme() == "assets"_L1)
+                fileName = "assets:"_L1 + url.path();
             else
 #endif
                 fileName = url.toString(QUrl::RemoveAuthority | QUrl::RemoveFragment | QUrl::RemoveQuery);
diff --git a/src/network/access/qnetworkaccessmanager.cpp b/src/network/access/qnetworkaccessmanager.cpp
index 29b6eddc80..be3165692f 100644
--- a/src/network/access/qnetworkaccessmanager.cpp
+++ b/src/network/access/qnetworkaccessmanager.cpp
@@ -100,14 +100,15 @@
 
 QT_BEGIN_NAMESPACE
 
+using namespace Qt::StringLiterals;
+
 Q_APPLICATION_STATIC(QNetworkAccessFileBackendFactory, fileBackend)
 
 #ifdef QT_BUILD_INTERNAL
 Q_GLOBAL_STATIC(QNetworkAccessDebugPipeBackendFactory, debugpipeBackend)
 #endif
 
-Q_APPLICATION_STATIC(QFactoryLoader, loader, QNetworkAccessBackendFactory_iid,
-                     QLatin1String("/networkaccess"))
+Q_APPLICATION_STATIC(QFactoryLoader, loader, QNetworkAccessBackendFactory_iid, "/networkaccess"_L1)
 
 #if defined(Q_OS_MACOS)
 bool getProxyAuth(const QString& proxyHostname, const QString &scheme, QString& username, QString& password)
@@ -116,13 +117,13 @@ bool getProxyAuth(const QString& proxyHostname, const QString &scheme, QString&
     SecKeychainItemRef itemRef;
     bool retValue = false;
     SecProtocolType protocolType = kSecProtocolTypeAny;
-    if (scheme.compare(QLatin1String("ftp"),Qt::CaseInsensitive)==0) {
+    if (scheme.compare("ftp"_L1, Qt::CaseInsensitive) == 0) {
         protocolType = kSecProtocolTypeFTPProxy;
-    } else if (scheme.compare(QLatin1String("http"),Qt::CaseInsensitive)==0
-               || scheme.compare(QLatin1String("preconnect-http"),Qt::CaseInsensitive)==0) {
+    } else if (scheme.compare("http"_L1, Qt::CaseInsensitive) == 0
+               || scheme.compare("preconnect-http"_L1, Qt::CaseInsensitive) == 0) {
         protocolType = kSecProtocolTypeHTTPProxy;
-    } else if (scheme.compare(QLatin1String("https"),Qt::CaseInsensitive)==0
-               || scheme.compare(QLatin1String("preconnect-https"),Qt::CaseInsensitive)==0) {
+    } else if (scheme.compare("https"_L1,Qt::CaseInsensitive)==0
+               || scheme.compare("preconnect-https"_L1, Qt::CaseInsensitive) == 0) {
         protocolType = kSecProtocolTypeHTTPSProxy;
     }
     QByteArray proxyHostnameUtf8(proxyHostname.toUtf8());
@@ -978,7 +979,7 @@ void QNetworkAccessManager::connectToHostEncrypted(const QString &hostName, quin
     QUrl url;
     url.setHost(hostName);
     url.setPort(port);
-    url.setScheme(QLatin1String("preconnect-https"));
+    url.setScheme("preconnect-https"_L1);
     QNetworkRequest request(url);
     if (sslConfiguration != QSslConfiguration::defaultConfiguration())
         request.setSslConfiguration(sslConfiguration);
@@ -1009,7 +1010,7 @@ void QNetworkAccessManager::connectToHost(const QString &hostName, quint16 port)
     QUrl url;
     url.setHost(hostName);
     url.setPort(port);
-    url.setScheme(QLatin1String("preconnect-http"));
+    url.setScheme("preconnect-http"_L1);
     QNetworkRequest request(url);
     get(request);
 }
@@ -1164,13 +1165,13 @@ QNetworkReply *QNetworkAccessManager::createRequest(QNetworkAccessManager::Opera
      || op == QNetworkAccessManager::HeadOperation) {
         if (isLocalFile
 #ifdef Q_OS_ANDROID
-            || scheme == QLatin1String("assets")
+            || scheme == "assets"_L1
 #endif
-            || scheme == QLatin1String("qrc")) {
+            || scheme == "qrc"_L1) {
             return new QNetworkReplyFileImpl(this, req, op);
         }
 
-        if (scheme == QLatin1String("data"))
+        if (scheme == "data"_L1)
             return new QNetworkReplyDataImpl(this, req, op);
 
         // A request with QNetworkRequest::AlwaysCache does not need any bearer management
@@ -1212,7 +1213,7 @@ QNetworkReply *QNetworkAccessManager::createRequest(QNetworkAccessManager::Opera
 #ifdef Q_OS_WASM
     Q_UNUSED(isLocalFile);
     // Support http, https, and relative urls
-    if (scheme == QLatin1String("http") || scheme == QLatin1String("https") || scheme.isEmpty()) {
+    if (scheme == "http"_L1 || scheme == "https"_L1 || scheme.isEmpty()) {
         QNetworkReplyWasmImpl *reply = new QNetworkReplyWasmImpl(this);
         QNetworkReplyWasmImplPrivate *priv = reply->d_func();
         priv->manager = this;
@@ -1246,7 +1247,7 @@ QNetworkReply *QNetworkAccessManager::createRequest(QNetworkAccessManager::Opera
             // MUST NOT add one.
             if (stsUrl.port() == 80)
                 stsUrl.setPort(443);
-            stsUrl.setScheme(QLatin1String("https"));
+            stsUrl.setScheme("https"_L1);
             request.setUrl(stsUrl);
         }
 #endif
diff --git a/src/network/access/qnetworkcookie.cpp b/src/network/access/qnetworkcookie.cpp
index b9826fe1ed..d841c5304a 100644
--- a/src/network/access/qnetworkcookie.cpp
+++ b/src/network/access/qnetworkcookie.cpp
@@ -537,7 +537,7 @@ QByteArray QNetworkCookie::toRawForm(RawForm form) const
         if (!isSessionCookie()) {
             result += "; expires=";
             result += QLocale::c().toString(d->expirationDate.toUTC(),
-                                            QLatin1String("ddd, dd-MMM-yyyy hh:mm:ss 'GMT")).toLatin1();
+                                            "ddd, dd-MMM-yyyy hh:mm:ss 'GMT"_L1).toLatin1();
         }
         if (!d->domain.isEmpty()) {
             result += "; domain=";
@@ -759,7 +759,7 @@ static QDateTime parseDateString(const QByteArray &dateString)
                 int ms = match.capturedView(4).toInt();
                 QStringView ampm = match.capturedView(5);
                 if (h < 12 && !ampm.isEmpty())
-                    if (ampm == QLatin1String("pm"))
+                    if (ampm == "pm"_L1)
                         h += 12;
                 time = QTime(h, m, s, ms);
 #ifdef PARSEDATESTRINGDEBUG
diff --git a/src/network/access/qnetworkcookiejar.cpp b/src/network/access/qnetworkcookiejar.cpp
index de2449279a..38a29144e6 100644
--- a/src/network/access/qnetworkcookiejar.cpp
+++ b/src/network/access/qnetworkcookiejar.cpp
@@ -57,6 +57,8 @@ QT_END_NAMESPACE
 
 QT_BEGIN_NAMESPACE
 
+using namespace Qt::StringLiterals;
+
 /*!
     \class QNetworkCookieJar
     \since 4.4
@@ -148,7 +150,7 @@ void QNetworkCookieJar::setAllCookies(const QList<QNetworkCookie> &cookieList)
 
 static inline bool isParentPath(const QString &path, const QString &reference)
 {
-    if ((path.isEmpty() && reference == QLatin1String("/")) || path.startsWith(reference)) {
+    if ((path.isEmpty() && reference == "/"_L1) || path.startsWith(reference)) {
         //The cookie-path and the request-path are identical.
         if (path.length() == reference.length())
             return true;
@@ -234,7 +236,7 @@ QList<QNetworkCookie> QNetworkCookieJar::cookiesForUrl(const QUrl &url) const
     Q_D(const QNetworkCookieJar);
     const QDateTime now = QDateTime::currentDateTimeUtc();
     QList<QNetworkCookie> result;
-    bool isEncrypted = url.scheme() == QLatin1String("https");
+    bool isEncrypted = url.scheme() == "https"_L1;
 
     // scan our cookies for something that matches
     QList<QNetworkCookie>::ConstIterator it = d->allCookies.constBegin(),
diff --git a/src/network/access/qnetworkdiskcache.cpp b/src/network/access/qnetworkdiskcache.cpp
index 6abb92a8a0..78bd4f4e7e 100644
--- a/src/network/access/qnetworkdiskcache.cpp
+++ b/src/network/access/qnetworkdiskcache.cpp
@@ -56,15 +56,17 @@
 
 #include <memory>
 
-#define CACHE_POSTFIX QLatin1String(".d")
-#define PREPARED_SLASH QLatin1String("prepared/")
+#define CACHE_POSTFIX ".d"_L1
+#define PREPARED_SLASH "prepared/"_L1
 #define CACHE_VERSION 8
-#define DATA_DIR QLatin1String("data")
+#define DATA_DIR "data"_L1
 
 #define MAX_COMPRESSION_SIZE (1024 * 1024 * 3)
 
 QT_BEGIN_NAMESPACE
 
+using namespace Qt::StringLiterals;
+
 /*!
     \class QNetworkDiskCache
     \since 4.5
@@ -606,7 +608,7 @@ QString QNetworkDiskCachePrivate::uniqueFileName(const QUrl &url)
 QString QNetworkDiskCachePrivate::tmpCacheFileName() const
 {
     //The subdirectory is presumed to be already read for use.
-    return cacheDirectory + PREPARED_SLASH + QLatin1String("XXXXXX") + CACHE_POSTFIX;
+    return cacheDirectory + PREPARED_SLASH + "XXXXXX"_L1 + CACHE_POSTFIX;
 }
 
 /*!
diff --git a/src/network/access/qnetworkreplyfileimpl.cpp b/src/network/access/qnetworkreplyfileimpl.cpp
index 319325df09..d62a3aec29 100644
--- a/src/network/access/qnetworkreplyfileimpl.cpp
+++ b/src/network/access/qnetworkreplyfileimpl.cpp
@@ -49,6 +49,8 @@
 
 QT_BEGIN_NAMESPACE
 
+using namespace Qt::StringLiterals;
+
 QT_IMPL_METATYPE_EXTERN_TAGGED(QNetworkRequest::KnownHeaders, QNetworkRequest__KnownHeaders)
 
 QNetworkReplyFileImplPrivate::QNetworkReplyFileImplPrivate()
@@ -82,7 +84,7 @@ QNetworkReplyFileImpl::QNetworkReplyFileImpl(QNetworkAccessManager *manager, con
     d->managerPrivate = manager->d_func();
 
     QUrl url = req.url();
-    if (url.host() == QLatin1String("localhost"))
+    if (url.host() == "localhost"_L1)
         url.setHost(QString());
 
 #if !defined(Q_OS_WIN)
@@ -98,18 +100,18 @@ QNetworkReplyFileImpl::QNetworkReplyFileImpl(QNetworkAccessManager *manager, con
     }
 #endif
     if (url.path().isEmpty())
-        url.setPath(QLatin1String("/"));
+        url.setPath("/"_L1);
     setUrl(url);
 
     QString fileName = url.toLocalFile();
     if (fileName.isEmpty()) {
         const QString scheme = url.scheme();
-        if (scheme == QLatin1String("qrc")) {
+        if (scheme == "qrc"_L1) {
             fileName = u':' + url.path();
         } else {
 #if defined(Q_OS_ANDROID)
-            if (scheme == QLatin1String("assets"))
-                fileName = QLatin1String("assets:") + url.path();
+            if (scheme == "assets"_L1)
+                fileName = "assets:"_L1 + url.path();
             else
 #endif
                 fileName = url.toString(QUrl::RemoveAuthority | QUrl::RemoveFragment | QUrl::RemoveQuery);
@@ -224,7 +226,7 @@ qint64 QNetworkReplyFileImpl::readData(char *data, qint64 maxlen)
         return -1;
     else {
         setAttribute(QNetworkRequest::HttpStatusCodeAttribute, 200);
-        setAttribute(QNetworkRequest::HttpReasonPhraseAttribute, QLatin1String("OK"));
+        setAttribute(QNetworkRequest::HttpReasonPhraseAttribute, "OK"_L1);
         return ret;
     }
 }
diff --git a/src/network/access/qnetworkreplyhttpimpl.cpp b/src/network/access/qnetworkreplyhttpimpl.cpp
index 157b86b52e..3612fe301d 100644
--- a/src/network/access/qnetworkreplyhttpimpl.cpp
+++ b/src/network/access/qnetworkreplyhttpimpl.cpp
@@ -67,6 +67,8 @@
 
 QT_BEGIN_NAMESPACE
 
+using namespace Qt::StringLiterals;
+
 class QNetworkProxy;
 
 static inline bool isSeparator(char c)
@@ -182,7 +184,7 @@ QNetworkReplyHttpImpl::QNetworkReplyHttpImpl(QNetworkAccessManager* const manage
     d->outgoingData = outgoingData;
     d->url = request.url();
 #ifndef QT_NO_SSL
-    if (request.url().scheme() == QLatin1String("https"))
+    if (request.url().scheme() == "https"_L1)
         d->sslConfiguration.reset(new QSslConfiguration(request.sslConfiguration()));
 #endif
 
@@ -658,13 +660,11 @@ void QNetworkReplyHttpImplPrivate::postRequest(const QNetworkRequest &newHttpReq
     httpRequest.setRedirectCount(newHttpRequest.maximumRedirectsAllowed());
 
     QString scheme = url.scheme();
-    bool ssl = (scheme == QLatin1String("https")
-                || scheme == QLatin1String("preconnect-https"));
+    bool ssl = (scheme == "https"_L1 || scheme == "preconnect-https"_L1);
     q->setAttribute(QNetworkRequest::ConnectionEncryptedAttribute, ssl);
     httpRequest.setSsl(ssl);
 
-    bool preConnect = (scheme == QLatin1String("preconnect-http")
-                       || scheme == QLatin1String("preconnect-https"));
+    bool preConnect = (scheme == "preconnect-http"_L1 || scheme == "preconnect-https"_L1);
     httpRequest.setPreConnect(preConnect);
 
 #ifndef QT_NO_NETWORKPROXY
@@ -1235,13 +1235,12 @@ void QNetworkReplyHttpImplPrivate::onRedirected(const QUrl &redirectUrl, int htt
         // equal to "80", the port component value MUST be preserved;
         // otherwise, if the URI does not contain an explicit port
         // component, the UA MUST NOT add one.
-        url.setScheme(QLatin1String("https"));
+        url.setScheme("https"_L1);
         if (url.port() == 80)
             url.setPort(443);
     }
 
-    const bool isLessSafe = schemeBefore == QLatin1String("https")
-                            && url.scheme() == QLatin1String("http");
+    const bool isLessSafe = schemeBefore == "https"_L1 && url.scheme() == "http"_L1;
     if (httpRequest.redirectPolicy() == QNetworkRequest::NoLessSafeRedirectPolicy
         && isLessSafe) {
         error(QNetworkReply::InsecureRedirectError,
@@ -1341,7 +1340,7 @@ void QNetworkReplyHttpImplPrivate::replyDownloadMetaData(const QList<QPair<QByte
     // RFC6797, 8.1
     // If an HTTP response is received over insecure transport, the UA MUST
     // ignore any present STS header field(s).
-    if (url.scheme() == QLatin1String("https") && managerPrivate->stsEnabled)
+    if (url.scheme() == "https"_L1 && managerPrivate->stsEnabled)
         managerPrivate->stsCache.updateFromHeaders(hm, url);
 #endif
     // Download buffer
diff --git a/src/network/access/qnetworkrequest.cpp b/src/network/access/qnetworkrequest.cpp
index 5734ac0dc5..3d89453cdb 100644
--- a/src/network/access/qnetworkrequest.cpp
+++ b/src/network/access/qnetworkrequest.cpp
@@ -59,6 +59,8 @@
 
 QT_BEGIN_NAMESPACE
 
+using namespace Qt::StringLiterals;
+
 QT_IMPL_METATYPE_EXTERN(QNetworkRequest)
 QT_IMPL_METATYPE_EXTERN_TAGGED(QNetworkRequest::RedirectPolicy, QNetworkRequest__RedirectPolicy)
 
@@ -1512,7 +1514,7 @@ QDateTime QNetworkHeadersPrivate::fromHttpDate(const QByteArray &value)
             // eat the weekday, the comma and the space following it
             QString sansWeekday = QString::fromLatin1(value.constData() + pos + 2);
             // must be RFC 850 date
-            dt = c.toDateTime(sansWeekday, QLatin1String("dd-MMM-yy hh:mm:ss 'GMT'"));
+            dt = c.toDateTime(sansWeekday, "dd-MMM-yy hh:mm:ss 'GMT'"_L1);
         }
     }
 #endif // datestring