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

[partition] Simplify the retrieval of the size attributes

Browse Source 
- The variant helper toString() takes a default value since commit
  c9f942ad6 ([libcalamares] Add default value to variant helpers).
- Set the default value to 0 and simplify the retreival of size values
  by calling the helper toString() and removing the temporary variables.
This commit is contained in:
Gaël PORTAY 2020-06-21 18:16:07 -04:00
parent db7cf74034
commit 3f2dd516d3
1 changed files with 3 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
src/modules/partition/core/PartitionLayout.cpp
View File

@ -141,9 +141,6 @@ void
PartitionLayout::init( const QVariantList& config ) PartitionLayout::init( const QVariantList& config )
{ {
bool ok; bool ok;
QString sizeString;
QString minSizeString;
QString maxSizeString;
m_partLayout.clear(); m_partLayout.clear();
@ -160,33 +157,6 @@ PartitionLayout::init( const QVariantList& config )
break; break;
} }
if ( CalamaresUtils::getString( pentry, "size" ).isEmpty() )
{
sizeString.setNum( CalamaresUtils::getInteger( pentry, "size", 0 ) );
}
else
{
sizeString = CalamaresUtils::getString( pentry, "size" );
}
if ( CalamaresUtils::getString( pentry, "minSize" ).isEmpty() )
{
minSizeString.setNum( CalamaresUtils::getInteger( pentry, "minSize", 0 ) );
}
else
{
minSizeString = CalamaresUtils::getString( pentry, "minSize" );
}
if ( CalamaresUtils::getString( pentry, "maxSize" ).isEmpty() )
{
maxSizeString.setNum( CalamaresUtils::getInteger( pentry, "maxSize", 0 ) );
}
else
{
maxSizeString = CalamaresUtils::getString( pentry, "maxSize" );
}
if ( !addEntry( CalamaresUtils::getString( pentry, "name" ), if ( !addEntry( CalamaresUtils::getString( pentry, "name" ),
CalamaresUtils::getString( pentry, "uuid" ), CalamaresUtils::getString( pentry, "uuid" ),
CalamaresUtils::getString( pentry, "type" ), CalamaresUtils::getString( pentry, "type" ),
@ -194,9 +164,9 @@ PartitionLayout::init( const QVariantList& config )
CalamaresUtils::getString( pentry, "mountPoint" ), CalamaresUtils::getString( pentry, "mountPoint" ),
CalamaresUtils::getString( pentry, "filesystem" ), CalamaresUtils::getString( pentry, "filesystem" ),
CalamaresUtils::getSubMap( pentry, "features", ok ), CalamaresUtils::getSubMap( pentry, "features", ok ),
sizeString, CalamaresUtils::getString( pentry, "size", QStringLiteral( "0" ) ),
minSizeString, CalamaresUtils::getString( pentry, "minSize", QStringLiteral( "0" ) ),
maxSizeString ) ) CalamaresUtils::getString( pentry, "maxSize", QStringLiteral( "0" ) ) ) )
{ {
cError() << "Partition layout entry #" << config.indexOf( r ) << "is invalid, switching to default layout."; cError() << "Partition layout entry #" << config.indexOf( r ) << "is invalid, switching to default layout.";
m_partLayout.clear(); m_partLayout.clear();