Modernize string literals

Replace all our custom qSL/qL1S/qL1C macros with standard C++ and
QString unicode string literals.

Change-Id: I9e0b69fb46525421f408f260518a69b8f8125d99
Pick-to: 6.7
Reviewed-by: Dominik Holland <dominik.holland@qt.io>

4 files changed, 17 insertions, 10 deletions

diff --git a/src/window-lib/waylandcompositor.cpp b/src/window-lib/waylandcompositor.cpp
index ead5ab12..0dc06dc6 100644
--- a/src/window-lib/waylandcompositor.cpp
+++ b/src/window-lib/waylandcompositor.cpp
@@ -158,7 +158,7 @@ WaylandCompositor::WaylandCompositor(QQuickWindow *window, const QString &waylan
     create();
 
     // set a sensible default keymap
-    defaultSeat()->keymap()->setLayout(QLocale::system().name().section(qL1C('_'), 1, 1).toLower());
+    defaultSeat()->keymap()->setLayout(QLocale::system().name().section(u'_', 1, 1).toLower());
 }
 
 WaylandCompositor::~WaylandCompositor()
diff --git a/src/window-lib/waylandwindow.cpp b/src/window-lib/waylandwindow.cpp
index f0b6e818..77862ce2 100644
--- a/src/window-lib/waylandwindow.cpp
+++ b/src/window-lib/waylandwindow.cpp
@@ -15,6 +15,9 @@
 
 #include <QWaylandWlShellSurface>
 
+using namespace Qt::StringLiterals;
+
+
 QT_BEGIN_NAMESPACE_AM
 
 bool WaylandWindow::m_watchdogEnabled = true;
@@ -151,9 +154,9 @@ QString WaylandWindow::applicationId() const
     if (application())
         return application()->id();
     else if (m_surface && m_surface->client())
-        return qSL("[pid: %1]").arg(m_surface->client()->processId());
+        return u"[pid: %1]"_s.arg(m_surface->client()->processId());
     else
-        return qSL("[external app]");
+        return u"[external app]"_s;
 }
 
 QSize WaylandWindow::size() const
diff --git a/src/window-lib/windowitem.cpp b/src/window-lib/windowitem.cpp
index d1fef2db..aba78978 100644
--- a/src/window-lib/windowitem.cpp
+++ b/src/window-lib/windowitem.cpp
@@ -23,6 +23,8 @@
 #include <QQmlProperty>
 #include <QtQuick/private/qquickitem_p.h>
 
+using namespace Qt::StringLiterals;
+
 /*!
     \qmltype WindowItem
     \inqmlmodule QtApplicationManager.SystemUI
@@ -376,7 +378,7 @@ void WindowItem::InProcessImpl::setupSecondaryView()
         m_shaderEffectSource->setParent(q);
         m_shaderEffectSource->setParentItem(q);
 
-        QQmlProperty::write(m_shaderEffectSource, QStringLiteral("sourceItem"),
+        QQmlProperty::write(m_shaderEffectSource, u"sourceItem"_s,
                 QVariant::fromValue(m_inProcessWindow->rootItem()));
     }
 }
diff --git a/src/window-lib/windowmanager.cpp b/src/window-lib/windowmanager.cpp
index 47226d71..28bd3def 100644
--- a/src/window-lib/windowmanager.cpp
+++ b/src/window-lib/windowmanager.cpp
@@ -37,6 +37,8 @@
 #include "qmlinprocapplicationmanagerwindowimpl.h"
 #include "systemframetimerimpl.h"
 
+using namespace Qt::StringLiterals;
+
 
 /*!
     \qmltype WindowManager
@@ -271,7 +273,7 @@ bool WindowManager::isRunningOnDesktop() const
 #if defined(Q_OS_WIN) || defined(Q_OS_MACOS)
     return true;
 #else
-    return qApp->platformName() == qSL("xcb");
+    return qApp->platformName() == u"xcb";
 #endif
 }
 
@@ -481,7 +483,7 @@ QVariantMap WindowManager::get(int index) const
     QVariantMap map;
     QHash<int, QByteArray> roles = roleNames();
     for (auto it = roles.begin(); it != roles.end(); ++it)
-        map.insert(qL1S(it.value()), data(QAbstractListModel::index(index), it.key()));
+        map.insert(QString::fromLatin1(it.value()), data(QAbstractListModel::index(index), it.key()));
     return map;
 }
 
@@ -919,7 +921,7 @@ bool WindowManager::makeScreenshot(const QString &filename, const QString &selec
         for (int i = 0; i < filename.size(); ++i) {
             QChar c = filename.at(i);
             if (!percent) {
-                if (c != QLatin1Char('%'))
+                if (c != u'%')
                     result.append(c);
                 else
                     percent = true;
@@ -941,7 +943,7 @@ bool WindowManager::makeScreenshot(const QString &filename, const QString &selec
         return result;
     };
 
-    static const QRegularExpression re(qSL("^([a-z.-]+)?(\\[([a-zA-Z0-9_.]+)=([^\\]]*)\\])?(:([0-9]+))?"));
+    static const QRegularExpression re(u"^([a-z.-]+)?(\\[([a-zA-Z0-9_.]+)=([^\\]]*)\\])?(:([0-9]+))?"_s);
     auto match = re.match(selector);
     QString screenId = match.captured(6);
     QString appId = match.captured(1);
@@ -1063,9 +1065,9 @@ QString WindowManagerPrivate::applicationId(Application *app, WindowSurface *win
     if (app)
         return app->id();
     else if (windowSurface && windowSurface->surface() && windowSurface->surface()->client())
-        return qSL("pid: ") + QString::number(windowSurface->surface()->client()->processId());
+        return u"pid: "_s + QString::number(windowSurface->surface()->client()->processId());
     else
-        return qSL("<unknown client>");
+        return u"<unknown client>"_s;
 }
 
 #endif // QT_CONFIG(am_multi_process)