From 1356012fb468c46159baf5699aa6537c7c818b08 Mon Sep 17 00:00:00 2001
From: Adriaan de Groot <groot@kde.org>
Date: Sat, 11 Dec 2021 21:35:09 +0100
Subject: [PATCH] [partition] With rvalue, code becomes even more compact

---
 src/modules/partition/core/KPMHelpers.cpp         | 2 +-
 src/modules/partition/core/KPMHelpers.h           | 2 +-
 src/modules/partition/jobs/CreatePartitionJob.cpp | 4 ++--
 src/modules/partition/jobs/DeletePartitionJob.cpp | 3 +--
 4 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/src/modules/partition/core/KPMHelpers.cpp b/src/modules/partition/core/KPMHelpers.cpp
index 46efeb392..f836d271d 100644
--- a/src/modules/partition/core/KPMHelpers.cpp
+++ b/src/modules/partition/core/KPMHelpers.cpp
@@ -128,7 +128,7 @@ clonePartition( Device* device, Partition* partition )
 }
 
 Calamares::JobResult
-execute( Operation& operation, const QString& failureMessage )
+execute( Operation&& operation, const QString& failureMessage )
 {
     operation.setStatus( Operation::StatusRunning );
 
diff --git a/src/modules/partition/core/KPMHelpers.h b/src/modules/partition/core/KPMHelpers.h
index 1d40dd363..fe4d24f14 100644
--- a/src/modules/partition/core/KPMHelpers.h
+++ b/src/modules/partition/core/KPMHelpers.h
@@ -80,7 +80,7 @@ Partition* clonePartition( Device* device, Partition* partition );
  * Otherwise returns an error using @p failureMessage as the primary part
  * of the error, and details obtained from the operation.
  */
-Calamares::JobResult execute( Operation& operation, const QString& failureMessage );
+Calamares::JobResult execute( Operation&& operation, const QString& failureMessage );
 
 }  // namespace KPMHelpers
 
diff --git a/src/modules/partition/jobs/CreatePartitionJob.cpp b/src/modules/partition/jobs/CreatePartitionJob.cpp
index 248104226..fe7c6f350 100644
--- a/src/modules/partition/jobs/CreatePartitionJob.cpp
+++ b/src/modules/partition/jobs/CreatePartitionJob.cpp
@@ -275,9 +275,9 @@ CreatePartitionJob::exec()
         return createZfs( m_partition, m_device );
     }
 
-    NewOperation op( *m_device, m_partition );
     return KPMHelpers::execute(
-        op, tr( "The installer failed to create partition on disk '%1'." ).arg( m_device->name() ) );
+        NewOperation( *m_device, m_partition ),
+        tr( "The installer failed to create partition on disk '%1'." ).arg( m_device->name() ) );
 }
 
 void
diff --git a/src/modules/partition/jobs/DeletePartitionJob.cpp b/src/modules/partition/jobs/DeletePartitionJob.cpp
index e573d1d3c..d61bb955e 100644
--- a/src/modules/partition/jobs/DeletePartitionJob.cpp
+++ b/src/modules/partition/jobs/DeletePartitionJob.cpp
@@ -98,8 +98,7 @@ DeletePartitionJob::exec()
         return removePartition( m_partition );
     }
 
-    DeleteOperation op( *m_device, m_partition );
-    return KPMHelpers::execute( op,
+    return KPMHelpers::execute( DeleteOperation( *m_device, m_partition ),
                                 tr( "The installer failed to delete partition %1." ).arg( m_partition->devicePath() ) );
 }