diff options
| author | Sona Kurazyan <sona.kurazyan@qt.io> | 2022-04-12 14:01:55 +0200 |
|---|---|---|
| committer | Sona Kurazyan <sona.kurazyan@qt.io> | 2022-04-21 23:53:15 +0200 |
| commit | f2637e1a77a5965a23e54c07587885f5a04ec877 (patch) | |
| tree | 4564a5c63987750fb10da013b332aefe4a8825c7 /src/plugins/tls | |
| parent | e2a13299101d27800d3d1d88b91635e66d52d5c0 (diff) | |
QtNetwork: stop using QLatin1Char constructor for creating char literals
Required for porting away from QLatin1Char/QLatin1String in scope of
QTBUG-98434.
As a drive-by, fix qsizetype -> int narrowing conversion warnings for
the touched lines.
Change-Id: I121f87214b77aeab1dfd3e62dc5adaa6255cc0e0
Reviewed-by: Mårten Nordheim <marten.nordheim@qt.io>
Diffstat (limited to 'src/plugins/tls')
| -rw-r--r-- | src/plugins/tls/openssl/qsslsocket_openssl_symbols.cpp | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/src/plugins/tls/openssl/qsslsocket_openssl_symbols.cpp b/src/plugins/tls/openssl/qsslsocket_openssl_symbols.cpp index e85c9ca051..a483c92bd2 100644 --- a/src/plugins/tls/openssl/qsslsocket_openssl_symbols.cpp +++ b/src/plugins/tls/openssl/qsslsocket_openssl_symbols.cpp @@ -583,8 +583,8 @@ struct LibGreaterThan typedef bool result_type; result_type operator()(QStringView lhs, QStringView rhs) const { - const auto lhsparts = lhs.split(QLatin1Char('.')); - const auto rhsparts = rhs.split(QLatin1Char('.')); + const auto lhsparts = lhs.split(u'.'); + const auto rhsparts = rhs.split(u'.'); Q_ASSERT(lhsparts.count() > 1 && rhsparts.count() > 1); // note: checking rhs < lhs, the same as lhs > rhs @@ -615,8 +615,7 @@ static QStringList libraryPathList() { QStringList paths; # ifdef Q_OS_DARWIN - paths = QString::fromLatin1(qgetenv("DYLD_LIBRARY_PATH")) - .split(QLatin1Char(':'), Qt::SkipEmptyParts); + paths = QString::fromLatin1(qgetenv("DYLD_LIBRARY_PATH")).split(u':', Qt::SkipEmptyParts); // search in .app/Contents/Frameworks UInt32 packageType; @@ -627,8 +626,7 @@ static QStringList libraryPathList() paths << bundleUrl.resolved(frameworksUrl).path(); } # else - paths = QString::fromLatin1(qgetenv("LD_LIBRARY_PATH")) - .split(QLatin1Char(':'), Qt::SkipEmptyParts); + paths = QString::fromLatin1(qgetenv("LD_LIBRARY_PATH")).split(u':', Qt::SkipEmptyParts); # endif paths << QLatin1String("/lib") << QLatin1String("/usr/lib") << QLatin1String("/usr/local/lib"); paths << QLatin1String("/lib64") << QLatin1String("/usr/lib64") << QLatin1String("/usr/local/lib64"); @@ -659,7 +657,7 @@ static QStringList findAllLibs(QLatin1String filter) std::sort(entryList.begin(), entryList.end(), LibGreaterThan()); for (const QString &entry : qAsConst(entryList)) - found << path + QLatin1Char('/') + entry; + found << path + u'/' + entry; } return found; |