applications/calamares
3
0
Fork 0
mirror of https://github.com/parchlinux/calamares.git synced 2025-02-24 10:55:46 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

[partition] Apply code style

Browse source
This commit is contained in:
Adriaan de Groot 2021-08-27 17:26:50 +02:00
parent 52a82ea1e6
commit 7d08770806
1 changed files with 50 additions and 48 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

98
src/modules/partition/core/PartitionLayout.cpp
View file

@ -138,61 +138,63 @@ PartitionLayout::init( FileSystem::Type defaultFsType, const QVariantList& confi
} }
void void
PartitionLayout::setDefaultFsType(FileSystem::Type defaultFsType) PartitionLayout::setDefaultFsType( FileSystem::Type defaultFsType )
{ {
using FileSystem = FileSystem::Type; using FileSystem = FileSystem::Type;
switch ( defaultFsType ) switch ( defaultFsType )
{ {
case FileSystem::Unknown: case FileSystem::Unknown:
case FileSystem::Unformatted: case FileSystem::Unformatted:
case FileSystem::Extended: case FileSystem::Extended:
case FileSystem::LinuxSwap: case FileSystem::LinuxSwap:
case FileSystem::Luks: case FileSystem::Luks:
case FileSystem::Ocfs2: case FileSystem::Ocfs2:
case FileSystem::Lvm2_PV: case FileSystem::Lvm2_PV:
case FileSystem::Udf: case FileSystem::Udf:
case FileSystem::Iso9660: case FileSystem::Iso9660:
#ifdef WITH_KPMCORE4API #ifdef WITH_KPMCORE4API
case FileSystem::Luks2: case FileSystem::Luks2:
case FileSystem::LinuxRaidMember: case FileSystem::LinuxRaidMember:
case FileSystem::BitLocker: case FileSystem::BitLocker:
#endif #endif
// bad bad // bad bad
cWarning() << "The selected default FS" << defaultFsType << "is not suitable." << "Using ext4 instead."; cWarning() << "The selected default FS" << defaultFsType << "is not suitable."
defaultFsType = FileSystem::Ext4; << "Using ext4 instead.";
break; defaultFsType = FileSystem::Ext4;
case FileSystem::Ext2: break;
case FileSystem::Ext3: case FileSystem::Ext2:
case FileSystem::Ext4: case FileSystem::Ext3:
case FileSystem::Fat32: case FileSystem::Ext4:
case FileSystem::Ntfs: case FileSystem::Fat32:
case FileSystem::Reiser4: case FileSystem::Ntfs:
case FileSystem::ReiserFS: case FileSystem::Reiser4:
case FileSystem::Xfs: case FileSystem::ReiserFS:
case FileSystem::Jfs: case FileSystem::Xfs:
case FileSystem::Btrfs: case FileSystem::Jfs:
case FileSystem::Exfat: case FileSystem::Btrfs:
case FileSystem::F2fs: case FileSystem::Exfat:
// ok case FileSystem::F2fs:
break; // ok
case FileSystem::Fat16: break;
case FileSystem::Hfs: case FileSystem::Fat16:
case FileSystem::HfsPlus: case FileSystem::Hfs:
case FileSystem::Ufs: case FileSystem::HfsPlus:
case FileSystem::Hpfs: case FileSystem::Ufs:
case FileSystem::Zfs: case FileSystem::Hpfs:
case FileSystem::Nilfs2: case FileSystem::Zfs:
case FileSystem::Nilfs2:
#ifdef WITH_KPMCORE4API #ifdef WITH_KPMCORE4API
case FileSystem::Fat12: case FileSystem::Fat12:
case FileSystem::Apfs: case FileSystem::Apfs:
case FileSystem::Minix: case FileSystem::Minix:
#endif #endif
// weird // weird
cWarning() << "The selected default FS" << defaultFsType << "is unusual, but not wrong."; cWarning() << "The selected default FS" << defaultFsType << "is unusual, but not wrong.";
break; break;
default: default:
cWarning() << "The selected default FS" << defaultFsType << "is not known to Calamares." << "Using ext4 instead."; cWarning() << "The selected default FS" << defaultFsType << "is not known to Calamares."
defaultFsType = FileSystem::Ext4; << "Using ext4 instead.";
defaultFsType = FileSystem::Ext4;
} }
m_defaultFsType = defaultFsType; m_defaultFsType = defaultFsType;
@ -278,7 +280,7 @@ PartitionLayout::createPartitions( Device* dev,
} }
} }
auto correctFS = [d=m_defaultFsType]( FileSystem::Type t ) { return t == FileSystem::Type::Unknown ? d : t; }; auto correctFS = [d = m_defaultFsType]( FileSystem::Type t ) { return t == FileSystem::Type::Unknown ? d : t; };
// Create the partitions. // Create the partitions.
currentSector = firstSector; currentSector = firstSector;