napcok/calamares
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Use free functions (I wish I had known I can do this)

Browse Source
This commit is contained in:
Chrysostomus 2020-11-13 00:02:12 +02:00
parent 8676ce9a20
commit 09798a2a12
2 changed files with 3 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/modules/luksbootkeyfile/LuksBootKeyFileJob.cpp
View File

@ -131,7 +131,7 @@ setupLuks( const LuksDevice& d )
// static // static
QVariantList QVariantList
LuksBootKeyFileJob::partitions() partitions()
{ {
Calamares::GlobalStorage* globalStorage = Calamares::JobQueue::instance()->globalStorage(); Calamares::GlobalStorage* globalStorage = Calamares::JobQueue::instance()->globalStorage();
return globalStorage->value( QStringLiteral( "partitions" ) ).toList(); return globalStorage->value( QStringLiteral( "partitions" ) ).toList();
@ -139,9 +139,9 @@ LuksBootKeyFileJob::partitions()
// static // static
bool bool
LuksBootKeyFileJob::hasUnencryptedSeparateBoot() hasUnencryptedSeparateBoot()
{ {
const QVariantList partitions = LuksBootKeyFileJob::partitions(); const QVariantList partitions = partitions();
for ( const QVariant& partition : partitions ) for ( const QVariant& partition : partitions )
{ {
QVariantMap partitionMap = partition.toMap(); QVariantMap partitionMap = partition.toMap();

3
src/modules/luksbootkeyfile/LuksBootKeyFileJob.h
View File

@ -30,9 +30,6 @@ public:
QString prettyName() const override; QString prettyName() const override;
Calamares::JobResult exec() override; Calamares::JobResult exec() override;
private:
static QVariantList partitions();
static bool hasUnencryptedSeparateBoot();
}; };
CALAMARES_PLUGIN_FACTORY_DECLARATION( LuksBootKeyFileJobFactory ) CALAMARES_PLUGIN_FACTORY_DECLARATION( LuksBootKeyFileJobFactory )