Merge branch 'master' into issue-1061

This commit is contained in:
Adriaan de Groot 2019-04-24 12:26:01 -04:00
commit 3533bb3c2d
302 changed files with 38783 additions and 23647 deletions

View file

@ -473,22 +473,6 @@ PartitionViewStep::onLeave()
}
static PartitionActions::Choices::SwapChoice
nameToChoice( QString name, bool& ok )
{
using namespace PartitionActions::Choices;
static const NamedEnumTable<SwapChoice> names {
{ QStringLiteral( "none" ), SwapChoice::NoSwap },
{ QStringLiteral( "small" ), SwapChoice::SmallSwap },
{ QStringLiteral( "suspend" ), SwapChoice::FullSwap },
{ QStringLiteral( "reuse" ), SwapChoice::ReuseSwap },
{ QStringLiteral( "file" ), SwapChoice::SwapFile }
};
return names.find( name, ok );
}
void
PartitionViewStep::setConfigurationMap( const QVariantMap& configurationMap )
{