From feab8bebbaee178cd125451f7e233e93b487c315 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ga=C3=ABl=20PORTAY?= Date: Thu, 12 Nov 2020 15:04:54 -0500 Subject: [PATCH] [partition] Remove unused attribute m_defaultFsType This attribute is used since the commit fcd0e8d36 [partition] Apply partition layout when replacing free space --- src/modules/partition/gui/ChoicePage.cpp | 6 ------ src/modules/partition/gui/ChoicePage.h | 1 - 2 files changed, 7 deletions(-) diff --git a/src/modules/partition/gui/ChoicePage.cpp b/src/modules/partition/gui/ChoicePage.cpp index 35aec51e4..09a32b1a2 100644 --- a/src/modules/partition/gui/ChoicePage.cpp +++ b/src/modules/partition/gui/ChoicePage.cpp @@ -90,14 +90,8 @@ ChoicePage::ChoicePage( Config* config, QWidget* parent ) auto gs = Calamares::JobQueue::instance()->globalStorage(); m_requiredPartitionTableType = gs->value( "requiredPartitionTableType" ).toStringList(); - m_defaultFsType = gs->value( "defaultFileSystemType" ).toString(); m_enableEncryptionWidget = gs->value( "enableLuksAutomatedPartitioning" ).toBool(); - if ( FileSystem::typeForName( m_defaultFsType ) == FileSystem::Unknown ) - { - m_defaultFsType = "ext4"; - } - // Set up drives combo m_mainLayout->setDirection( QBoxLayout::TopToBottom ); m_drivesLayout->setDirection( QBoxLayout::LeftToRight ); diff --git a/src/modules/partition/gui/ChoicePage.h b/src/modules/partition/gui/ChoicePage.h index 1bdee10ea..89bd775d7 100644 --- a/src/modules/partition/gui/ChoicePage.h +++ b/src/modules/partition/gui/ChoicePage.h @@ -155,7 +155,6 @@ private: int m_lastSelectedActionIndex = -1; QStringList m_requiredPartitionTableType; - QString m_defaultFsType; bool m_enableEncryptionWidget; QMutex m_coreMutex;