napcok/calamares
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Clang: static QString -> literal

Browse Source
This commit is contained in:
Adriaan de Groot 2017-06-28 06:35:41 -04:00
parent c0b3f3fe9d
commit d669df625a
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/modules/dracutlukscfg/DracutLuksCfgJob.cpp
View File

@ -30,7 +30,7 @@
#include "utils/Logger.h" #include "utils/Logger.h"
// static // 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 // static
const char *DracutLuksCfgJob::CONFIG_FILE_HEADER = const char *DracutLuksCfgJob::CONFIG_FILE_HEADER =
@ -50,7 +50,7 @@ const char *DracutLuksCfgJob::CONFIG_FILE_CRYPTTAB_LINE =
"install_items+=\" /etc/crypttab \"\n"; "install_items+=\" /etc/crypttab \"\n";
// static // 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 // static
QString QString
@ -156,7 +156,7 @@ DracutLuksCfgJob::exec()
if ( ! swapOuterUuid.isEmpty() ) if ( ! swapOuterUuid.isEmpty() )
{ {
cDebug() << "[DRACUTLUKSCFG]: Swap outer UUID" << swapOuterUuid; 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; cDebug() << "[DRACUTLUKSCFG]: Wrote config to" << realConfigFilePath;
} else } else

4
src/modules/dracutlukscfg/DracutLuksCfgJob.h
View File

@ -41,11 +41,11 @@ public:
Calamares::JobResult exec() override; Calamares::JobResult exec() override;
private: private:
static const QString CONFIG_FILE; static const QLatin1Literal CONFIG_FILE;
static const char *CONFIG_FILE_HEADER; static const char *CONFIG_FILE_HEADER;
static const char *CONFIG_FILE_CRYPTTAB_KEYFILE_LINE; static const char *CONFIG_FILE_CRYPTTAB_KEYFILE_LINE;
static const char *CONFIG_FILE_CRYPTTAB_LINE; static const char *CONFIG_FILE_CRYPTTAB_LINE;
static const QString CONFIG_FILE_SWAPLINE; static const QLatin1Literal CONFIG_FILE_SWAPLINE;
static QString rootMountPoint(); static QString rootMountPoint();
static QVariantList partitions(); static QVariantList partitions();