applications/calamares
2
0
Fork 0
mirror of https://github.com/parchlinux/calamares.git synced 2025-06-25 16:38:21 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

[partition] Refactor name-to-enum and back for swap choices

Browse source
This commit is contained in:
Adriaan de Groot 2018-12-04 11:15:38 +01:00
parent edc6c64657
commit 5945e9584d
3 changed files with 47 additions and 26 deletions
Download patch file Download diff file Expand all files Collapse all files

27
src/modules/partition/gui/PartitionViewStep.cpp
View file

@ -471,31 +471,6 @@ PartitionViewStep::onLeave()
}
static PartitionActions::Choices::SwapChoice
nameToChoice( QString name, bool& ok )
{
ok = false;
name = name.toLower();
using namespace PartitionActions::Choices;
// Each return here first sets ok to true, returns enum value
if ( name == QStringLiteral( "none" ) )
return( ok=true, SwapChoice::NoSwap );
else if ( name == QStringLiteral( "small" ) )
return( ok=true, SwapChoice::SmallSwap);
else if ( name == QStringLiteral( "suspend" ) )
return( ok=true, SwapChoice::FullSwap );
else if ( name == QStringLiteral( "reuse" ) )
return( ok=true, SwapChoice::ReuseSwap );
else if ( name == QStringLiteral( "file" ) )
return( ok=true, SwapChoice::SwapFile );
ok = false;
return SwapChoice::NoSwap;
}
void
PartitionViewStep::setConfigurationMap( const QVariantMap& configurationMap )
{
@ -533,7 +508,7 @@ PartitionViewStep::setConfigurationMap( const QVariantMap& configurationMap )
for ( const auto& item : l )
{
bool ok = false;
auto v = nameToChoice( item, ok );
auto v = PartitionActions::Choices::nameToChoice( item, ok );
if ( ok )
choices.insert( v );
}