diff --git a/src/modules/partition/core/PartitionCoreModule.cpp b/src/modules/partition/core/PartitionCoreModule.cpp index 6dd2b6faf..b098c6ea0 100644 --- a/src/modules/partition/core/PartitionCoreModule.cpp +++ b/src/modules/partition/core/PartitionCoreModule.cpp @@ -402,7 +402,7 @@ PartitionCoreModule::deletePartition( Device* device, Partition* partition ) deletePartition( device, childPartition ); } - QList< Calamares::job_ptr >& jobs = deviceInfo->jobs; + Calamares::JobList& jobs = deviceInfo->jobs; if ( partition->state() == KPM_PARTITION_STATE(New) ) { // First remove matching SetPartFlagsJobs @@ -496,10 +496,10 @@ PartitionCoreModule::setPartitionFlags( Device* device, PartitionInfo::setFlags( partition, flags ); } -QList< Calamares::job_ptr > +Calamares::JobList PartitionCoreModule::jobs() const { - QList< Calamares::job_ptr > lst; + Calamares::JobList lst; QList< Device* > devices; #ifdef DEBUG_PARTITION_UNSAFE diff --git a/src/modules/partition/core/PartitionCoreModule.h b/src/modules/partition/core/PartitionCoreModule.h index 906119a74..7faf67863 100644 --- a/src/modules/partition/core/PartitionCoreModule.h +++ b/src/modules/partition/core/PartitionCoreModule.h @@ -247,7 +247,7 @@ private: QScopedPointer< Device > device; QScopedPointer< PartitionModel > partitionModel; const QScopedPointer< Device > immutableDevice; - QList< Calamares::job_ptr > jobs; + Calamares::JobList jobs; // To check if LVM VGs are deactivated bool isAvailable; diff --git a/src/modules/partition/gui/PartitionViewStep.cpp b/src/modules/partition/gui/PartitionViewStep.cpp index 8d82f65c9..58fa17674 100644 --- a/src/modules/partition/gui/PartitionViewStep.cpp +++ b/src/modules/partition/gui/PartitionViewStep.cpp @@ -619,7 +619,7 @@ PartitionViewStep::setConfigurationMap( const QVariantMap& configurationMap ) } -QList< Calamares::job_ptr > +Calamares::JobList PartitionViewStep::jobs() const { return m_core->jobs(); diff --git a/src/modules/partition/gui/PartitionViewStep.h b/src/modules/partition/gui/PartitionViewStep.h index 47f8fa127..e3d058e67 100644 --- a/src/modules/partition/gui/PartitionViewStep.h +++ b/src/modules/partition/gui/PartitionViewStep.h @@ -69,7 +69,7 @@ public: void setConfigurationMap( const QVariantMap& configurationMap ) override; - QList< Calamares::job_ptr > jobs() const override; + Calamares::JobList jobs() const override; Calamares::RequirementsList checkRequirements() override;