From 9a55c695c7ecb8a2154661462255423a20ef4097 Mon Sep 17 00:00:00 2001
From: Sona Kurazyan <sona.kurazyan@qt.io>
Date: Mon, 11 Apr 2022 17:27:52 +0200
Subject: QtGui: replace remaining uses of QLatin1String with QLatin1StringView

Task-number: QTBUG-98434
Change-Id: I98c27030c783f968cbf38dc966ce486dc366b302
Reviewed-by: Edward Welbourne <edward.welbourne@qt.io>
---
 src/gui/accessible/linux/atspiadaptor.cpp         | 20 ++++++++++----------
 src/gui/accessible/linux/qspiaccessiblebridge.cpp |  2 +-
 src/gui/accessible/qaccessible.cpp                |  2 +-
 3 files changed, 12 insertions(+), 12 deletions(-)

(limited to 'src/gui/accessible')

diff --git a/src/gui/accessible/linux/atspiadaptor.cpp b/src/gui/accessible/linux/atspiadaptor.cpp
index 374a9d15c3..d245bbdaaf 100644
--- a/src/gui/accessible/linux/atspiadaptor.cpp
+++ b/src/gui/accessible/linux/atspiadaptor.cpp
@@ -152,7 +152,7 @@ AtSpiAdaptor::~AtSpiAdaptor()
   */
 QString AtSpiAdaptor::introspect(const QString &path) const
 {
-    static const QLatin1String accessibleIntrospection(
+    static const QLatin1StringView accessibleIntrospection(
                 "  <interface name=\"org.a11y.atspi.Accessible\">\n"
                 "    <property access=\"read\" type=\"s\" name=\"Name\"/>\n"
                 "    <property access=\"read\" type=\"s\" name=\"Description\"/>\n"
@@ -200,7 +200,7 @@ QString AtSpiAdaptor::introspect(const QString &path) const
                 "  </interface>\n"
                 );
 
-    static const QLatin1String actionIntrospection(
+    static const QLatin1StringView actionIntrospection(
                 "  <interface name=\"org.a11y.atspi.Action\">\n"
                 "    <property access=\"read\" type=\"i\" name=\"NActions\"/>\n"
                 "    <method name=\"GetDescription\">\n"
@@ -226,7 +226,7 @@ QString AtSpiAdaptor::introspect(const QString &path) const
                 "  </interface>\n"
                 );
 
-    static const QLatin1String applicationIntrospection(
+    static const QLatin1StringView applicationIntrospection(
                 "  <interface name=\"org.a11y.atspi.Application\">\n"
                 "    <property access=\"read\" type=\"s\" name=\"ToolkitName\"/>\n"
                 "    <property access=\"read\" type=\"s\" name=\"Version\"/>\n"
@@ -241,7 +241,7 @@ QString AtSpiAdaptor::introspect(const QString &path) const
                 "  </interface>\n"
                 );
 
-    static const QLatin1String componentIntrospection(
+    static const QLatin1StringView componentIntrospection(
                 "  <interface name=\"org.a11y.atspi.Component\">\n"
                 "    <method name=\"Contains\">\n"
                 "      <arg direction=\"in\" type=\"i\" name=\"x\"/>\n"
@@ -304,7 +304,7 @@ QString AtSpiAdaptor::introspect(const QString &path) const
                 "  </interface>\n"
                 );
 
-    static const QLatin1String editableTextIntrospection(
+    static const QLatin1StringView editableTextIntrospection(
                 "  <interface name=\"org.a11y.atspi.EditableText\">\n"
                 "    <method name=\"SetTextContents\">\n"
                 "      <arg direction=\"in\" type=\"s\" name=\"newContents\"/>\n"
@@ -337,7 +337,7 @@ QString AtSpiAdaptor::introspect(const QString &path) const
                 "  </interface>\n"
                 );
 
-    static const QLatin1String tableIntrospection(
+    static const QLatin1StringView tableIntrospection(
                 "  <interface name=\"org.a11y.atspi.Table\">\n"
                 "    <property access=\"read\" type=\"i\" name=\"NRows\"/>\n"
                 "    <property access=\"read\" type=\"i\" name=\"NColumns\"/>\n"
@@ -445,7 +445,7 @@ QString AtSpiAdaptor::introspect(const QString &path) const
                 "  </interface>\n"
                 );
 
-    static const QLatin1String textIntrospection(
+    static const QLatin1StringView textIntrospection(
                 "  <interface name=\"org.a11y.atspi.Text\">\n"
                 "    <property access=\"read\" type=\"i\" name=\"CharacterCount\"/>\n"
                 "    <property access=\"read\" type=\"i\" name=\"CaretOffset\"/>\n"
@@ -573,7 +573,7 @@ QString AtSpiAdaptor::introspect(const QString &path) const
                 "  </interface>\n"
                 );
 
-    static const QLatin1String valueIntrospection(
+    static const QLatin1StringView valueIntrospection(
                 "  <interface name=\"org.a11y.atspi.Value\">\n"
                 "    <property access=\"read\" type=\"d\" name=\"MinimumValue\"/>\n"
                 "    <property access=\"read\" type=\"d\" name=\"MaximumValue\"/>\n"
@@ -1321,7 +1321,7 @@ bool AtSpiAdaptor::applicationInterface(QAccessibleInterface *interface, const Q
     }
     if (function == "GetVersion"_L1) {
         Q_ASSERT(message.signature() == "ss"_L1);
-        QDBusMessage reply = message.createReply(QVariant::fromValue(QDBusVariant(QLatin1String(qVersion()))));
+        QDBusMessage reply = message.createReply(QVariant::fromValue(QDBusVariant(QLatin1StringView(qVersion()))));
         return connection.send(reply);
     }
     if (function == "GetLocale"_L1) {
@@ -1548,7 +1548,7 @@ bool AtSpiAdaptor::inheritsQAction(QObject *object)
 {
     const QMetaObject *mo = object->metaObject();
     while (mo) {
-        const QLatin1String cn(mo->className());
+        const QLatin1StringView cn(mo->className());
         if (cn == "QAction"_L1)
             return true;
         mo = mo->superClass();
diff --git a/src/gui/accessible/linux/qspiaccessiblebridge.cpp b/src/gui/accessible/linux/qspiaccessiblebridge.cpp
index ba59586348..eaf40b3d78 100644
--- a/src/gui/accessible/linux/qspiaccessiblebridge.cpp
+++ b/src/gui/accessible/linux/qspiaccessiblebridge.cpp
@@ -277,7 +277,7 @@ static RoleMapping map[] = {
 void QSpiAccessibleBridge::initializeConstantMappings()
 {
     for (uint i = 0; i < sizeof(map) / sizeof(RoleMapping); ++i)
-        m_spiRoleMapping.insert(map[i].role, RoleNames(map[i].spiRole, QLatin1String(map[i].name), tr(map[i].name)));
+        m_spiRoleMapping.insert(map[i].role, RoleNames(map[i].spiRole, QLatin1StringView(map[i].name), tr(map[i].name)));
 
     // -1 because we have button duplicated, as PushButton and Button.
     Q_ASSERT_X(m_spiRoleMapping.size() ==
diff --git a/src/gui/accessible/qaccessible.cpp b/src/gui/accessible/qaccessible.cpp
index ca19e442cb..30e5a32b1d 100644
--- a/src/gui/accessible/qaccessible.cpp
+++ b/src/gui/accessible/qaccessible.cpp
@@ -683,7 +683,7 @@ QAccessibleInterface *QAccessible::queryAccessibleInterface(QObject *object)
     // derived class and walk up the class hierarchy.
     const QMetaObject *mo = object->metaObject();
     while (mo) {
-        const QString cn = QLatin1String(mo->className());
+        const QString cn = QLatin1StringView(mo->className());
 
         // Check if the class has a InterfaceFactory installed.
         for (int i = qAccessibleFactories()->count(); i > 0; --i) {
-- 
cgit v1.2.3