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

[partition] use C++11 initialization list for mountPoints

Browse Source
This commit is contained in:
Philip 2015-03-16 19:21:18 +01:00
parent 9b6f6341cb
commit a62743185a
2 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/modules/partition/gui/CreatePartitionDialog.cpp
View File

@ -55,8 +55,7 @@ CreatePartitionDialog::CreatePartitionDialog( Device* device, PartitionNode* par
{ {
m_ui->setupUi( this ); m_ui->setupUi( this );
QStringList mountPoints; QStringList mountPoints = { "/", "/boot", "/home", "/opt", "/usr", "/var" };
mountPoints << "/" << "/boot" << "/home" << "/opt" << "/usr" << "/var";
if ( QDir( "/sys/firmware/efi/efivars" ).exists() ) if ( QDir( "/sys/firmware/efi/efivars" ).exists() )
mountPoints << Calamares::JobQueue::instance()->globalStorage()->value( "efiSystemPartition" ).toString(); mountPoints << Calamares::JobQueue::instance()->globalStorage()->value( "efiSystemPartition" ).toString();
mountPoints.removeDuplicates(); mountPoints.removeDuplicates();

3
src/modules/partition/gui/EditExistingPartitionDialog.cpp
View File

@ -48,8 +48,7 @@ EditExistingPartitionDialog::EditExistingPartitionDialog( Device* device, Partit
{ {
m_ui->setupUi( this ); m_ui->setupUi( this );
QStringList mountPoints; QStringList mountPoints = { "/", "/boot", "/home", "/opt", "/usr", "/var" };
mountPoints << "/" << "/boot" << "/home" << "/opt" << "/usr" << "/var";
if ( QDir( "/sys/firmware/efi/efivars" ).exists() ) if ( QDir( "/sys/firmware/efi/efivars" ).exists() )
mountPoints << Calamares::JobQueue::instance()->globalStorage()->value( "efiSystemPartition" ).toString(); mountPoints << Calamares::JobQueue::instance()->globalStorage()->value( "efiSystemPartition" ).toString();
mountPoints.removeDuplicates(); mountPoints.removeDuplicates();