Some more fixes

Author: tsdgeos

Diff for: plugins/AccountsService/AccountsService.cpp

@@ -66,9 +66,9 @@ Q_DECLARE_METATYPE(StringMapList)
 QVariant primaryButtonConverter(const QVariant &value)
 {
     QString stringValue = value.toString();
-    if (stringValue == "left") {
+    if (stringValue == QLatin1String("left")) {
         return QVariant::fromValue(0);
-    } else if (stringValue == "right") {
+    } else if (stringValue == QLatin1String("right")) {
         return QVariant::fromValue(1); // Mir is less clear on this -- any non-zero value is the same
     } else {
         return QVariant::fromValue(0); // default to left

Diff for: plugins/Unity/Indicators/actionrootstate.cpp

@@ -44,7 +44,7 @@ void ActionRootState::setActionGroup(QDBusActionGroup *actionGroup)
             connect(m_actionGroup, &QDBusActionGroup::statusChanged, this, [&](bool) { updateActionState(); });
             connect(m_actionGroup, &QDBusActionGroup::actionAppear, this, [&](const QString&) { updateActionState(); });
             connect(m_actionGroup, &QDBusActionGroup::actionVanish, this, [&](const QString&) { updateActionState(); });
-            connect(m_actionGroup, &QDBusActionGroup::actionStateChanged, this, [&](QVariant) { updateActionState(); });
+            connect(m_actionGroup, &QDBusActionGroup::actionStateChanged, this, [&](const QVariant&) { updateActionState(); });
 
             connect(m_actionGroup, &QObject::destroyed, this, [&](QObject*) { updateActionState(); });
         }

Diff for: plugins/Utils/windowstatestorage.cpp

@@ -28,7 +28,9 @@
 QMutex WindowStateStorage::s_mutex;
 
 inline QString sanitiseString(QString string) {
-    return string.remove("\"").remove("'").remove("\\");
+    return string.remove(QLatin1Char('\"'))
+                 .remove(QLatin1Char('\''))
+                 .remove(QLatin1Char('\\'));
 }
 
 WindowStateStorage::WindowStateStorage(QObject *parent):

Diff for: src/SecondaryWindow.cpp

@@ -30,7 +30,7 @@ SecondaryWindow::SecondaryWindow(QQmlEngine *engine)
     if (!ok) {
         pxpgu = 8;
     }
-    engine->rootContext()->setContextProperty("internalGu", pxpgu);
+    engine->rootContext()->setContextProperty(QStringLiteral("internalGu"), pxpgu);
     setResizeMode(QQuickView::SizeRootObjectToView);
     setColor("black");
     setTitle(QStringLiteral("Unity8 Shell - Secondary Screen"));