From d2c7c42aec60926dfba4a6e2223d57b44919990e Mon Sep 17 00:00:00 2001
From: Adriaan de Groot <groot@kde.org>
Date: Mon, 30 Nov 2020 14:32:36 +0100
Subject: [PATCH] [dracutlukscfg] More static methods -> free functions

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

diff --git a/src/modules/dracutlukscfg/DracutLuksCfgJob.cpp b/src/modules/dracutlukscfg/DracutLuksCfgJob.cpp
index e96e3d6c5..4aff72240 100644
--- a/src/modules/dracutlukscfg/DracutLuksCfgJob.cpp
+++ b/src/modules/dracutlukscfg/DracutLuksCfgJob.cpp
@@ -57,9 +57,8 @@ partitions()
     return globalStorage->value( QStringLiteral( "partitions" ) ).toList();
 }
 
-// static
-bool
-DracutLuksCfgJob::isRootEncrypted()
+static bool
+isRootEncrypted()
 {
     const QVariantList partitions = ::partitions();
     for ( const QVariant& partition : partitions )
@@ -74,9 +73,8 @@ DracutLuksCfgJob::isRootEncrypted()
     return false;
 }
 
-// static
-bool
-DracutLuksCfgJob::hasUnencryptedSeparateBoot()
+static bool
+hasUnencryptedSeparateBoot()
 {
     const QVariantList partitions = ::partitions();
     for ( const QVariant& partition : partitions )
@@ -91,9 +89,8 @@ DracutLuksCfgJob::hasUnencryptedSeparateBoot()
     return false;
 }
 
-// static
-QString
-DracutLuksCfgJob::swapOuterUuid()
+static QString
+swapOuterUuid()
 {
     const QVariantList partitions = ::partitions();
     for ( const QVariant& partition : partitions )
@@ -148,7 +145,7 @@ DracutLuksCfgJob::exec()
         QTextStream outStream( &configFile );
         outStream << CONFIG_FILE_HEADER
                   << ( hasUnencryptedSeparateBoot() ? CONFIG_FILE_CRYPTTAB_LINE : CONFIG_FILE_CRYPTTAB_KEYFILE_LINE );
-        const QString swapOuterUuid = DracutLuksCfgJob::swapOuterUuid();
+        const QString swapOuterUuid = ::swapOuterUuid();
         if ( !swapOuterUuid.isEmpty() )
         {
             cDebug() << "[DRACUTLUKSCFG]: Swap outer UUID" << swapOuterUuid;
diff --git a/src/modules/dracutlukscfg/DracutLuksCfgJob.h b/src/modules/dracutlukscfg/DracutLuksCfgJob.h
index e527f1799..0680badf4 100644
--- a/src/modules/dracutlukscfg/DracutLuksCfgJob.h
+++ b/src/modules/dracutlukscfg/DracutLuksCfgJob.h
@@ -38,10 +38,6 @@ private:
     static const char* CONFIG_FILE_CRYPTTAB_KEYFILE_LINE;
     static const char* CONFIG_FILE_CRYPTTAB_LINE;
     static const QLatin1String CONFIG_FILE_SWAPLINE;
-
-    static bool isRootEncrypted();
-    static bool hasUnencryptedSeparateBoot();
-    static QString swapOuterUuid();
 };
 
 CALAMARES_PLUGIN_FACTORY_DECLARATION( DracutLuksCfgJobFactory )