applications/calamares
2
0
Fork 0
mirror of https://github.com/parchlinux/calamares.git synced 2025-06-28 18:05:36 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

[license] Move logic to LicenseEntry class

Browse source
This commit is contained in:
Adriaan de Groot 2019-03-22 19:31:39 +01:00
parent 81016667ae
commit 614bd3c6de
3 changed files with 36 additions and 28 deletions
Download patch file Download diff file Expand all files Collapse all files

31
src/modules/license/LicenseViewStep.cpp
View file

@ -106,34 +106,9 @@ LicenseViewStep::setConfigurationMap( const QVariantMap& configurationMap )
if ( entryV.type() != QVariant::Map )
continue;
QVariantMap entryMap = entryV.toMap();
if ( !entryMap.contains( "id" ) ||
!entryMap.contains( "name" ) ||
!entryMap.contains( "url" ) )
continue;
LicenseEntry entry;
entry.id = entryMap[ "id" ].toString();
entry.prettyName = entryMap[ "name" ].toString();
entry.prettyVendor =entryMap.value( "vendor" ).toString();
entry.url = QUrl( entryMap[ "url" ].toString() );
entry.required = entryMap.value( "required", QVariant( false ) ).toBool();
QString entryType = entryMap.value( "type", "software" ).toString();
if ( entryType == "driver" )
entry.type = LicenseEntry::Type::Driver;
else if ( entryType == "gpudriver" )
entry.type = LicenseEntry::Type::GpuDriver;
else if ( entryType == "browserplugin" )
entry.type = LicenseEntry::Type::BrowserPlugin;
else if ( entryType == "codec" )
entry.type = LicenseEntry::Type::Codec;
else if ( entryType == "package" )
entry.type = LicenseEntry::Type::Package;
else
entry.type = LicenseEntry::Type::Software;
entriesList.append( entry );
LicenseEntry entry( entryV.toMap() );
if ( entry.isValid() )
entriesList.append( entry );
}
}