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>

11 files changed, 118 insertions, 109 deletions

diff --git a/src/network/socket/qabstractsocket.cpp b/src/network/socket/qabstractsocket.cpp
index 7a3829e719..f4e4af462e 100644
--- a/src/network/socket/qabstractsocket.cpp
+++ b/src/network/socket/qabstractsocket.cpp
@@ -500,6 +500,8 @@
 
 QT_BEGIN_NAMESPACE
 
+using namespace Qt::StringLiterals;
+
 QT_IMPL_METATYPE_EXTERN_TAGGED(QAbstractSocket::SocketState, QAbstractSocket__SocketState)
 QT_IMPL_METATYPE_EXTERN_TAGGED(QAbstractSocket::SocketError, QAbstractSocket__SocketError)
 
@@ -576,14 +578,14 @@ bool QAbstractSocketPrivate::initSocketLayer(QAbstractSocket::NetworkLayerProtoc
     Q_Q(QAbstractSocket);
 #if defined (QABSTRACTSOCKET_DEBUG)
     QString typeStr;
-    if (q->socketType() == QAbstractSocket::TcpSocket) typeStr = QLatin1String("TcpSocket");
-    else if (q->socketType() == QAbstractSocket::UdpSocket) typeStr = QLatin1String("UdpSocket");
-    else if (q->socketType() == QAbstractSocket::SctpSocket) typeStr = QLatin1String("SctpSocket");
-    else typeStr = QLatin1String("UnknownSocketType");
+    if (q->socketType() == QAbstractSocket::TcpSocket) typeStr = "TcpSocket"_L1;
+    else if (q->socketType() == QAbstractSocket::UdpSocket) typeStr = "UdpSocket"_L1;
+    else if (q->socketType() == QAbstractSocket::SctpSocket) typeStr = "SctpSocket"_L1;
+    else typeStr = "UnknownSocketType"_L1;
     QString protocolStr;
-    if (protocol == QAbstractSocket::IPv4Protocol) protocolStr = QLatin1String("IPv4Protocol");
-    else if (protocol == QAbstractSocket::IPv6Protocol) protocolStr = QLatin1String("IPv6Protocol");
-    else protocolStr = QLatin1String("UnknownNetworkLayerProtocol");
+    if (protocol == QAbstractSocket::IPv4Protocol) protocolStr = "IPv4Protocol"_L1;
+    else if (protocol == QAbstractSocket::IPv6Protocol) protocolStr = "IPv6Protocol"_L1;
+    else protocolStr = "UnknownNetworkLayerProtocol"_L1;
 #endif
 
     resetSocketLayer();
@@ -969,9 +971,9 @@ void QAbstractSocketPrivate::_q_startConnecting(const QHostInfo &hostInfo)
 
 
 #if defined(QABSTRACTSOCKET_DEBUG)
-    QString s = QLatin1String("{");
+    QString s = "{"_L1;
     for (int i = 0; i < addresses.count(); ++i) {
-        if (i != 0) s += QLatin1String(", ");
+        if (i != 0) s += ", "_L1;
         s += addresses.at(i).toString();
     }
     s += u'}';
diff --git a/src/network/socket/qhttpsocketengine.cpp b/src/network/socket/qhttpsocketengine.cpp
index 51ecf9b362..8c13538b77 100644
--- a/src/network/socket/qhttpsocketengine.cpp
+++ b/src/network/socket/qhttpsocketengine.cpp
@@ -51,6 +51,8 @@
 
 QT_BEGIN_NAMESPACE
 
+using namespace Qt::StringLiterals;
+
 #define DEBUG
 
 QHttpSocketEngine::QHttpSocketEngine(QObject *parent)
@@ -186,8 +188,7 @@ bool QHttpSocketEngine::connectToHostByName(const QString &hostname, quint16 por
 bool QHttpSocketEngine::bind(const QHostAddress &, quint16)
 {
     qWarning("Operation is not supported");
-    setError(QAbstractSocket::UnsupportedSocketOperationError,
-             QLatin1String("Unsupported socket operation"));
+    setError(QAbstractSocket::UnsupportedSocketOperationError, "Unsupported socket operation"_L1);
     return false;
 }
 
@@ -195,16 +196,14 @@ bool QHttpSocketEngine::listen(int backlog)
 {
     Q_UNUSED(backlog);
     qWarning("Operation is not supported");
-    setError(QAbstractSocket::UnsupportedSocketOperationError,
-             QLatin1String("Unsupported socket operation"));
+    setError(QAbstractSocket::UnsupportedSocketOperationError, "Unsupported socket operation"_L1);
     return false;
 }
 
 int QHttpSocketEngine::accept()
 {
     qWarning("Operation is not supported");
-    setError(QAbstractSocket::UnsupportedSocketOperationError,
-             QLatin1String("Unsupported socket operation"));
+    setError(QAbstractSocket::UnsupportedSocketOperationError, "Unsupported socket operation"_L1);
     return -1;
 }
 
@@ -239,8 +238,7 @@ qint64 QHttpSocketEngine::read(char *data, qint64 maxlen)
         // failed, return the socket's error. Otherwise, fall through and
         // return as much as we read so far.
         close();
-        setError(QAbstractSocket::RemoteHostClosedError,
-                 QLatin1String("Remote host closed"));
+        setError(QAbstractSocket::RemoteHostClosedError, "Remote host closed"_L1);
         setState(QAbstractSocket::UnconnectedState);
         return -1;
     }
@@ -259,8 +257,7 @@ bool QHttpSocketEngine::joinMulticastGroup(const QHostAddress &,
                                            const QNetworkInterface &)
 {
     qWarning("Operation is not supported");
-    setError(QAbstractSocket::UnsupportedSocketOperationError,
-             QLatin1String("Unsupported socket operation"));
+    setError(QAbstractSocket::UnsupportedSocketOperationError, "Unsupported socket operation"_L1);
     return false;
 }
 
@@ -268,8 +265,7 @@ bool QHttpSocketEngine::leaveMulticastGroup(const QHostAddress &,
                                             const QNetworkInterface &)
 {
     qWarning("Operation is not supported");
-    setError(QAbstractSocket::UnsupportedSocketOperationError,
-             QLatin1String("Unsupported socket operation"));
+    setError(QAbstractSocket::UnsupportedSocketOperationError, "Unsupported socket operation"_L1);
     return false;
 }
 
@@ -281,8 +277,7 @@ QNetworkInterface QHttpSocketEngine::multicastInterface() const
 bool QHttpSocketEngine::setMulticastInterface(const QNetworkInterface &)
 {
     qWarning("Operation is not supported");
-    setError(QAbstractSocket::UnsupportedSocketOperationError,
-             QLatin1String("Unsupported socket operation"));
+    setError(QAbstractSocket::UnsupportedSocketOperationError, "Unsupported socket operation"_L1);
     return false;
 }
 #endif // QT_NO_NETWORKINTERFACE
@@ -303,16 +298,14 @@ qint64 QHttpSocketEngine::pendingDatagramSize() const
 qint64 QHttpSocketEngine::readDatagram(char *, qint64, QIpPacketHeader *, PacketHeaderOptions)
 {
     qWarning("Operation is not supported");
-    setError(QAbstractSocket::UnsupportedSocketOperationError,
-             QLatin1String("Unsupported socket operation"));
+    setError(QAbstractSocket::UnsupportedSocketOperationError, "Unsupported socket operation"_L1);
     return -1;
 }
 
 qint64 QHttpSocketEngine::writeDatagram(const char *, qint64, const QIpPacketHeader &)
 {
     qWarning("Operation is not supported");
-    setError(QAbstractSocket::UnsupportedSocketOperationError,
-             QLatin1String("Unsupported socket operation"));
+    setError(QAbstractSocket::UnsupportedSocketOperationError, "Unsupported socket operation"_L1);
     return -1;
 }
 
diff --git a/src/network/socket/qlocalserver.cpp b/src/network/socket/qlocalserver.cpp
index aa13c55965..049e2217bd 100644
--- a/src/network/socket/qlocalserver.cpp
+++ b/src/network/socket/qlocalserver.cpp
@@ -47,6 +47,8 @@
 
 QT_BEGIN_NAMESPACE
 
+using namespace Qt::StringLiterals;
+
 /*!
     \class QLocalServer
     \since 4.4
@@ -348,7 +350,7 @@ bool QLocalServer::listen(const QString &name)
 
     if (name.isEmpty()) {
         d->error = QAbstractSocket::HostNotFoundError;
-        QString function = QLatin1String("QLocalServer::listen");
+        QString function = "QLocalServer::listen"_L1;
         d->errorString = tr("%1: Name error").arg(function);
         return false;
     }
diff --git a/src/network/socket/qlocalserver_tcp.cpp b/src/network/socket/qlocalserver_tcp.cpp
index 1c46d75f52..c8f6ca1596 100644
--- a/src/network/socket/qlocalserver_tcp.cpp
+++ b/src/network/socket/qlocalserver_tcp.cpp
@@ -48,6 +48,8 @@
 
 QT_BEGIN_NAMESPACE
 
+using namespace Qt::StringLiterals;
+
 void QLocalServerPrivate::init()
 {
     Q_Q(QLocalServer);
@@ -61,13 +63,13 @@ bool QLocalServerPrivate::listen(const QString &requestedServerName)
     if (!tcpServer.listen(QHostAddress::LocalHost))
         return false;
 
-    const QLatin1String prefix("QLocalServer/");
+    const auto prefix = "QLocalServer/"_L1;
     if (requestedServerName.startsWith(prefix))
         fullServerName = requestedServerName;
     else
         fullServerName = prefix + requestedServerName;
 
-    QSettings settings(QLatin1String("QtProject"), QLatin1String("Qt"));
+    QSettings settings("QtProject"_L1, "Qt"_L1);
     if (settings.contains(fullServerName)) {
         qWarning("QLocalServer::listen: server name is already in use.");
         tcpServer.close();
@@ -85,8 +87,8 @@ bool QLocalServerPrivate::listen(qintptr socketDescriptor)
 
 void QLocalServerPrivate::closeServer()
 {
-    QSettings settings(QLatin1String("QtProject"), QLatin1String("Qt"));
-    if (fullServerName == QLatin1String("QLocalServer"))
+    QSettings settings("QtProject"_L1, "Qt"_L1);
+    if (fullServerName == "QLocalServer"_L1)
         settings.setValue(fullServerName, QVariant());
     else
         settings.remove(fullServerName);
@@ -117,14 +119,14 @@ void QLocalServerPrivate::_q_onNewConnection()
 
 bool QLocalServerPrivate::removeServer(const QString &name)
 {
-    const QLatin1String prefix("QLocalServer/");
+    const auto prefix = "QLocalServer/"_L1;
     QString serverName;
     if (name.startsWith(prefix))
         serverName = name;
     else
         serverName = prefix + name;
 
-    QSettings settings(QLatin1String("QtProject"), QLatin1String("Qt"));
+    QSettings settings("QtProject"_L1, "Qt"_L1);
     if (settings.contains(serverName))
         settings.remove(serverName);
 
diff --git a/src/network/socket/qlocalserver_unix.cpp b/src/network/socket/qlocalserver_unix.cpp
index 8740867416..5c2a4e34c6 100644
--- a/src/network/socket/qlocalserver_unix.cpp
+++ b/src/network/socket/qlocalserver_unix.cpp
@@ -60,6 +60,8 @@
 
 QT_BEGIN_NAMESPACE
 
+using namespace Qt::StringLiterals;
+
 namespace {
 QLocalServer::SocketOptions optionsForPlatform(QLocalServer::SocketOptions srcOptions)
 {
@@ -121,16 +123,16 @@ bool QLocalServerPrivate::listen(const QString &requestedServerName)
         QFileInfo serverNameFileInfo(fullServerName);
         tempDir.emplace(serverNameFileInfo.absolutePath() + u'/');
         if (!tempDir->isValid()) {
-            setError(QLatin1String("QLocalServer::listen"));
+            setError("QLocalServer::listen"_L1);
             return false;
         }
-        encodedTempPath = QFile::encodeName(tempDir->path() + QLatin1String("/s"));
+        encodedTempPath = QFile::encodeName(tempDir->path() + "/s"_L1);
     }
 
     // create the unix socket
     listenSocket = qt_safe_socket(PF_UNIX, SOCK_STREAM, 0);
     if (-1 == listenSocket) {
-        setError(QLatin1String("QLocalServer::listen"));
+        setError("QLocalServer::listen"_L1);
         closeServer();
         return false;
     }
@@ -145,7 +147,7 @@ bool QLocalServerPrivate::listen(const QString &requestedServerName)
     constexpr unsigned int extraCharacters = PlatformSupportsAbstractNamespace ? 2 : 1;
 
     if (sizeof(addr.sun_path) < static_cast<size_t>(encodedFullServerName.size() + extraCharacters)) {
-        setError(QLatin1String("QLocalServer::listen"));
+        setError("QLocalServer::listen"_L1);
         closeServer();
         return false;
     }
@@ -159,7 +161,7 @@ bool QLocalServerPrivate::listen(const QString &requestedServerName)
         addrSize = offsetof(::sockaddr_un, sun_path) + encodedFullServerName.size() + 1;
     } else if (options & QLocalServer::WorldAccessOption) {
         if (sizeof(addr.sun_path) < static_cast<size_t>(encodedTempPath.size() + 1)) {
-            setError(QLatin1String("QLocalServer::listen"));
+            setError("QLocalServer::listen"_L1);
             closeServer();
             return false;
         }
@@ -172,7 +174,7 @@ bool QLocalServerPrivate::listen(const QString &requestedServerName)
 
     // bind
     if (-1 == QT_SOCKET_BIND(listenSocket, (sockaddr *)&addr, addrSize)) {
-        setError(QLatin1String("QLocalServer::listen"));
+        setError("QLocalServer::listen"_L1);
         // if address is in use already, just close the socket, but do not delete the file
         if (errno == EADDRINUSE)
             QT_CLOSE(listenSocket);
@@ -185,7 +187,7 @@ bool QLocalServerPrivate::listen(const QString &requestedServerName)
 
     // listen for connections
     if (-1 == qt_safe_listen(listenSocket, listenBacklog)) {
-        setError(QLatin1String("QLocalServer::listen"));
+        setError("QLocalServer::listen"_L1);
         closeServer();
         return false;
     }
@@ -203,13 +205,13 @@ bool QLocalServerPrivate::listen(const QString &requestedServerName)
             mode |= S_IRWXO;
 
         if (::chmod(encodedTempPath.constData(), mode) == -1) {
-            setError(QLatin1String("QLocalServer::listen"));
+            setError("QLocalServer::listen"_L1);
             closeServer();
             return false;
         }
 
         if (::rename(encodedTempPath.constData(), encodedFullServerName.constData()) == -1) {
-            setError(QLatin1String("QLocalServer::listen"));
+            setError("QLocalServer::listen"_L1);
             closeServer();
             return false;
         }
@@ -301,7 +303,7 @@ void QLocalServerPrivate::_q_onNewConnection()
     QT_SOCKLEN_T length = sizeof(sockaddr_un);
     int connectedSocket = qt_safe_accept(listenSocket, (sockaddr *)&addr, &length);
     if (-1 == connectedSocket) {
-        setError(QLatin1String("QLocalSocket::activated"));
+        setError("QLocalSocket::activated"_L1);
         closeServer();
     } else {
         socketNotifier->setEnabled(pendingConnections.size()
@@ -330,7 +332,7 @@ void QLocalServerPrivate::waitForNewConnection(int msec, bool *timedOut)
         errno = EBADF;
         Q_FALLTHROUGH();
     case -1:
-        setError(QLatin1String("QLocalServer::waitForNewConnection"));
+        setError("QLocalServer::waitForNewConnection"_L1);
         closeServer();
         break;
     }
diff --git a/src/network/socket/qlocalserver_win.cpp b/src/network/socket/qlocalserver_win.cpp
index c8b356cb29..5e45b31410 100644
--- a/src/network/socket/qlocalserver_win.cpp
+++ b/src/network/socket/qlocalserver_win.cpp
@@ -55,6 +55,8 @@
 
 QT_BEGIN_NAMESPACE
 
+using namespace Qt::StringLiterals;
+
 bool QLocalServerPrivate::addListener()
 {
     // The object must not change its address once the
@@ -77,7 +79,7 @@ bool QLocalServerPrivate::addListener()
     if ((socketOptions.value() & QLocalServer::WorldAccessOption)) {
         pSD.reset(new SECURITY_DESCRIPTOR);
         if (!InitializeSecurityDescriptor(pSD.data(), SECURITY_DESCRIPTOR_REVISION)) {
-            setError(QLatin1String("QLocalServerPrivate::addListener"));
+            setError("QLocalServerPrivate::addListener"_L1);
             return false;
         }
         HANDLE hToken = NULL;
@@ -88,7 +90,7 @@ bool QLocalServerPrivate::addListener()
         tokenUserBuffer.fill(0, dwBufferSize);
         auto pTokenUser = reinterpret_cast<PTOKEN_USER>(tokenUserBuffer.data());
         if (!GetTokenInformation(hToken, TokenUser, pTokenUser, dwBufferSize, &dwBufferSize)) {
-            setError(QLatin1String("QLocalServerPrivate::addListener"));
+            setError("QLocalServerPrivate::addListener"_L1);
             CloseHandle(hToken);
             return false;
         }
@@ -98,7 +100,7 @@ bool QLocalServerPrivate::addListener()
         tokenGroupBuffer.fill(0, dwBufferSize);
         auto pTokenGroup = reinterpret_cast<PTOKEN_PRIMARY_GROUP>(tokenGroupBuffer.data());
         if (!GetTokenInformation(hToken, TokenPrimaryGroup, pTokenGroup, dwBufferSize, &dwBufferSize)) {
-            setError(QLatin1String("QLocalServerPrivate::addListener"));
+            setError("QLocalServerPrivate::addListener"_L1);
             CloseHandle(hToken);
             return false;
         }
@@ -125,7 +127,7 @@ bool QLocalServerPrivate::addListener()
         if (!AllocateAndInitializeSid(&WorldAuth, 1, SECURITY_WORLD_RID,
             0, 0, 0, 0, 0, 0, 0,
             &worldSID)) {
-            setError(QLatin1String("QLocalServerPrivate::addListener"));
+            setError("QLocalServerPrivate::addListener"_L1);
             return false;
         }
 
@@ -142,21 +144,21 @@ bool QLocalServerPrivate::addListener()
 
         if (socketOptions.value() & QLocalServer::UserAccessOption) {
             if (!AddAccessAllowedAce(acl, ACL_REVISION, FILE_ALL_ACCESS, pTokenUser->User.Sid)) {
-                setError(QLatin1String("QLocalServerPrivate::addListener"));
+                setError("QLocalServerPrivate::addListener"_L1);
                 FreeSid(worldSID);
                 return false;
             }
         }
         if (socketOptions.value() & QLocalServer::GroupAccessOption) {
             if (!AddAccessAllowedAce(acl, ACL_REVISION, FILE_ALL_ACCESS, pTokenGroup->PrimaryGroup)) {
-                setError(QLatin1String("QLocalServerPrivate::addListener"));
+                setError("QLocalServerPrivate::addListener"_L1);
                 FreeSid(worldSID);
                 return false;
             }
         }
         if (socketOptions.value() & QLocalServer::OtherAccessOption) {
             if (!AddAccessAllowedAce(acl, ACL_REVISION, FILE_ALL_ACCESS, worldSID)) {
-                setError(QLatin1String("QLocalServerPrivate::addListener"));
+                setError("QLocalServerPrivate::addListener"_L1);
                 FreeSid(worldSID);
                 return false;
             }
@@ -164,7 +166,7 @@ bool QLocalServerPrivate::addListener()
         SetSecurityDescriptorOwner(pSD.data(), pTokenUser->User.Sid, FALSE);
         SetSecurityDescriptorGroup(pSD.data(), pTokenGroup->PrimaryGroup, FALSE);
         if (!SetSecurityDescriptorDacl(pSD.data(), TRUE, acl, FALSE)) {
-            setError(QLatin1String("QLocalServerPrivate::addListener"));
+            setError("QLocalServerPrivate::addListener"_L1);
             FreeSid(worldSID);
             return false;
         }
@@ -185,7 +187,7 @@ bool QLocalServerPrivate::addListener()
                  &sa);
 
     if (listener->handle == INVALID_HANDLE_VALUE) {
-        setError(QLatin1String("QLocalServerPrivate::addListener"));
+        setError("QLocalServerPrivate::addListener"_L1);
         listeners.pop_back();
         return false;
     }
@@ -208,7 +210,7 @@ bool QLocalServerPrivate::addListener()
             break;
         default:
             CloseHandle(listener->handle);
-            setError(QLatin1String("QLocalServerPrivate::addListener"));
+            setError("QLocalServerPrivate::addListener"_L1);
             listeners.pop_back();
             return false;
         }
@@ -240,7 +242,7 @@ bool QLocalServerPrivate::listen(const QString &name)
 {
     Q_Q(QLocalServer);
 
-    const QLatin1String pipePath("\\\\.\\pipe\\");
+    const auto pipePath = "\\\\.\\pipe\\"_L1;
     if (name.startsWith(pipePath))
         fullServerName = name;
     else
@@ -300,7 +302,7 @@ void QLocalServerPrivate::_q_onNewConnection()
             } else {
                 if (GetLastError() != ERROR_IO_INCOMPLETE) {
                     q->close();
-                    setError(QLatin1String("QLocalServerPrivate::_q_onNewConnection"));
+                    setError("QLocalServerPrivate::_q_onNewConnection"_L1);
                     return;
                 }
 
diff --git a/src/network/socket/qlocalsocket_tcp.cpp b/src/network/socket/qlocalsocket_tcp.cpp
index 7b3e7c2820..db9c536bd7 100644
--- a/src/network/socket/qlocalsocket_tcp.cpp
+++ b/src/network/socket/qlocalsocket_tcp.cpp
@@ -47,6 +47,8 @@
 
 QT_BEGIN_NAMESPACE
 
+using namespace Qt::StringLiterals;
+
 QLocalSocketPrivate::QLocalSocketPrivate() : QIODevicePrivate(),
         tcpSocket(0),
         ownsTcpSocket(true),
@@ -85,7 +87,7 @@ void QLocalSocketPrivate::setSocket(QLocalUnixSocket* socket)
 void QLocalSocketPrivate::_q_errorOccurred(QAbstractSocket::SocketError socketError)
 {
     Q_Q(QLocalSocket);
-    QString function = QLatin1String("QLocalSocket");
+    QString function = "QLocalSocket"_L1;
     QLocalSocket::LocalSocketError error = (QLocalSocket::LocalSocketError)socketError;
     QString errorString = generateErrorString(error, function);
     q->setErrorString(errorString);
@@ -225,23 +227,21 @@ void QLocalSocket::connectToServer(OpenMode openMode)
     emit stateChanged(d->state);
 
     if (d->serverName.isEmpty()) {
-        d->setErrorAndEmit(ServerNotFoundError,
-                           QLatin1String("QLocalSocket::connectToServer"));
+        d->setErrorAndEmit(ServerNotFoundError, "QLocalSocket::connectToServer"_L1);
         return;
     }
 
-    const QLatin1String prefix("QLocalServer/");
+    const auto prefix = "QLocalServer/"_L1;
     if (d->serverName.startsWith(prefix))
         d->fullServerName = d->serverName;
     else
         d->fullServerName = prefix + d->serverName;
 
-    QSettings settings(QLatin1String("QtProject"), QLatin1String("Qt"));
+    QSettings settings("QtProject"_L1, "Qt"_L1);
     bool ok;
     const quint16 port = settings.value(d->fullServerName).toUInt(&ok);
     if (!ok) {
-        d->setErrorAndEmit(ServerNotFoundError,
-                           QLatin1String("QLocalSocket::connectToServer"));
+        d->setErrorAndEmit(ServerNotFoundError, "QLocalSocket::connectToServer"_L1);
         return;
     }
     QIODevice::open(openMode);
diff --git a/src/network/socket/qlocalsocket_unix.cpp b/src/network/socket/qlocalsocket_unix.cpp
index 5e0a49d0ba..f6acc6a97c 100644
--- a/src/network/socket/qlocalsocket_unix.cpp
+++ b/src/network/socket/qlocalsocket_unix.cpp
@@ -62,6 +62,8 @@
 
 QT_BEGIN_NAMESPACE
 
+using namespace Qt::StringLiterals;
+
 namespace {
 // determine the full server path
 static QString pathNameForConnection(const QString &connectingName,
@@ -115,7 +117,7 @@ void QLocalSocketPrivate::init()
 void QLocalSocketPrivate::_q_errorOccurred(QAbstractSocket::SocketError socketError)
 {
     Q_Q(QLocalSocket);
-    QString function = QLatin1String("QLocalSocket");
+    QString function = "QLocalSocket"_L1;
     QLocalSocket::LocalSocketError error = (QLocalSocket::LocalSocketError)socketError;
     QString errorString = generateErrorString(error, function);
     q->setErrorString(errorString);
@@ -245,7 +247,7 @@ void QLocalSocket::connectToServer(OpenMode openMode)
 {
     Q_D(QLocalSocket);
     if (state() == ConnectedState || state() == ConnectingState) {
-        QString errorString = d->generateErrorString(QLocalSocket::OperationError, QLatin1String("QLocalSocket::connectToserver"));
+        QString errorString = d->generateErrorString(QLocalSocket::OperationError, "QLocalSocket::connectToserver"_L1);
         setErrorString(errorString);
         emit errorOccurred(QLocalSocket::OperationError);
         return;
@@ -257,15 +259,13 @@ void QLocalSocket::connectToServer(OpenMode openMode)
     emit stateChanged(d->state);
 
     if (d->serverName.isEmpty()) {
-        d->setErrorAndEmit(ServerNotFoundError,
-                           QLatin1String("QLocalSocket::connectToServer"));
+        d->setErrorAndEmit(ServerNotFoundError, "QLocalSocket::connectToServer"_L1);
         return;
     }
 
     // create the socket
     if (-1 == (d->connectingSocket = qt_safe_socket(PF_UNIX, SOCK_STREAM, 0, O_NONBLOCK))) {
-        d->setErrorAndEmit(UnsupportedSocketOperationError,
-                           QLatin1String("QLocalSocket::connectToServer"));
+        d->setErrorAndEmit(UnsupportedSocketOperationError, "QLocalSocket::connectToServer"_L1);
         return;
     }
 
@@ -298,7 +298,7 @@ void QLocalSocketPrivate::_q_connectToSocket()
     constexpr unsigned int extraCharacters = PlatformSupportsAbstractNamespace ? 2 : 1;
 
     if (sizeof(addr.sun_path) < static_cast<size_t>(encodedConnectingPathName.size() + extraCharacters)) {
-        QString function = QLatin1String("QLocalSocket::connectToServer");
+        QString function = "QLocalSocket::connectToServer"_L1;
         setErrorAndEmit(QLocalSocket::ServerNotFoundError, function);
         return;
     }
@@ -313,7 +313,7 @@ void QLocalSocketPrivate::_q_connectToSocket()
                  encodedConnectingPathName.size() + 1);
     }
     if (-1 == qt_safe_connect(connectingSocket, (struct sockaddr *)&addr, addrSize)) {
-        QString function = QLatin1String("QLocalSocket::connectToServer");
+        QString function = "QLocalSocket::connectToServer"_L1;
         switch (errno)
         {
         case EINVAL:
@@ -361,7 +361,7 @@ void QLocalSocketPrivate::_q_connectToSocket()
         q->QIODevice::open(connectingOpenMode);
         q->emit connected();
     } else {
-        QString function = QLatin1String("QLocalSocket::connectToServer");
+        QString function = "QLocalSocket::connectToServer"_L1;
         setErrorAndEmit(QLocalSocket::UnknownSocketError, function);
     }
     connectingSocket = -1;
@@ -632,7 +632,7 @@ bool QLocalSocket::waitForConnected(int msec)
 
         if (result == -1)
             d->setErrorAndEmit(QLocalSocket::UnknownSocketError,
-                               QLatin1String("QLocalSocket::waitForConnected"));
+                               "QLocalSocket::waitForConnected"_L1);
         else if (result > 0)
             d->_q_connectToSocket();
     } while (state() == ConnectingState && !timer.hasExpired(msec));
diff --git a/src/network/socket/qlocalsocket_win.cpp b/src/network/socket/qlocalsocket_win.cpp
index f7e72c055b..3c9a4152c8 100644
--- a/src/network/socket/qlocalsocket_win.cpp
+++ b/src/network/socket/qlocalsocket_win.cpp
@@ -43,6 +43,8 @@
 
 QT_BEGIN_NAMESPACE
 
+using namespace Qt::StringLiterals;
+
 namespace {
 struct QSocketPoller
 {
@@ -197,14 +199,14 @@ void QLocalSocket::connectToServer(OpenMode openMode)
     emit stateChanged(d->state);
     if (d->serverName.isEmpty()) {
         d->error = ServerNotFoundError;
-        d->errorString = tr("%1: Invalid name").arg(QLatin1String("QLocalSocket::connectToServer"));
+        d->errorString = tr("%1: Invalid name").arg("QLocalSocket::connectToServer"_L1);
         d->state = UnconnectedState;
         emit errorOccurred(d->error);
         emit stateChanged(d->state);
         return;
     }
 
-    const QLatin1String pipePath("\\\\.\\pipe\\");
+    const auto pipePath = "\\\\.\\pipe\\"_L1;
     if (d->serverName.startsWith(pipePath))
         d->fullServerName = d->serverName;
     else
@@ -237,7 +239,7 @@ void QLocalSocket::connectToServer(OpenMode openMode)
 
     if (localSocket == INVALID_HANDLE_VALUE) {
         const DWORD winError = GetLastError();
-        d->_q_winError(winError, QLatin1String("QLocalSocket::connectToServer"));
+        d->_q_winError(winError, "QLocalSocket::connectToServer"_L1);
         d->fullServerName = QString();
         return;
     }
diff --git a/src/network/socket/qnativesocketengine.cpp b/src/network/socket/qnativesocketengine.cpp
index dfc8d96821..91a7439311 100644
--- a/src/network/socket/qnativesocketengine.cpp
+++ b/src/network/socket/qnativesocketengine.cpp
@@ -135,6 +135,8 @@
 
 QT_BEGIN_NAMESPACE
 
+using namespace Qt::StringLiterals;
+
 //#define QNATIVESOCKETENGINE_DEBUG
 
 #define Q_VOID
@@ -448,13 +450,13 @@ bool QNativeSocketEngine::initialize(QAbstractSocket::SocketType socketType, QAb
     // Create the socket
     if (!d->createNewSocket(socketType, protocol)) {
 #if defined (QNATIVESOCKETENGINE_DEBUG)
-        QString typeStr = QLatin1String("UnknownSocketType");
-        if (socketType == QAbstractSocket::TcpSocket) typeStr = QLatin1String("TcpSocket");
-        else if (socketType == QAbstractSocket::UdpSocket) typeStr = QLatin1String("UdpSocket");
-        else if (socketType == QAbstractSocket::SctpSocket) typeStr = QLatin1String("SctpSocket");
-        QString protocolStr = QLatin1String("UnknownProtocol");
-        if (protocol == QAbstractSocket::IPv4Protocol) protocolStr = QLatin1String("IPv4Protocol");
-        else if (protocol == QAbstractSocket::IPv6Protocol) protocolStr = QLatin1String("IPv6Protocol");
+        QString typeStr = "UnknownSocketType"_L1;
+        if (socketType == QAbstractSocket::TcpSocket) typeStr = "TcpSocket"_L1;
+        else if (socketType == QAbstractSocket::UdpSocket) typeStr = "UdpSocket"_L1;
+        else if (socketType == QAbstractSocket::SctpSocket) typeStr = "SctpSocket"_L1;
+        QString protocolStr = "UnknownProtocol"_L1;
+        if (protocol == QAbstractSocket::IPv4Protocol) protocolStr = "IPv4Protocol"_L1;
+        else if (protocol == QAbstractSocket::IPv6Protocol) protocolStr = "IPv6Protocol"_L1;
         qDebug("QNativeSocketEngine::initialize(type == %s, protocol == %s) failed: %s",
                typeStr.toLatin1().constData(), protocolStr.toLatin1().constData(), d->socketErrorString.toLatin1().constData());
 #endif
diff --git a/src/network/socket/qsocks5socketengine.cpp b/src/network/socket/qsocks5socketengine.cpp
index ff0cc8ecfe..3625041efb 100644
--- a/src/network/socket/qsocks5socketengine.cpp
+++ b/src/network/socket/qsocks5socketengine.cpp
@@ -60,6 +60,8 @@
 
 QT_BEGIN_NAMESPACE
 
+using namespace Qt::StringLiterals;
+
 static const int MaxWriteBufferSize = 128*1024;
 
 //#define QSOCKS5SOCKETLAYER_DEBUG
@@ -102,22 +104,22 @@ static const int MaxWriteBufferSize = 128*1024;
 static QString s5StateToString(QSocks5SocketEnginePrivate::Socks5State s)
 {
     switch (s) {
-    case QSocks5SocketEnginePrivate::Uninitialized: return QLatin1String("Uninitialized");
-    case QSocks5SocketEnginePrivate::ConnectError: return QLatin1String("ConnectError");
-    case QSocks5SocketEnginePrivate::AuthenticationMethodsSent: return QLatin1String("AuthenticationMethodsSent");
-    case QSocks5SocketEnginePrivate::Authenticating: return QLatin1String("Authenticating");
-    case QSocks5SocketEnginePrivate::AuthenticatingError: return QLatin1String("AuthenticatingError");
-    case QSocks5SocketEnginePrivate::RequestMethodSent: return QLatin1String("RequestMethodSent");
-    case QSocks5SocketEnginePrivate::RequestError: return QLatin1String("RequestError");
-    case QSocks5SocketEnginePrivate::Connected: return QLatin1String("Connected");
-    case QSocks5SocketEnginePrivate::UdpAssociateSuccess: return QLatin1String("UdpAssociateSuccess");
-    case QSocks5SocketEnginePrivate::BindSuccess: return QLatin1String("BindSuccess");
-    case QSocks5SocketEnginePrivate::ControlSocketError: return QLatin1String("ControlSocketError");
-    case QSocks5SocketEnginePrivate::SocksError: return QLatin1String("SocksError");
-    case QSocks5SocketEnginePrivate::HostNameLookupError: return QLatin1String("HostNameLookupError");
+    case QSocks5SocketEnginePrivate::Uninitialized: return "Uninitialized"_L1;
+    case QSocks5SocketEnginePrivate::ConnectError: return "ConnectError"_L1;
+    case QSocks5SocketEnginePrivate::AuthenticationMethodsSent: return "AuthenticationMethodsSent"_L1;
+    case QSocks5SocketEnginePrivate::Authenticating: return "Authenticating"_L1;
+    case QSocks5SocketEnginePrivate::AuthenticatingError: return "AuthenticatingError"_L1;
+    case QSocks5SocketEnginePrivate::RequestMethodSent: return "RequestMethodSent"_L1;
+    case QSocks5SocketEnginePrivate::RequestError: return "RequestError"_L1;
+    case QSocks5SocketEnginePrivate::Connected: return "Connected"_L1;
+    case QSocks5SocketEnginePrivate::UdpAssociateSuccess: return "UdpAssociateSuccess"_L1;
+    case QSocks5SocketEnginePrivate::BindSuccess: return "BindSuccess"_L1;
+    case QSocks5SocketEnginePrivate::ControlSocketError: return "ControlSocketError"_L1;
+    case QSocks5SocketEnginePrivate::SocksError: return "SocksError"_L1;
+    case QSocks5SocketEnginePrivate::HostNameLookupError: return "HostNameLookupError"_L1;
     default: break;
     }
-    return QLatin1String("unknown state");
+    return "unknown state"_L1;
 }
 
 static QString dump(const QByteArray &buf)
@@ -130,7 +132,7 @@ static QString dump(const QByteArray &buf)
         data += QString::number(val);
     }
     if (buf.size() > MAX_DATA_DUMP)
-        data += QLatin1String(" ...");
+        data += " ..."_L1;
 
     return QString::fromLatin1("size: %1 data: { %2 }").arg(buf.size()).arg(data);
 }
@@ -494,7 +496,7 @@ bool QSocks5PasswordAuthenticator::continueAuthenticate(QTcpSocket *socket, bool
 
 QString QSocks5PasswordAuthenticator::errorString()
 {
-    return QLatin1String("Socks5 user name or password incorrect");
+    return "Socks5 user name or password incorrect"_L1;
 }
 
 
@@ -749,7 +751,7 @@ void QSocks5SocketEnginePrivate::parseAuthenticationMethodReply()
         return;
     } else if (buf.at(1) != data->authenticator->methodId()
                || !data->authenticator->beginAuthenticate(data->controlSocket, &authComplete)) {
-        setErrorState(AuthenticatingError, QLatin1String("Socks5 host did not support authentication method."));
+        setErrorState(AuthenticatingError, "Socks5 host did not support authentication method."_L1);
         socketError = QAbstractSocket::SocketAccessError; // change the socket error
         emitConnectionNotification();
         return;
@@ -1102,7 +1104,7 @@ bool QSocks5SocketEngine::connectInternal()
         } else if (socketType() == QAbstractSocket::UdpSocket) {
             d->initialize(QSocks5SocketEnginePrivate::UdpAssociateMode);
             // all udp needs to be bound
-            if (!bind(QHostAddress(QLatin1String("0.0.0.0")), 0))
+            if (!bind(QHostAddress("0.0.0.0"_L1), 0))
                 return false;
 
             setState(QAbstractSocket::ConnectedState);
@@ -1439,10 +1441,10 @@ int QSocks5SocketEngine::accept()
         d->socketState = QAbstractSocket::UnconnectedState;
         break;
     case QSocks5SocketEnginePrivate::ControlSocketError:
-        setError(QAbstractSocket::ProxyProtocolError, QLatin1String("Control socket error"));
+        setError(QAbstractSocket::ProxyProtocolError, "Control socket error"_L1);
         break;
     default:
-        setError(QAbstractSocket::ProxyProtocolError, QLatin1String("SOCKS5 proxy error"));
+        setError(QAbstractSocket::ProxyProtocolError, "SOCKS5 proxy error"_L1);
         break;
     }
     return sd;
@@ -1494,7 +1496,7 @@ qint64 QSocks5SocketEngine::read(char *data, qint64 maxlen)
                 //imitate remote closed
                 close();
                 setError(QAbstractSocket::RemoteHostClosedError,
-                         QLatin1String("Remote host closed connection###"));
+                         "Remote host closed connection###"_L1);
                 setState(QAbstractSocket::UnconnectedState);
                 return -1;
             } else {
@@ -1557,7 +1559,7 @@ bool QSocks5SocketEngine::joinMulticastGroup(const QHostAddress &,
                                              const QNetworkInterface &)
 {
     setError(QAbstractSocket::UnsupportedSocketOperationError,
-             QLatin1String("Operation on socket is not supported"));
+             "Operation on socket is not supported"_L1);
     return false;
 }
 
@@ -1565,7 +1567,7 @@ bool QSocks5SocketEngine::leaveMulticastGroup(const QHostAddress &,
                                               const QNetworkInterface &)
 {
     setError(QAbstractSocket::UnsupportedSocketOperationError,
-             QLatin1String("Operation on socket is not supported"));
+             "Operation on socket is not supported"_L1);
     return false;
 }
 
@@ -1578,7 +1580,7 @@ QNetworkInterface QSocks5SocketEngine::multicastInterface() const
 bool QSocks5SocketEngine::setMulticastInterface(const QNetworkInterface &)
 {
     setError(QAbstractSocket::UnsupportedSocketOperationError,
-             QLatin1String("Operation on socket is not supported"));
+             "Operation on socket is not supported"_L1);
     return false;
 }
 #endif // QT_NO_NETWORKINTERFACE
@@ -1634,7 +1636,7 @@ qint64 QSocks5SocketEngine::writeDatagram(const char *data, qint64 len, const QI
     if (!d->data) {
         d->initialize(QSocks5SocketEnginePrivate::UdpAssociateMode);
         // all udp needs to be bound
-        if (!bind(QHostAddress(QLatin1String("0.0.0.0")), 0)) {
+        if (!bind(QHostAddress("0.0.0.0"_L1), 0)) {
             //### set error
             return -1;
         }