AtSpiAdaptor: avoid static QLatin1StringViews

The static forces the compiler to allocate storage for the objects in
the executable, either causing relocations on startup, or, on GCC, a
pointless magic static guard:
  https://gcc.gnu.org/bugzilla/show_bug.cgi?id=84411

Make them constexpr instead. This allows the compiler to construct
them ad-hoc when one is needed (one lea, one movi).

Amends 8e1ff45.

Also port to _L1 UDLs, amending
7b6b133.

Manual conflict resolution for 6.10
- removed the change to collectionIntrospection, which doesn't exist
  in this patch, yet (7a478ff added
  it for 6.11).

Pick-to: 6.8 6.5
Change-Id: I0cce28154f1155a2abee88572424f3c73073efe5
Reviewed-by: Volker Hilsheimer <[email protected]>
(cherry picked from commit 37acfd1)
Reviewed-by: Michael Weghorn <[email protected]>

Author: marcmutz

src/gui/accessible/linux/atspiadaptor.cpp

@@ -132,7 +132,7 @@ AtSpiAdaptor::~AtSpiAdaptor()
   */
 QString AtSpiAdaptor::introspect(const QString &path) const
 {
-    static const QLatin1StringView accessibleIntrospection(
+    constexpr auto accessibleIntrospection =
                 "  <interface name=\"org.a11y.atspi.Accessible\">\n"
                 "    <property access=\"read\" type=\"s\" name=\"Name\"/>\n"
                 "    <property access=\"read\" type=\"s\" name=\"Description\"/>\n"
@@ -182,9 +182,9 @@ QString AtSpiAdaptor::introspect(const QString &path) const
                 "      <arg direction=\"out\" type=\"s\"/>\n"
                 "    </method>\n"
                 "  </interface>\n"
-                );
+                ""_L1;
 
-    static const QLatin1StringView actionIntrospection(
+    constexpr auto actionIntrospection =
                 "  <interface name=\"org.a11y.atspi.Action\">\n"
                 "    <property access=\"read\" type=\"i\" name=\"NActions\"/>\n"
                 "    <method name=\"GetDescription\">\n"
@@ -208,9 +208,9 @@ QString AtSpiAdaptor::introspect(const QString &path) const
                 "      <arg direction=\"out\" type=\"b\"/>\n"
                 "    </method>\n"
                 "  </interface>\n"
-                );
+                ""_L1;
 
-    static const QLatin1StringView applicationIntrospection(
+    constexpr auto applicationIntrospection =
                 "  <interface name=\"org.a11y.atspi.Application\">\n"
                 "    <property access=\"read\" type=\"s\" name=\"ToolkitName\"/>\n"
                 "    <property access=\"read\" type=\"s\" name=\"Version\"/>\n"
@@ -223,9 +223,9 @@ QString AtSpiAdaptor::introspect(const QString &path) const
                 "      <arg direction=\"out\" type=\"s\" name=\"address\"/>\n"
                 "    </method>\n"
                 "  </interface>\n"
-                );
+                ""_L1;
 
-    static const QLatin1StringView componentIntrospection(
+    constexpr auto componentIntrospection =
                 "  <interface name=\"org.a11y.atspi.Component\">\n"
                 "    <method name=\"Contains\">\n"
                 "      <arg direction=\"in\" type=\"i\" name=\"x\"/>\n"
@@ -286,9 +286,9 @@ QString AtSpiAdaptor::introspect(const QString &path) const
                 "      <arg direction=\"out\" type=\"b\"/>\n"
                 "    </method>\n"
                 "  </interface>\n"
-                );
+                ""_L1;
 
-    static const QLatin1StringView editableTextIntrospection(
+    constexpr auto editableTextIntrospection =
                 "  <interface name=\"org.a11y.atspi.EditableText\">\n"
                 "    <method name=\"SetTextContents\">\n"
                 "      <arg direction=\"in\" type=\"s\" name=\"newContents\"/>\n"
@@ -319,9 +319,9 @@ QString AtSpiAdaptor::introspect(const QString &path) const
                 "      <arg direction=\"out\" type=\"b\"/>\n"
                 "    </method>\n"
                 "  </interface>\n"
-                );
+                ""_L1;
 
-    static const QLatin1StringView selectionIntrospection(
+    constexpr auto selectionIntrospection =
                 "  <interface name=\"org.a11y.atspi.Selection\">\n"
                 "    <property name=\"NSelectedChildren\" type=\"i\" access=\"read\"/>\n"
                 "    <method name=\"GetSelectedChild\">\n"
@@ -352,9 +352,9 @@ QString AtSpiAdaptor::introspect(const QString &path) const
                 "      <arg direction=\"out\" type=\"b\"/>\n"
                 "    </method>\n"
                 "  </interface>\n"
-                );
+                ""_L1;
 
-    static const QLatin1StringView tableIntrospection(
+    constexpr auto tableIntrospection =
                 "  <interface name=\"org.a11y.atspi.Table\">\n"
                 "    <property access=\"read\" type=\"i\" name=\"NRows\"/>\n"
                 "    <property access=\"read\" type=\"i\" name=\"NColumns\"/>\n"
@@ -460,9 +460,9 @@ QString AtSpiAdaptor::introspect(const QString &path) const
                 "      <arg direction=\"out\" type=\"b\" name=\"is_selected\"/>\n"
                 "    </method>\n"
                 "  </interface>\n"
-                );
+                ""_L1;
 
-    static const QLatin1StringView tableCellIntrospection(
+    constexpr auto tableCellIntrospection =
                 "  <interface name=\"org.a11y.atspi.TableCell\">\n"
                 "    <property access=\"read\" name=\"ColumnSpan\" type=\"i\" />\n"
                 "    <property access=\"read\" name=\"Position\" type=\"(ii)\">\n"
@@ -488,9 +488,9 @@ QString AtSpiAdaptor::introspect(const QString &path) const
                 "      <annotation value=\"QSpiObjectReferenceArray\" name=\"org.qtproject.QtDBus.QtTypeName.Out0\"/>\n"
                 "    </method>\n"
                 "  </interface>\n"
-                );
+                ""_L1;
 
-    static const QLatin1StringView textIntrospection(
+    constexpr auto textIntrospection =
                 "  <interface name=\"org.a11y.atspi.Text\">\n"
                 "    <property access=\"read\" type=\"i\" name=\"CharacterCount\"/>\n"
                 "    <property access=\"read\" type=\"i\" name=\"CaretOffset\"/>\n"
@@ -627,9 +627,9 @@ QString AtSpiAdaptor::introspect(const QString &path) const
                 "      <arg direction=\"out\" type=\"b\"/>\n"
                 "    </method>\n"
                 "  </interface>\n"
-                );
+                ""_L1;
 
-    static const QLatin1StringView valueIntrospection(
+    constexpr auto valueIntrospection =
                 "  <interface name=\"org.a11y.atspi.Value\">\n"
                 "    <property access=\"read\" type=\"d\" name=\"MinimumValue\"/>\n"
                 "    <property access=\"read\" type=\"d\" name=\"MaximumValue\"/>\n"
@@ -639,7 +639,7 @@ QString AtSpiAdaptor::introspect(const QString &path) const
                 "      <arg direction=\"in\" type=\"d\" name=\"value\"/>\n"
                 "    </method>\n"
                 "  </interface>\n"
-                );
+                ""_L1;
 
     QAccessibleInterface * interface = interfaceFromPath(path);
     if (!interface) {