From efd409cf78759c48280a167d2463295ae37fdb70 Mon Sep 17 00:00:00 2001
From: Adriaan de Groot <groot@kde.org>
Date: Thu, 4 Jul 2019 19:38:10 +0200
Subject: [PATCH] [luksbootkeyfile] Refactor static function to outside class

---
 .../luksbootkeyfile/LuksBootKeyFileJob.cpp    | 50 +++++++++----------
 1 file changed, 25 insertions(+), 25 deletions(-)

diff --git a/src/modules/luksbootkeyfile/LuksBootKeyFileJob.cpp b/src/modules/luksbootkeyfile/LuksBootKeyFileJob.cpp
index 06cb5f9cd..c84e79083 100644
--- a/src/modules/luksbootkeyfile/LuksBootKeyFileJob.cpp
+++ b/src/modules/luksbootkeyfile/LuksBootKeyFileJob.cpp
@@ -66,6 +66,31 @@ struct LuksDevice
     QString passphrase;
 };
 
+/** @brief Extract the luks passphrases setup.
+ *
+ * Given a list of partitions (as set up by the partitioning module,
+ * so there's maps with keys inside), returns just the list of
+ * luks passphrases for each device.
+ */ 
+static QList< LuksDevice >
+getLuksDevices( const QVariantList& list )
+{
+    QList< LuksDevice > luksItems;
+
+    for ( const auto& p : list )
+    {
+        if ( p.canConvert< QVariantMap >() )
+        {
+            LuksDevice d( p.toMap() );
+            if ( d.isValid )
+            {
+                luksItems.append( d );
+            }
+        }
+    }
+    return luksItems;
+}
+
 struct LuksDeviceList
 {
     LuksDeviceList( const QVariant& partitions )
@@ -78,31 +103,6 @@ struct LuksDeviceList
         }
     }
 
-    /** @brief Extract the luks passphrases setup.
-     *
-     * Given a list of partitions (as set up by the partitioning module,
-     * so there's maps with keys inside), returns just the list of
-     * luks passphrases for each device.
-     */
-    static QList< LuksDevice >
-    getLuksDevices( const QVariantList& list )
-    {
-        QList< LuksDevice > luksItems;
-
-        for ( const auto& p : list )
-        {
-            if ( p.canConvert< QVariantMap >() )
-            {
-                LuksDevice d( p.toMap() );
-                if ( d.isValid )
-                {
-                    luksItems.append( d );
-                }
-            }
-        }
-        return luksItems;
-    }
-
     QList< LuksDevice > devices;
     bool valid;
 };