From b711c791bdb9cc4f660a0cd3546391c4dd16eba0 Mon Sep 17 00:00:00 2001
From: Adriaan de Groot <groot@kde.org>
Date: Sat, 3 Aug 2019 23:28:55 +0200
Subject: [PATCH] [packagechooser] Fix build, tidy code

---
 src/modules/packagechooser/PackageChooserPage.cpp  |  4 ++--
 .../packagechooser/PackageChooserViewStep.cpp      | 14 +++++++-------
 .../packagechooser/PackageChooserViewStep.h        |  2 +-
 src/modules/packagechooser/PackageModel.cpp        |  3 ++-
 src/modules/packagechooser/PackageModel.h          |  2 +-
 5 files changed, 13 insertions(+), 12 deletions(-)

diff --git a/src/modules/packagechooser/PackageChooserPage.cpp b/src/modules/packagechooser/PackageChooserPage.cpp
index f0f7cb04c..d267e4885 100644
--- a/src/modules/packagechooser/PackageChooserPage.cpp
+++ b/src/modules/packagechooser/PackageChooserPage.cpp
@@ -42,9 +42,9 @@ PackageChooserPage::PackageChooserPage( PackageChooserMode mode, QWidget* parent
     switch ( mode )
     {
     case PackageChooserMode::Optional:
-    case PackageChooserMode::Exclusive:
+    case PackageChooserMode::Required:
         ui->products->setSelectionMode( QAbstractItemView::SingleSelection );
-    case PackageChooserMode::Multiple:
+    case PackageChooserMode::OptionalMultiple:
     case PackageChooserMode::RequiredMultiple:
         ui->products->setSelectionMode( QAbstractItemView::ExtendedSelection );
     }
diff --git a/src/modules/packagechooser/PackageChooserViewStep.cpp b/src/modules/packagechooser/PackageChooserViewStep.cpp
index a8dd0e8d0..47b6f84d0 100644
--- a/src/modules/packagechooser/PackageChooserViewStep.cpp
+++ b/src/modules/packagechooser/PackageChooserViewStep.cpp
@@ -37,7 +37,7 @@ PackageChooserViewStep::PackageChooserViewStep( QObject* parent )
     : Calamares::ViewStep( parent )
     , m_widget( nullptr )
     , m_model( nullptr )
-    , m_mode( PackageChooserMode::Exclusive )
+    , m_mode( PackageChooserMode::Required )
 {
     emit nextStatusChanged( false );
 }
@@ -100,10 +100,10 @@ PackageChooserViewStep::isNextEnabled() const
     switch ( m_mode )
     {
     case PackageChooserMode::Optional:
-    case PackageChooserMode::Multiple:
+    case PackageChooserMode::OptionalMultiple:
         // zero or one OR zero or more
         return true;
-    case PackageChooserMode::Exclusive:
+    case PackageChooserMode::Required:
     case PackageChooserMode::RequiredMultiple:
         // exactly one OR one or more
         return m_widget->hasSelection();
@@ -159,17 +159,17 @@ PackageChooserViewStep::setConfigurationMap( const QVariantMap& configurationMap
     {
         m_mode = PackageChooserMode::Required;
     }
-    
+
     m_id = CalamaresUtils::getString( configurationMap, "id" );
-    
+
     // TODO: replace this hard-coded model
     if ( !m_model )
     {
 
         m_model = new PackageListModel( nullptr );
         m_model->addPackage( PackageItem { "kde", "kde", "Plasma", "Plasma Desktop", ":/images/kde.png" } );
-        m_model->addPackage(
-            PackageItem { "gnome", "gnome", "GNOME", "GNU Networked Object Modeling Environment Desktop", ":/images/gnome.png" } );
+        m_model->addPackage( PackageItem {
+            "gnome", "gnome", "GNOME", "GNU Networked Object Modeling Environment Desktop", ":/images/gnome.png" } );
 
 
         if ( m_widget )
diff --git a/src/modules/packagechooser/PackageChooserViewStep.h b/src/modules/packagechooser/PackageChooserViewStep.h
index e410e547b..55ed2d4d5 100644
--- a/src/modules/packagechooser/PackageChooserViewStep.h
+++ b/src/modules/packagechooser/PackageChooserViewStep.h
@@ -60,7 +60,7 @@ private:
 
     PackageChooserPage* m_widget;
     PackageListModel* m_model;
-    
+
     // Configuration
     PackageChooserMode m_mode;
     QString m_id;
diff --git a/src/modules/packagechooser/PackageModel.cpp b/src/modules/packagechooser/PackageModel.cpp
index 484b4de3b..eb783259b 100644
--- a/src/modules/packagechooser/PackageModel.cpp
+++ b/src/modules/packagechooser/PackageModel.cpp
@@ -35,7 +35,8 @@ roleNames()
         { "set", PackageChooserMode::OptionalMultiple },
         { "zero-or-more", PackageChooserMode::OptionalMultiple },
         { "multiple", PackageChooserMode::RequiredMultiple },
-        { "one-or-more", PackageChooserMode::RequiredMultiple } };
+        { "one-or-more", PackageChooserMode::RequiredMultiple }
+    };
     return names;
 }
 
diff --git a/src/modules/packagechooser/PackageModel.h b/src/modules/packagechooser/PackageModel.h
index 76e43ef44..dfb922e59 100644
--- a/src/modules/packagechooser/PackageModel.h
+++ b/src/modules/packagechooser/PackageModel.h
@@ -73,7 +73,7 @@ class PackageListModel : public QAbstractListModel
 public:
     PackageListModel( PackageList&& items, QObject* parent );
     PackageListModel( QObject* parent );
-    virtual ~PackageListModel();
+    virtual ~PackageListModel() override;
 
     void addPackage( PackageItem&& p );