From 09798a2a124acf42bbd13b23c69adbe0b0c508df Mon Sep 17 00:00:00 2001
From: Chrysostomus <matti@manjaro.org>
Date: Fri, 13 Nov 2020 00:02:12 +0200
Subject: [PATCH] Use free functions (I wish I had known I can do this)

---
 src/modules/luksbootkeyfile/LuksBootKeyFileJob.cpp | 6 +++---
 src/modules/luksbootkeyfile/LuksBootKeyFileJob.h   | 3 ---
 2 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/src/modules/luksbootkeyfile/LuksBootKeyFileJob.cpp b/src/modules/luksbootkeyfile/LuksBootKeyFileJob.cpp
index 89323b36a..ecc42806d 100644
--- a/src/modules/luksbootkeyfile/LuksBootKeyFileJob.cpp
+++ b/src/modules/luksbootkeyfile/LuksBootKeyFileJob.cpp
@@ -131,7 +131,7 @@ setupLuks( const LuksDevice& d )
 
 // static
 QVariantList
-LuksBootKeyFileJob::partitions()
+partitions()
 {
     Calamares::GlobalStorage* globalStorage = Calamares::JobQueue::instance()->globalStorage();
     return globalStorage->value( QStringLiteral( "partitions" ) ).toList();
@@ -139,9 +139,9 @@ LuksBootKeyFileJob::partitions()
 
 // static
 bool
-LuksBootKeyFileJob::hasUnencryptedSeparateBoot()
+hasUnencryptedSeparateBoot()
 {
-    const QVariantList partitions = LuksBootKeyFileJob::partitions();
+    const QVariantList partitions = partitions();
     for ( const QVariant& partition : partitions )
     {
         QVariantMap partitionMap = partition.toMap();
diff --git a/src/modules/luksbootkeyfile/LuksBootKeyFileJob.h b/src/modules/luksbootkeyfile/LuksBootKeyFileJob.h
index fbfb14b27..9681228bd 100644
--- a/src/modules/luksbootkeyfile/LuksBootKeyFileJob.h
+++ b/src/modules/luksbootkeyfile/LuksBootKeyFileJob.h
@@ -30,9 +30,6 @@ public:
     QString prettyName() const override;
 
     Calamares::JobResult exec() override;
-private:
-    static QVariantList partitions();
-    static bool hasUnencryptedSeparateBoot();
 };
 
 CALAMARES_PLUGIN_FACTORY_DECLARATION( LuksBootKeyFileJobFactory )