From e37c7da60dde2f9daf1e819fd11f54fa194bed18 Mon Sep 17 00:00:00 2001
From: Adriaan de Groot <groot@kde.org>
Date: Mon, 21 Sep 2020 16:46:24 +0200
Subject: [PATCH] [partition] Introduce dummy argument to LVM jobs

- 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.
---
 src/modules/partition/jobs/CreateVolumeGroupJob.cpp | 5 ++++-
 src/modules/partition/jobs/CreateVolumeGroupJob.h   | 3 ++-
 src/modules/partition/jobs/RemoveVolumeGroupJob.cpp | 2 +-
 src/modules/partition/jobs/RemoveVolumeGroupJob.h   | 3 ++-
 src/modules/partition/jobs/ResizeVolumeGroupJob.cpp | 2 +-
 src/modules/partition/jobs/ResizeVolumeGroupJob.h   | 3 ++-
 6 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/src/modules/partition/jobs/CreateVolumeGroupJob.cpp b/src/modules/partition/jobs/CreateVolumeGroupJob.cpp
index af9997df6..36d79b7b7 100644
--- a/src/modules/partition/jobs/CreateVolumeGroupJob.cpp
+++ b/src/modules/partition/jobs/CreateVolumeGroupJob.cpp
@@ -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 )
diff --git a/src/modules/partition/jobs/CreateVolumeGroupJob.h b/src/modules/partition/jobs/CreateVolumeGroupJob.h
index e9682043c..987c937c6 100644
--- a/src/modules/partition/jobs/CreateVolumeGroupJob.h
+++ b/src/modules/partition/jobs/CreateVolumeGroupJob.h
@@ -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;
diff --git a/src/modules/partition/jobs/RemoveVolumeGroupJob.cpp b/src/modules/partition/jobs/RemoveVolumeGroupJob.cpp
index a3b5b8d73..3c4e7b036 100644
--- a/src/modules/partition/jobs/RemoveVolumeGroupJob.cpp
+++ b/src/modules/partition/jobs/RemoveVolumeGroupJob.cpp
@@ -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 )
 {
 }
diff --git a/src/modules/partition/jobs/RemoveVolumeGroupJob.h b/src/modules/partition/jobs/RemoveVolumeGroupJob.h
index 03f52135b..8582e3635 100644
--- a/src/modules/partition/jobs/RemoveVolumeGroupJob.h
+++ b/src/modules/partition/jobs/RemoveVolumeGroupJob.h
@@ -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;
diff --git a/src/modules/partition/jobs/ResizeVolumeGroupJob.cpp b/src/modules/partition/jobs/ResizeVolumeGroupJob.cpp
index 0c017877e..1aa4541b8 100644
--- a/src/modules/partition/jobs/ResizeVolumeGroupJob.cpp
+++ b/src/modules/partition/jobs/ResizeVolumeGroupJob.cpp
@@ -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 )
 {
diff --git a/src/modules/partition/jobs/ResizeVolumeGroupJob.h b/src/modules/partition/jobs/ResizeVolumeGroupJob.h
index 9e3f038c2..bb3e09d75 100644
--- a/src/modules/partition/jobs/ResizeVolumeGroupJob.h
+++ b/src/modules/partition/jobs/ResizeVolumeGroupJob.h
@@ -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;