From 6df137ca2f770e458231f4548e08ca0192bffaf8 Mon Sep 17 00:00:00 2001 From: Sona Kurazyan Date: Fri, 22 Apr 2022 16:31:23 +0200 Subject: Platformsupport: use _L1 for for creating Latin-1 string literals Task-number: QTBUG-98434 Change-Id: I4fa7ca58b4a298e81d35f19b439ed7702bd9700d Reviewed-by: Qt CI Bot Reviewed-by: Marc Mutz --- src/platformsupport/input/shared/qevdevutil.cpp | 4 +++- src/platformsupport/input/shared/qoutputmapping.cpp | 4 +++- 2 files changed, 6 insertions(+), 2 deletions(-) (limited to 'src/platformsupport/input/shared') diff --git a/src/platformsupport/input/shared/qevdevutil.cpp b/src/platformsupport/input/shared/qevdevutil.cpp index 31afabe56a..3466a5f685 100644 --- a/src/platformsupport/input/shared/qevdevutil.cpp +++ b/src/platformsupport/input/shared/qevdevutil.cpp @@ -41,6 +41,8 @@ QT_BEGIN_NAMESPACE +using namespace Qt::StringLiterals; + namespace QEvdevUtil { ParsedSpecification parseSpecification(const QString &specification) @@ -50,7 +52,7 @@ ParsedSpecification parseSpecification(const QString &specification) result.args = QStringView{specification}.split(u':'); for (const auto &arg : qAsConst(result.args)) { - if (arg.startsWith(QLatin1String("/dev/"))) { + if (arg.startsWith("/dev/"_L1)) { // if device is specified try to use it result.devices.append(arg.toString()); } else { diff --git a/src/platformsupport/input/shared/qoutputmapping.cpp b/src/platformsupport/input/shared/qoutputmapping.cpp index b1c428dee2..9cb193b315 100644 --- a/src/platformsupport/input/shared/qoutputmapping.cpp +++ b/src/platformsupport/input/shared/qoutputmapping.cpp @@ -47,6 +47,8 @@ QT_BEGIN_NAMESPACE +using namespace Qt::StringLiterals; + static QOutputMapping *s_outputMapping = nullptr; QOutputMapping *QOutputMapping::get() @@ -104,7 +106,7 @@ bool QDefaultOutputMapping::load() // What we are interested is the virtualIndex and touchDevice properties for // each element in the outputs array. - const QJsonArray outputs = doc.object().value(QLatin1String("outputs")).toArray(); + const QJsonArray outputs = doc.object().value("outputs"_L1).toArray(); for (int i = 0; i < outputs.size(); ++i) { const QVariantMap output = outputs.at(i).toObject().toVariantMap(); if (!output.contains(QStringLiteral("touchDevice"))) -- cgit v1.2.3