napcok/calamares
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #1575 from gportay/partition-remove-unused-attribute

Browse Source 
[partition] Remove unused attribute m_defaultFsType
This commit is contained in:
Adriaan de Groot 2020-11-14 22:13:34 +01:00 committed by GitHub
commit 04c14419c8
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 0 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/modules/partition/gui/ChoicePage.cpp
View File

@ -90,14 +90,8 @@ ChoicePage::ChoicePage( Config* config, QWidget* parent )
auto gs = Calamares::JobQueue::instance()->globalStorage(); auto gs = Calamares::JobQueue::instance()->globalStorage();
m_requiredPartitionTableType = gs->value( "requiredPartitionTableType" ).toStringList(); m_requiredPartitionTableType = gs->value( "requiredPartitionTableType" ).toStringList();
m_defaultFsType = gs->value( "defaultFileSystemType" ).toString();
m_enableEncryptionWidget = gs->value( "enableLuksAutomatedPartitioning" ).toBool(); m_enableEncryptionWidget = gs->value( "enableLuksAutomatedPartitioning" ).toBool();
if ( FileSystem::typeForName( m_defaultFsType ) == FileSystem::Unknown )
{
m_defaultFsType = "ext4";
}
// Set up drives combo // Set up drives combo
m_mainLayout->setDirection( QBoxLayout::TopToBottom ); m_mainLayout->setDirection( QBoxLayout::TopToBottom );
m_drivesLayout->setDirection( QBoxLayout::LeftToRight ); m_drivesLayout->setDirection( QBoxLayout::LeftToRight );

1
src/modules/partition/gui/ChoicePage.h
View File

@ -155,7 +155,6 @@ private:
int m_lastSelectedActionIndex = -1; int m_lastSelectedActionIndex = -1;
QStringList m_requiredPartitionTableType; QStringList m_requiredPartitionTableType;
QString m_defaultFsType;
bool m_enableEncryptionWidget; bool m_enableEncryptionWidget;
QMutex m_coreMutex; QMutex m_coreMutex;