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

[partition] Introduce dummy argument to LVM jobs

Browse Source 
- Give LVM jobs a dummy argument Device* so that they
  fit the functionality of makeJob for partitioning.
  For those jobs that already take an LVMDevice*, this should
  be the self-same device, but that isn't checked.
This commit is contained in:
Adriaan de Groot 2020-09-21 16:46:24 +02:00
parent 1f77441333
commit e37c7da60d
6 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -15,7 +15,10 @@
#include <kpmcore/ops/createvolumegroupoperation.h>
#include <kpmcore/util/report.h>
CreateVolumeGroupJob::CreateVolumeGroupJob( QString& vgName, QVector< const Partition* > pvList, const qint32 peSize )
CreateVolumeGroupJob::CreateVolumeGroupJob( Device*,
QString& vgName,
QVector< const Partition* > pvList,
const qint32 peSize )
: m_vgName( vgName )
, m_pvList( pvList )
, m_peSize( peSize )

3
src/modules/partition/jobs/CreateVolumeGroupJob.h
View File

@ -15,13 +15,14 @@
#include <QVector>
class Device;
class Partition;
class CreateVolumeGroupJob : public Calamares::Job
{
Q_OBJECT
public:
CreateVolumeGroupJob( QString& vgName, QVector< const Partition* > pvList, const qint32 peSize );
CreateVolumeGroupJob( Device*, QString& vgName, QVector< const Partition* > pvList, const qint32 peSize );
QString prettyName() const override;
QString prettyDescription() const override;

2
src/modules/partition/jobs/RemoveVolumeGroupJob.cpp
View File

@ -13,7 +13,7 @@
#include <kpmcore/ops/removevolumegroupoperation.h>
#include <kpmcore/util/report.h>
RemoveVolumeGroupJob::RemoveVolumeGroupJob( LvmDevice* device )
RemoveVolumeGroupJob::RemoveVolumeGroupJob( Device*, LvmDevice* device )
: m_device( device )
{
}

3
src/modules/partition/jobs/RemoveVolumeGroupJob.h
View File

@ -13,13 +13,14 @@
#include "Job.h"
#include "partition/KPMManager.h"
class Device;
class LvmDevice;
class RemoveVolumeGroupJob : public Calamares::Job
{
Q_OBJECT
public:
RemoveVolumeGroupJob( LvmDevice* device );
RemoveVolumeGroupJob( Device*, LvmDevice* device );
QString prettyName() const override;
QString prettyDescription() const override;

2
src/modules/partition/jobs/ResizeVolumeGroupJob.cpp
View File

@ -15,7 +15,7 @@
#include <kpmcore/ops/resizevolumegroupoperation.h>
#include <kpmcore/util/report.h>
ResizeVolumeGroupJob::ResizeVolumeGroupJob( LvmDevice* device, QVector< const Partition* >& partitionList )
ResizeVolumeGroupJob::ResizeVolumeGroupJob( Device*, LvmDevice* device, QVector< const Partition* >& partitionList )
: m_device( device )
, m_partitionList( partitionList )
{

3
src/modules/partition/jobs/ResizeVolumeGroupJob.h
View File

@ -15,6 +15,7 @@
#include <QVector>
class Device;
class LvmDevice;
class Partition;
@ -22,7 +23,7 @@ class ResizeVolumeGroupJob : public Calamares::Job
{
Q_OBJECT
public:
ResizeVolumeGroupJob( LvmDevice* device, QVector< const Partition* >& partitionList );
ResizeVolumeGroupJob( Device*, LvmDevice* device, QVector< const Partition* >& partitionList );
QString prettyName() const override;
QString prettyDescription() const override;