From 5fc7044ac1f3e32c9243e61732215576eea389e3 Mon Sep 17 00:00:00 2001
From: David Edmundson <kde@davidedmundson.co.uk>
Date: Sun, 23 Oct 2016 23:37:48 +0100
Subject: [PATCH 20/21] Fix all incorrect use of QStringLiteral

---
 src/auth/Auth.cpp                  |  2 +-
 src/daemon/PowerManager.cpp        | 10 +++++-----
 src/greeter/XcbKeyboardBackend.cpp |  4 ++--
 src/helper/UserSession.cpp         | 10 +++++-----
 4 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/src/auth/Auth.cpp b/src/auth/Auth.cpp
index b480e72..4fcb637 100644
--- a/src/auth/Auth.cpp
+++ b/src/auth/Auth.cpp
@@ -121,7 +121,7 @@ namespace SDDM {
                 QStringList parts = in.readLine().split(QLatin1Char('='));
                 if (parts.size() >= 2) {
                     env.insert(parts[0], parts[1]);
-                    if (parts[0] == QStringLiteral("LANG"))
+                    if (parts[0] == QLatin1String("LANG"))
                         langEmpty = false;
                 }
             }
diff --git a/src/daemon/PowerManager.cpp b/src/daemon/PowerManager.cpp
index 67a27c6..6eca29f 100644
--- a/src/daemon/PowerManager.cpp
+++ b/src/daemon/PowerManager.cpp
@@ -138,27 +138,27 @@ const QString CK2_OBJECT = QStringLiteral("org.freedesktop.ConsoleKit.Manager");
 
             // power off
             reply = m_interface->call(QStringLiteral("CanPowerOff"));
-            if (reply.isValid() && (reply.value() == QStringLiteral("yes")))
+            if (reply.isValid() && (reply.value() == QLatin1String("yes")))
                 caps |= Capability::PowerOff;
 
             // reboot
             reply = m_interface->call(QStringLiteral("CanReboot"));
-            if (reply.isValid() && (reply.value() == QStringLiteral("yes")))
+            if (reply.isValid() && (reply.value() == QLatin1String("yes")))
                 caps |= Capability::Reboot;
 
             // suspend
             reply = m_interface->call(QStringLiteral("CanSuspend"));
-            if (reply.isValid() && (reply.value() == QStringLiteral("yes")))
+            if (reply.isValid() && (reply.value() == QLatin1String("yes")))
                 caps |= Capability::Suspend;
 
             // hibernate
             reply = m_interface->call(QStringLiteral("CanHibernate"));
-            if (reply.isValid() && (reply.value() == QStringLiteral("yes")))
+            if (reply.isValid() && (reply.value() == QLatin1String("yes")))
                 caps |= Capability::Hibernate;
 
             // hybrid sleep
             reply = m_interface->call(QStringLiteral("CanHybridSleep"));
-            if (reply.isValid() && (reply.value() == QStringLiteral("yes")))
+            if (reply.isValid() && (reply.value() == QLatin1String("yes")))
                 caps |= Capability::HybridSleep;
 
             // return capabilities
diff --git a/src/greeter/XcbKeyboardBackend.cpp b/src/greeter/XcbKeyboardBackend.cpp
index ed9f7f4..446059d 100644
--- a/src/greeter/XcbKeyboardBackend.cpp
+++ b/src/greeter/XcbKeyboardBackend.cpp
@@ -133,9 +133,9 @@ namespace SDDM {
         for (int i = 0; i < ind_cnt; i++) {
             QString name = atomName(cookies[i]);
 
-            if (name == QStringLiteral("Num Lock")) {
+            if (name == QLatin1String("Num Lock")) {
                 d->numlock.mask = getIndicatorMask(i);
-            } else if (name == QStringLiteral("Caps Lock")) {
+            } else if (name == QLatin1String("Caps Lock")) {
                 d->capslock.mask = getIndicatorMask(i);
             }
         }
diff --git a/src/helper/UserSession.cpp b/src/helper/UserSession.cpp
index fc10366..11e3ea3 100644
--- a/src/helper/UserSession.cpp
+++ b/src/helper/UserSession.cpp
@@ -43,13 +43,13 @@ namespace SDDM {
     bool UserSession::start() {
         QProcessEnvironment env = qobject_cast<HelperApp*>(parent())->session()->processEnvironment();
 
-        if (env.value(QStringLiteral("XDG_SESSION_CLASS")) == QStringLiteral("greeter")) {
+        if (env.value(QStringLiteral("XDG_SESSION_CLASS")) == QLatin1String("greeter")) {
             QProcess::start(m_path);
-        } else if (env.value(QStringLiteral("XDG_SESSION_TYPE")) == QStringLiteral("x11")) {
+        } else if (env.value(QStringLiteral("XDG_SESSION_TYPE")) == QLatin1String("x11")) {
             const QString cmd = QStringLiteral("%1 %2").arg(mainConfig.X11.SessionCommand.get()).arg(m_path);
             qInfo() << "Starting:" << cmd;
             QProcess::start(cmd);
-        } else if (env.value(QStringLiteral("XDG_SESSION_TYPE")) == QStringLiteral("wayland")) {
+        } else if (env.value(QStringLiteral("XDG_SESSION_TYPE")) == QLatin1String("wayland")) {
             const QString cmd = QStringLiteral("%1 %2").arg(mainConfig.Wayland.SessionCommand.get()).arg(m_path);
             qInfo() << "Starting:" << cmd;
             QProcess::start(cmd);
@@ -74,7 +74,7 @@ namespace SDDM {
 
         // For Wayland sessions we leak the VT into the session as stdin so
         // that it stays open without races
-        if (sessionType == QLatin1String("wayland")) {
+        if (sessionType == QLatin1StringQString("wayland")) {
             // open VT and get the fd
             QString ttyString = QStringLiteral("/dev/tty%1").arg(processEnvironment().value(QStringLiteral("XDG_VTNR")));
             int vtFd = ::open(qPrintable(ttyString), O_RDWR | O_NOCTTY);
@@ -134,7 +134,7 @@ namespace SDDM {
         // determine stderr log file based on session type
         QString sessionLog = QStringLiteral("%1/%2")
                 .arg(QString::fromLocal8Bit(pw->pw_dir))
-                .arg(sessionType == QStringLiteral("x11")
+                .arg(sessionType == QLatin1String("x11")
                      ? mainConfig.X11.SessionLogFile.get()
                      : mainConfig.Wayland.SessionLogFile.get());
 
-- 
2.10.2