From 301f0a6fb025968ee73c74b8dffea1e7fe6f67e0 Mon Sep 17 00:00:00 2001
From: Sona Kurazyan <sona.kurazyan@qt.io>
Date: Tue, 12 Apr 2022 15:12:22 +0200
Subject: QtNetwork: replace remaining uses of QLatin1String by
 QLatin1StringView
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Task-number: QTBUG-98434
Change-Id: I0bb9d534ee42ccbf7d353e251ef58901a86923b4
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Mårten Nordheim <marten.nordheim@qt.io>
---
 src/plugins/tls/openssl/qdtls_openssl.cpp              | 2 +-
 src/plugins/tls/openssl/qsslsocket_openssl_symbols.cpp | 4 ++--
 src/plugins/tls/openssl/qtls_openssl.cpp               | 2 +-
 src/plugins/tls/openssl/qtlsbackend_openssl.cpp        | 4 ++--
 src/plugins/tls/securetransport/qtls_st.cpp            | 2 +-
 5 files changed, 7 insertions(+), 7 deletions(-)

(limited to 'src/plugins/tls')

diff --git a/src/plugins/tls/openssl/qdtls_openssl.cpp b/src/plugins/tls/openssl/qdtls_openssl.cpp
index a1f2c707f9..7a2c29d7a4 100644
--- a/src/plugins/tls/openssl/qdtls_openssl.cpp
+++ b/src/plugins/tls/openssl/qdtls_openssl.cpp
@@ -653,7 +653,7 @@ bool DtlsState::initTls(QDtlsBasePrivate *dtlsBase)
 static QString msgFunctionFailed(const char *function)
 {
     //: %1: Some function
-    return QDtls::tr("%1 failed").arg(QLatin1String(function));
+    return QDtls::tr("%1 failed").arg(QLatin1StringView(function));
 }
 
 bool DtlsState::initCtxAndConnection(QDtlsBasePrivate *dtlsBase)
diff --git a/src/plugins/tls/openssl/qsslsocket_openssl_symbols.cpp b/src/plugins/tls/openssl/qsslsocket_openssl_symbols.cpp
index 30797e5a29..7bcd205b3a 100644
--- a/src/plugins/tls/openssl/qsslsocket_openssl_symbols.cpp
+++ b/src/plugins/tls/openssl/qsslsocket_openssl_symbols.cpp
@@ -647,7 +647,7 @@ static QStringList libraryPathList()
 }
 
 Q_NEVER_INLINE
-static QStringList findAllLibs(QLatin1String filter)
+static QStringList findAllLibs(QLatin1StringView filter)
 {
     const QStringList paths = libraryPathList();
     QStringList found;
@@ -682,7 +682,7 @@ struct LoadedOpenSsl {
     std::unique_ptr<QSystemLibrary> ssl, crypto;
 };
 
-static bool tryToLoadOpenSslWin32Library(QLatin1String ssleay32LibName, QLatin1String libeay32LibName, LoadedOpenSsl &result)
+static bool tryToLoadOpenSslWin32Library(QLatin1StringView ssleay32LibName, QLatin1StringView libeay32LibName, LoadedOpenSsl &result)
 {
     auto ssleay32 = std::make_unique<QSystemLibrary>(ssleay32LibName);
     if (!ssleay32->load(false)) {
diff --git a/src/plugins/tls/openssl/qtls_openssl.cpp b/src/plugins/tls/openssl/qtls_openssl.cpp
index f022ebcd6d..d95756e2d2 100644
--- a/src/plugins/tls/openssl/qtls_openssl.cpp
+++ b/src/plugins/tls/openssl/qtls_openssl.cpp
@@ -85,7 +85,7 @@ QSsl::AlertLevel tlsAlertLevel(int value)
 
 QString tlsAlertDescription(int value)
 {
-    QString description = QLatin1String(q_SSL_alert_desc_string_long(value));
+    QString description = QLatin1StringView(q_SSL_alert_desc_string_long(value));
     if (!description.size())
         description = "no description provided"_L1;
     return description;
diff --git a/src/plugins/tls/openssl/qtlsbackend_openssl.cpp b/src/plugins/tls/openssl/qtlsbackend_openssl.cpp
index 6693cc8142..61613dc0f9 100644
--- a/src/plugins/tls/openssl/qtlsbackend_openssl.cpp
+++ b/src/plugins/tls/openssl/qtlsbackend_openssl.cpp
@@ -230,7 +230,7 @@ void QTlsBackendOpenSSL::ensureCiphersAndCertsLoaded() const
     QStringList symLinkFilter;
     symLinkFilter << "[0-9a-f][0-9a-f][0-9a-f][0-9a-f][0-9a-f][0-9a-f][0-9a-f][0-9a-f].[0-9]"_L1;
     for (const auto &dir : dirs) {
-        QDirIterator iterator(QLatin1String(dir), symLinkFilter, QDir::Files);
+        QDirIterator iterator(QLatin1StringView(dir), symLinkFilter, QDir::Files);
         if (iterator.hasNext()) {
             QSslSocketPrivate::setRootCertOnDemandLoadingSupported(true);
             break;
@@ -414,7 +414,7 @@ QList<QSslCertificate> systemCaCertificates()
         QDir currentDir;
         currentDir.setNameFilters(QStringList{QStringLiteral("*.pem"), QStringLiteral("*.crt")});
         for (const auto &directory : directories) {
-            currentDir.setPath(QLatin1String(directory));
+            currentDir.setPath(QLatin1StringView(directory));
             QDirIterator it(currentDir);
             while (it.hasNext()) {
                 // use canonical path here to not load the same certificate twice if symlinked
diff --git a/src/plugins/tls/securetransport/qtls_st.cpp b/src/plugins/tls/securetransport/qtls_st.cpp
index 60127ca885..38beb0c6a4 100644
--- a/src/plugins/tls/securetransport/qtls_st.cpp
+++ b/src/plugins/tls/securetransport/qtls_st.cpp
@@ -119,7 +119,7 @@ EphemeralSecKeychain::EphemeralSecKeychain()
     Q_ASSERT(uuidAsByteArray.size() > 2);
     Q_ASSERT(uuidAsByteArray.startsWith('{'));
     Q_ASSERT(uuidAsByteArray.endsWith('}'));
-    const auto uuidAsString = QLatin1String(uuidAsByteArray.data(), uuidAsByteArray.size()).mid(1, uuidAsByteArray.size() - 2);
+    const auto uuidAsString = QLatin1StringView(uuidAsByteArray.data(), uuidAsByteArray.size()).mid(1, uuidAsByteArray.size() - 2);
 
     const QString keychainName
             = QDir::tempPath() + QDir::separator() + uuidAsString + ".keychain"_L1;
-- 
cgit v1.2.3