[luksbootkeyfile] Refactor static function to outside class

This commit is contained in:
Adriaan de Groot 2019-07-04 19:38:10 +02:00
parent 7d7d4c69ef
commit efd409cf78

View file

@ -66,27 +66,15 @@ struct LuksDevice
QString passphrase; QString passphrase;
}; };
struct LuksDeviceList /** @brief Extract the luks passphrases setup.
{
LuksDeviceList( const QVariant& partitions )
: valid( false )
{
if ( partitions.canConvert< QVariantList >() )
{
devices = getLuksDevices( partitions.toList() );
valid = true;
}
}
/** @brief Extract the luks passphrases setup.
* *
* Given a list of partitions (as set up by the partitioning module, * Given a list of partitions (as set up by the partitioning module,
* so there's maps with keys inside), returns just the list of * so there's maps with keys inside), returns just the list of
* luks passphrases for each device. * luks passphrases for each device.
*/ */
static QList< LuksDevice > static QList< LuksDevice >
getLuksDevices( const QVariantList& list ) getLuksDevices( const QVariantList& list )
{ {
QList< LuksDevice > luksItems; QList< LuksDevice > luksItems;
for ( const auto& p : list ) for ( const auto& p : list )
@ -101,6 +89,18 @@ struct LuksDeviceList
} }
} }
return luksItems; return luksItems;
}
struct LuksDeviceList
{
LuksDeviceList( const QVariant& partitions )
: valid( false )
{
if ( partitions.canConvert< QVariantList >() )
{
devices = getLuksDevices( partitions.toList() );
valid = true;
}
} }
QList< LuksDevice > devices; QList< LuksDevice > devices;