From 1f21b9ad733405b6338f11d8a1dc667966d89661 Mon Sep 17 00:00:00 2001 From: Adriaan de Groot Date: Mon, 30 Nov 2020 14:41:02 +0100 Subject: [PATCH] [dracutlukscfg] Const data The QLatin1String() might be replaced by char[], that trades one initialization for two but with a simpler data section; this probably is not worth profiling. --- src/modules/dracutlukscfg/DracutLuksCfgJob.cpp | 8 +++----- src/modules/dracutlukscfg/DracutLuksCfgJob.h | 2 -- 2 files changed, 3 insertions(+), 7 deletions(-) diff --git a/src/modules/dracutlukscfg/DracutLuksCfgJob.cpp b/src/modules/dracutlukscfg/DracutLuksCfgJob.cpp index 9e04292ec..8a61420ca 100644 --- a/src/modules/dracutlukscfg/DracutLuksCfgJob.cpp +++ b/src/modules/dracutlukscfg/DracutLuksCfgJob.cpp @@ -20,8 +20,7 @@ #include "utils/Logger.h" -// static -const QLatin1String DracutLuksCfgJob::CONFIG_FILE( "/etc/dracut.conf.d/calamares-luks.conf" ); +static const QLatin1String CONFIG_FILE( "/etc/dracut.conf.d/calamares-luks.conf" ); static const char CONFIG_FILE_HEADER[] = "# Configuration file automatically written by the Calamares system installer\n" @@ -36,9 +35,8 @@ static const char CONFIG_FILE_CRYPTTAB_KEYFILE_LINE[] static const char CONFIG_FILE_CRYPTTAB_LINE[] = "# force installing /etc/crypttab even if hostonly=\"no\"\n" "install_items+=\" /etc/crypttab \"\n"; -// static -const QLatin1String DracutLuksCfgJob::CONFIG_FILE_SWAPLINE( - "# enable automatic resume from swap\nadd_device+=\" /dev/disk/by-uuid/%1 \"\n" ); +static const QLatin1String + CONFIG_FILE_SWAPLINE( "# enable automatic resume from swap\nadd_device+=\" /dev/disk/by-uuid/%1 \"\n" ); static QString rootMountPoint() diff --git a/src/modules/dracutlukscfg/DracutLuksCfgJob.h b/src/modules/dracutlukscfg/DracutLuksCfgJob.h index 03325e819..33029f93a 100644 --- a/src/modules/dracutlukscfg/DracutLuksCfgJob.h +++ b/src/modules/dracutlukscfg/DracutLuksCfgJob.h @@ -33,8 +33,6 @@ public: Calamares::JobResult exec() override; private: - static const QLatin1String CONFIG_FILE; - static const QLatin1String CONFIG_FILE_SWAPLINE; }; CALAMARES_PLUGIN_FACTORY_DECLARATION( DracutLuksCfgJobFactory )