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

[dracutlukscfg] static methods -> free functions

Browse Source 
These methods don't touch anything in the class, and are more safely
tucked away as static (TU-local) free functions.
This commit is contained in:
Adriaan de Groot 2020-11-30 14:23:06 +01:00
parent 6df3c023c8
commit 6d02bab098
2 changed files with 7 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/modules/dracutlukscfg/DracutLuksCfgJob.cpp
View File

@ -43,17 +43,15 @@ const char* DracutLuksCfgJob::CONFIG_FILE_CRYPTTAB_LINE = "# force installing /e
const QLatin1String DracutLuksCfgJob::CONFIG_FILE_SWAPLINE( const QLatin1String DracutLuksCfgJob::CONFIG_FILE_SWAPLINE(
"# enable automatic resume from swap\nadd_device+=\" /dev/disk/by-uuid/%1 \"\n" ); "# enable automatic resume from swap\nadd_device+=\" /dev/disk/by-uuid/%1 \"\n" );
// static static QString
QString rootMountPoint()
DracutLuksCfgJob::rootMountPoint()
{ {
Calamares::GlobalStorage* globalStorage = Calamares::JobQueue::instance()->globalStorage(); Calamares::GlobalStorage* globalStorage = Calamares::JobQueue::instance()->globalStorage();
return globalStorage->value( QStringLiteral( "rootMountPoint" ) ).toString(); return globalStorage->value( QStringLiteral( "rootMountPoint" ) ).toString();
} }
// static static QVariantList
QVariantList partitions()
DracutLuksCfgJob::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();
@ -63,7 +61,7 @@ DracutLuksCfgJob::partitions()
bool bool
DracutLuksCfgJob::isRootEncrypted() DracutLuksCfgJob::isRootEncrypted()
{ {
const QVariantList partitions = DracutLuksCfgJob::partitions(); const QVariantList partitions = ::partitions();
for ( const QVariant& partition : partitions ) for ( const QVariant& partition : partitions )
{ {
QVariantMap partitionMap = partition.toMap(); QVariantMap partitionMap = partition.toMap();
@ -80,7 +78,7 @@ DracutLuksCfgJob::isRootEncrypted()
bool bool
DracutLuksCfgJob::hasUnencryptedSeparateBoot() DracutLuksCfgJob::hasUnencryptedSeparateBoot()
{ {
const QVariantList partitions = DracutLuksCfgJob::partitions(); const QVariantList partitions = ::partitions();
for ( const QVariant& partition : partitions ) for ( const QVariant& partition : partitions )
{ {
QVariantMap partitionMap = partition.toMap(); QVariantMap partitionMap = partition.toMap();
@ -97,7 +95,7 @@ DracutLuksCfgJob::hasUnencryptedSeparateBoot()
QString QString
DracutLuksCfgJob::swapOuterUuid() DracutLuksCfgJob::swapOuterUuid()
{ {
const QVariantList partitions = DracutLuksCfgJob::partitions(); const QVariantList partitions = ::partitions();
for ( const QVariant& partition : partitions ) for ( const QVariant& partition : partitions )
{ {
QVariantMap partitionMap = partition.toMap(); QVariantMap partitionMap = partition.toMap();

2
src/modules/dracutlukscfg/DracutLuksCfgJob.h
View File

@ -39,8 +39,6 @@ private:
static const char* CONFIG_FILE_CRYPTTAB_LINE; static const char* CONFIG_FILE_CRYPTTAB_LINE;
static const QLatin1String CONFIG_FILE_SWAPLINE; static const QLatin1String CONFIG_FILE_SWAPLINE;
static QString rootMountPoint();
static QVariantList partitions();
static bool isRootEncrypted(); static bool isRootEncrypted();
static bool hasUnencryptedSeparateBoot(); static bool hasUnencryptedSeparateBoot();
static QString swapOuterUuid(); static QString swapOuterUuid();