applications/calamares
3
0
Fork 0
mirror of https://github.com/parchlinux/calamares.git synced 2025-02-24 10:55:46 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

[license] Use NamedEnum

Browse source
This commit is contained in:
Adriaan de Groot 2019-04-20 11:43:19 -04:00
parent 614bd3c6de
commit dc006d58b2
1 changed files with 22 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

37
src/modules/license/LicensePage.cpp
View file

@ -22,13 +22,16 @@
#include "LicensePage.h"
#include "ui_LicensePage.h"
#include "JobQueue.h"
#include "GlobalStorage.h"
#include "utils/Logger.h"
#include "ViewManager.h"
#include "utils/CalamaresUtils.h"
#include "utils/CalamaresUtilsGui.h"
#include "utils/Logger.h"
#include "utils/NamedEnum.h"
#include "utils/Retranslator.h"
#include "ViewManager.h"
#include <QApplication>
#include <QBoxLayout>
@ -38,6 +41,21 @@
#include <QComboBox>
#include <QMessageBox>
static const NamedEnumTable< LicenseEntry::Type >&
typeNames()
{
static const NamedEnumTable< LicenseEntry::Type > names{
{ QStringLiteral( "software" ), LicenseEntry::Type::Software},
{ QStringLiteral( "driver" ), LicenseEntry::Type::Driver },
{ QStringLiteral( "gpudriver" ), LicenseEntry::Type::GpuDriver },
{ QStringLiteral( "browserplugin" ), LicenseEntry::Type::BrowserPlugin},
{ QStringLiteral( "codec" ), LicenseEntry::Type::Codec },
{ QStringLiteral( "package" ), LicenseEntry::Type::Package }
};
return names;
}
LicenseEntry::LicenseEntry(const QVariantMap& conf)
{
if ( !conf.contains( "id" ) || !conf.contains( "name" ) || !conf.contains( "url" ) )
@ -50,19 +68,8 @@ LicenseEntry::LicenseEntry(const QVariantMap& conf)
required = CalamaresUtils::getBool( conf, "required", false );
QString entryType = conf.value( "type", "software" ).toString();
if ( entryType == "driver" )
type = LicenseEntry::Type::Driver;
else if ( entryType == "gpudriver" )
type = LicenseEntry::Type::GpuDriver;
else if ( entryType == "browserplugin" )
type = LicenseEntry::Type::BrowserPlugin;
else if ( entryType == "codec" )
type = LicenseEntry::Type::Codec;
else if ( entryType == "package" )
type = LicenseEntry::Type::Package;
else
type = LicenseEntry::Type::Software;
bool ok = false;
type = typeNames().find( conf.value( "type", "software" ).toString(), ok );
}
LicensePage::LicensePage(QWidget *parent)