diff --git a/src/modules/partition/core/PartitionLayout.cpp b/src/modules/partition/core/PartitionLayout.cpp index 4f3225e94..c2489620f 100644 --- a/src/modules/partition/core/PartitionLayout.cpp +++ b/src/modules/partition/core/PartitionLayout.cpp @@ -102,18 +102,20 @@ parseSizeString( const QString& sizeString, PartitionLayout::SizeUnit* unit ) return value; } +PartitionLayout::PartitionEntry::PartitionEntry(const QString& size, const QString& min) +{ + partSize = parseSizeString( size , &partSizeUnit ); + if ( !min.isEmpty() ) + partMinSize = parseSizeString( min , &partMinSizeUnit ); +} + void PartitionLayout::addEntry( const QString& mountPoint, const QString& size, const QString& min ) { - PartitionLayout::PartitionEntry entry; + PartitionLayout::PartitionEntry entry( size, min ); entry.partMountPoint = mountPoint; entry.partFileSystem = FileSystem::Ext4; - entry.partSize = parseSizeString( size , &entry.partSizeUnit ); - if (min.isEmpty()) - entry.partMinSize = 0; - else - entry.partMinSize = parseSizeString( min , &entry.partMinSizeUnit ); partLayout.append( entry ); } @@ -121,16 +123,11 @@ PartitionLayout::addEntry( const QString& mountPoint, const QString& size, const void PartitionLayout::addEntry( const QString& label, const QString& mountPoint, const QString& fs, const QString& size, const QString& min ) { - PartitionLayout::PartitionEntry entry; + PartitionLayout::PartitionEntry entry( size, min ); entry.partLabel = label; entry.partMountPoint = mountPoint; entry.partFileSystem = FileSystem::typeForName( fs ); - entry.partSize = parseSizeString( size , &entry.partSizeUnit ); - if (min.isEmpty()) - entry.partMinSize = 0; - else - entry.partMinSize = parseSizeString( min , &entry.partMinSizeUnit ); partLayout.append( entry ); } diff --git a/src/modules/partition/core/PartitionLayout.h b/src/modules/partition/core/PartitionLayout.h index 65ed1d850..5e216122c 100644 --- a/src/modules/partition/core/PartitionLayout.h +++ b/src/modules/partition/core/PartitionLayout.h @@ -53,6 +53,11 @@ public: SizeUnit partSizeUnit = Percent; double partMinSize = 0.0L; SizeUnit partMinSizeUnit = Percent; + + /// @brief All-zeroes PartitionEntry + PartitionEntry() {}; + /// @brief Parse @p size and @p min to their respective member variables + PartitionEntry( const QString& size, const QString& min ); }; PartitionLayout();