From 8b29acfc595dc2a39a6277f0c3c4dd79a4371037 Mon Sep 17 00:00:00 2001 From: Adriaan de Groot Date: Sat, 5 Nov 2022 22:28:53 +0100 Subject: [PATCH] [partition] Convert ReplaceWidget to use enum Add a tag-class parameter, to demonstrate that the ReplaceWidget class is never used. --- src/modules/partition/gui/ReplaceWidget.cpp | 3 ++- src/modules/partition/gui/ReplaceWidget.h | 13 ++++++++++--- 2 files changed, 12 insertions(+), 4 deletions(-) diff --git a/src/modules/partition/gui/ReplaceWidget.cpp b/src/modules/partition/gui/ReplaceWidget.cpp index 25045b8e5..dec76e413 100644 --- a/src/modules/partition/gui/ReplaceWidget.cpp +++ b/src/modules/partition/gui/ReplaceWidget.cpp @@ -32,11 +32,12 @@ using CalamaresUtils::Partition::untranslatedFS; using CalamaresUtils::Partition::userVisibleFS; -ReplaceWidget::ReplaceWidget( PartitionCoreModule* core, QComboBox* devicesComboBox, QWidget* parent ) +ReplaceWidget::ReplaceWidget( Nurble n, Config *config, PartitionCoreModule* core, QComboBox* devicesComboBox, QWidget* parent ) : QWidget( parent ) , m_ui( new Ui_ReplaceWidget ) , m_core( core ) , m_isEfi( false ) + , m_luksFsType( config->luksFileSystemType()) { m_ui->setupUi( this ); diff --git a/src/modules/partition/gui/ReplaceWidget.h b/src/modules/partition/gui/ReplaceWidget.h index fbd19b429..02fbdec4d 100644 --- a/src/modules/partition/gui/ReplaceWidget.h +++ b/src/modules/partition/gui/ReplaceWidget.h @@ -12,21 +12,27 @@ #ifndef REPLACEWIDGET_H #define REPLACEWIDGET_H +#include "Config.h" + #include "utils/CalamaresUtilsGui.h" #include #include -class Ui_ReplaceWidget; -class QComboBox; +class Config; class PartitionCoreModule; class Partition; +class Ui_ReplaceWidget; + +class QComboBox; + +struct TotallyBogus {}; class ReplaceWidget : public QWidget { Q_OBJECT public: - explicit ReplaceWidget( PartitionCoreModule* core, QComboBox* devicesComboBox, QWidget* parent = nullptr ); + explicit ReplaceWidget( TotallyBogus n, Config *config, PartitionCoreModule* core, QComboBox* devicesComboBox, QWidget* parent = nullptr ); virtual ~ReplaceWidget() override; bool isNextEnabled() const; @@ -52,6 +58,7 @@ private: bool m_nextEnabled; bool m_isEfi; + Config::LuksGeneration m_luksFsType; void updateFromCurrentDevice( QComboBox* devicesComboBox ); void onPartitionViewActivated();