applications/calamares
3
0
Fork 0
mirror of https://github.com/parchlinux/calamares.git synced 2025-02-25 03:15:44 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

[partition] Idiomatic use of Calamares::JobList

Browse source
This commit is contained in:
Adriaan de Groot 2019-05-28 16:39:00 +02:00
parent e2b71e669e
commit 8d451622db
4 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/modules/partition/core/PartitionCoreModule.cpp
View file

@ -402,7 +402,7 @@ PartitionCoreModule::deletePartition( Device* device, Partition* partition )
deletePartition( device, childPartition ); deletePartition( device, childPartition );
} }
QList< Calamares::job_ptr >& jobs = deviceInfo->jobs; Calamares::JobList& jobs = deviceInfo->jobs;
if ( partition->state() == KPM_PARTITION_STATE(New) ) if ( partition->state() == KPM_PARTITION_STATE(New) )
{ {
// First remove matching SetPartFlagsJobs // First remove matching SetPartFlagsJobs
@ -496,10 +496,10 @@ PartitionCoreModule::setPartitionFlags( Device* device,
PartitionInfo::setFlags( partition, flags ); PartitionInfo::setFlags( partition, flags );
} }
QList< Calamares::job_ptr > Calamares::JobList
PartitionCoreModule::jobs() const PartitionCoreModule::jobs() const
{ {
QList< Calamares::job_ptr > lst; Calamares::JobList lst;
QList< Device* > devices; QList< Device* > devices;
#ifdef DEBUG_PARTITION_UNSAFE #ifdef DEBUG_PARTITION_UNSAFE

2
src/modules/partition/core/PartitionCoreModule.h
View file

@ -247,7 +247,7 @@ private:
QScopedPointer< Device > device; QScopedPointer< Device > device;
QScopedPointer< PartitionModel > partitionModel; QScopedPointer< PartitionModel > partitionModel;
const QScopedPointer< Device > immutableDevice; const QScopedPointer< Device > immutableDevice;
QList< Calamares::job_ptr > jobs; Calamares::JobList jobs;
// To check if LVM VGs are deactivated // To check if LVM VGs are deactivated
bool isAvailable; bool isAvailable;

2
src/modules/partition/gui/PartitionViewStep.cpp
View file

@ -619,7 +619,7 @@ PartitionViewStep::setConfigurationMap( const QVariantMap& configurationMap )
} }
QList< Calamares::job_ptr > Calamares::JobList
PartitionViewStep::jobs() const PartitionViewStep::jobs() const
{ {
return m_core->jobs(); return m_core->jobs();

2
src/modules/partition/gui/PartitionViewStep.h
View file

@ -69,7 +69,7 @@ public:
void setConfigurationMap( const QVariantMap& configurationMap ) override; void setConfigurationMap( const QVariantMap& configurationMap ) override;
QList< Calamares::job_ptr > jobs() const override; Calamares::JobList jobs() const override;
Calamares::RequirementsList checkRequirements() override; Calamares::RequirementsList checkRequirements() override;