From d669df625a14b6e5b58f663dad25a555cbccf9a5 Mon Sep 17 00:00:00 2001
From: Adriaan de Groot <groot@kde.org>
Date: Wed, 28 Jun 2017 06:35:41 -0400
Subject: [PATCH] Clang: static QString -> literal

---
 src/modules/dracutlukscfg/DracutLuksCfgJob.cpp | 6 +++---
 src/modules/dracutlukscfg/DracutLuksCfgJob.h   | 4 ++--
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/modules/dracutlukscfg/DracutLuksCfgJob.cpp b/src/modules/dracutlukscfg/DracutLuksCfgJob.cpp
index 0b66ca671..601a1e49e 100644
--- a/src/modules/dracutlukscfg/DracutLuksCfgJob.cpp
+++ b/src/modules/dracutlukscfg/DracutLuksCfgJob.cpp
@@ -30,7 +30,7 @@
 #include "utils/Logger.h"
 
 // static
-const QString DracutLuksCfgJob::CONFIG_FILE = QStringLiteral( "/etc/dracut.conf.d/calamares-luks.conf" );
+const QLatin1Literal DracutLuksCfgJob::CONFIG_FILE( "/etc/dracut.conf.d/calamares-luks.conf" );
 
 // static
 const char *DracutLuksCfgJob::CONFIG_FILE_HEADER =
@@ -50,7 +50,7 @@ const char *DracutLuksCfgJob::CONFIG_FILE_CRYPTTAB_LINE =
     "install_items+=\" /etc/crypttab \"\n";
 
 // static
-const QString DracutLuksCfgJob::CONFIG_FILE_SWAPLINE = QStringLiteral( "# enable automatic resume from swap\nadd_device+=\" /dev/disk/by-uuid/%1 \"\n" );
+const QLatin1Literal DracutLuksCfgJob::CONFIG_FILE_SWAPLINE( "# enable automatic resume from swap\nadd_device+=\" /dev/disk/by-uuid/%1 \"\n" );
 
 // static
 QString
@@ -156,7 +156,7 @@ DracutLuksCfgJob::exec()
         if ( ! swapOuterUuid.isEmpty() )
         {
             cDebug() << "[DRACUTLUKSCFG]: Swap outer UUID" << swapOuterUuid;
-            outStream << CONFIG_FILE_SWAPLINE.arg( swapOuterUuid ).toLatin1();
+            outStream << QString(CONFIG_FILE_SWAPLINE).arg( swapOuterUuid ).toLatin1();
         }
         cDebug() << "[DRACUTLUKSCFG]: Wrote config to" << realConfigFilePath;
     } else
diff --git a/src/modules/dracutlukscfg/DracutLuksCfgJob.h b/src/modules/dracutlukscfg/DracutLuksCfgJob.h
index 6d5eae884..ce981850c 100644
--- a/src/modules/dracutlukscfg/DracutLuksCfgJob.h
+++ b/src/modules/dracutlukscfg/DracutLuksCfgJob.h
@@ -41,11 +41,11 @@ public:
     Calamares::JobResult exec() override;
 
 private:
-    static const QString CONFIG_FILE;
+    static const QLatin1Literal CONFIG_FILE;
     static const char *CONFIG_FILE_HEADER;
     static const char *CONFIG_FILE_CRYPTTAB_KEYFILE_LINE;
     static const char *CONFIG_FILE_CRYPTTAB_LINE;
-    static const QString CONFIG_FILE_SWAPLINE;
+    static const QLatin1Literal CONFIG_FILE_SWAPLINE;
 
     static QString rootMountPoint();
     static QVariantList partitions();