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

[partition] Tighten up the types of internal methods

Browse Source
This commit is contained in:
Adriaan de Groot 2020-02-27 13:49:02 +01:00
parent c93f749a35
commit d4b26bbaf0
2 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/modules/partition/jobs/FillGlobalStorageJob.cpp
View File

@ -147,7 +147,7 @@ FillGlobalStorageJob::prettyDescription() const
{ {
QStringList lines; QStringList lines;
const auto partitionList = createPartitionList().toList(); const auto partitionList = createPartitionList();
for ( const QVariant& partitionItem : partitionList ) for ( const QVariant& partitionItem : partitionList )
{ {
if ( partitionItem.type() == QVariant::Map ) if ( partitionItem.type() == QVariant::Map )
@ -218,6 +218,7 @@ FillGlobalStorageJob::exec()
Calamares::GlobalStorage* storage = Calamares::JobQueue::instance()->globalStorage(); Calamares::GlobalStorage* storage = Calamares::JobQueue::instance()->globalStorage();
storage->insert( "partitions", createPartitionList() ); storage->insert( "partitions", createPartitionList() );
cDebug() << "Saving partition information map to GlobalStorage[\"partitions\"]"; cDebug() << "Saving partition information map to GlobalStorage[\"partitions\"]";
if ( !m_bootLoaderPath.isEmpty() ) if ( !m_bootLoaderPath.isEmpty() )
{ {
QVariant var = createBootLoaderMap(); QVariant var = createBootLoaderMap();
@ -236,7 +237,7 @@ FillGlobalStorageJob::exec()
return Calamares::JobResult::ok(); return Calamares::JobResult::ok();
} }
QVariant QVariantList
FillGlobalStorageJob::createPartitionList() const FillGlobalStorageJob::createPartitionList() const
{ {
UuidForPartitionHash hash = findPartitionUuids( m_devices ); UuidForPartitionHash hash = findPartitionUuids( m_devices );

4
src/modules/partition/jobs/FillGlobalStorageJob.h
View File

@ -22,8 +22,8 @@
#include "Job.h" #include "Job.h"
// Qt
#include <QList> #include <QList>
#include <QVariantList>
class Device; class Device;
class Partition; class Partition;
@ -48,7 +48,7 @@ private:
QList< Device* > m_devices; QList< Device* > m_devices;
QString m_bootLoaderPath; QString m_bootLoaderPath;
QVariant createPartitionList() const; QVariantList createPartitionList() const;
QVariant createBootLoaderMap() const; QVariant createBootLoaderMap() const;
}; };