mirror of
https://github.com/parchlinux/calamares.git
synced 2025-06-28 09:55:37 -04:00
[luksbootkeyfile] Refactor static function to outside class
This commit is contained in:
parent
7d7d4c69ef
commit
efd409cf78
1 changed files with 25 additions and 25 deletions
|
@ -66,6 +66,31 @@ struct LuksDevice
|
||||||
QString passphrase;
|
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
|
struct LuksDeviceList
|
||||||
{
|
{
|
||||||
LuksDeviceList( const QVariant& partitions )
|
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;
|
QList< LuksDevice > devices;
|
||||||
bool valid;
|
bool valid;
|
||||||
};
|
};
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue