From 535f81ba8a8086c2ef4b9cf91cdda5c265459276 Mon Sep 17 00:00:00 2001
From: Adriaan de Groot <groot@kde.org>
Date: Mon, 12 Jul 2021 15:02:24 +0200
Subject: [PATCH] [partition] Factor out gather job-descriptions

Since prettyStatus() and the summaryWidget share a lot of
strings and code, start factoring that out.
---
 src/modules/partition/PartitionViewStep.cpp | 31 ++++++++++-----------
 1 file changed, 15 insertions(+), 16 deletions(-)

diff --git a/src/modules/partition/PartitionViewStep.cpp b/src/modules/partition/PartitionViewStep.cpp
index 5b225811e..d4a032673 100644
--- a/src/modules/partition/PartitionViewStep.cpp
+++ b/src/modules/partition/PartitionViewStep.cpp
@@ -109,6 +109,19 @@ PartitionViewStep::prettyName() const
     return tr( "Partitions" );
 }
 
+static QStringList jobDescriptions( const Calamares::JobList& jobs )
+{
+    QStringList jobsLines;
+    for( const Calamares::job_ptr& job : qAsConst( jobs ) )
+    {
+        if ( !job->prettyDescription().isEmpty() )
+        {
+            jobsLines.append( job->prettyDescription() );
+        }
+    }
+    return jobsLines;
+}
+
 QString
 PartitionViewStep::prettyStatus() const
 {
@@ -182,14 +195,7 @@ PartitionViewStep::prettyStatus() const
         }
     }
 
-    QStringList jobsLines;
-    foreach ( const Calamares::job_ptr& job, jobs() )
-    {
-        if ( !job->prettyDescription().isEmpty() )
-        {
-            jobsLines.append( job->prettyDescription() );
-        }
-    }
+    const QStringList jobsLines = jobDescriptions( jobs() );
     if ( !jobsLines.isEmpty() )
     {
         jobsLabel = jobsLines.join( "<br/>" );
@@ -324,14 +330,7 @@ PartitionViewStep::createSummaryWidget() const
         field->addWidget( previewLabels );
         formLayout->addRow( tr( "After:" ), field );
     }
-    QStringList jobsLines;
-    foreach ( const Calamares::job_ptr& job, jobs() )
-    {
-        if ( !job->prettyDescription().isEmpty() )
-        {
-            jobsLines.append( job->prettyDescription() );
-        }
-    }
+    const QStringList jobsLines = jobDescriptions( jobs() );
     if ( !jobsLines.isEmpty() )
     {
         QLabel* jobsLabel = new QLabel( widget );