diff --git a/src/modules/license/LicensePage.cpp b/src/modules/license/LicensePage.cpp index 1fb3de7a8..8fe0a581f 100644 --- a/src/modules/license/LicensePage.cpp +++ b/src/modules/license/LicensePage.cpp @@ -154,39 +154,39 @@ LicensePage::setEntries( const QList< LicenseEntry >& entriesList ) QString productDescription; switch ( entry.type ) { - case LicenseEntry::Driver: + case LicenseEntry::Type::Driver: //: %1 is an untranslatable product name, example: Creative Audigy driver productDescription = tr( "%1 driver
" "by %2" ) .arg( entry.prettyName ) .arg( entry.prettyVendor ); break; - case LicenseEntry::GpuDriver: + case LicenseEntry::Type::GpuDriver: //: %1 is usually a vendor name, example: Nvidia graphics driver productDescription = tr( "%1 graphics driver
" "by %2" ) .arg( entry.prettyName ) .arg( entry.prettyVendor ); break; - case LicenseEntry::BrowserPlugin: + case LicenseEntry::Type::BrowserPlugin: productDescription = tr( "%1 browser plugin
" "by %2" ) .arg( entry.prettyName ) .arg( entry.prettyVendor ); break; - case LicenseEntry::Codec: + case LicenseEntry::Type::Codec: productDescription = tr( "%1 codec
" "by %2" ) .arg( entry.prettyName ) .arg( entry.prettyVendor ); break; - case LicenseEntry::Package: + case LicenseEntry::Type::Package: productDescription = tr( "%1 package
" "by %2" ) .arg( entry.prettyName ) .arg( entry.prettyVendor ); break; - case LicenseEntry::Software: + case LicenseEntry::Type::Software: productDescription = tr( "%1
" "by %2" ) .arg( entry.prettyName ) diff --git a/src/modules/license/LicensePage.h b/src/modules/license/LicensePage.h index 300e9e309..03801467c 100644 --- a/src/modules/license/LicensePage.h +++ b/src/modules/license/LicensePage.h @@ -30,9 +30,10 @@ namespace Ui class LicensePage; } -struct LicenseEntry +class LicenseEntry { - enum Type +public: + enum class Type { Software = 0, Driver, diff --git a/src/modules/license/LicenseViewStep.cpp b/src/modules/license/LicenseViewStep.cpp index 96a7b8660..d7a4c4930 100644 --- a/src/modules/license/LicenseViewStep.cpp +++ b/src/modules/license/LicenseViewStep.cpp @@ -121,17 +121,17 @@ LicenseViewStep::setConfigurationMap( const QVariantMap& configurationMap ) QString entryType = entryMap.value( "type", "software" ).toString(); if ( entryType == "driver" ) - entry.type = LicenseEntry::Driver; + entry.type = LicenseEntry::Type::Driver; else if ( entryType == "gpudriver" ) - entry.type = LicenseEntry::GpuDriver; + entry.type = LicenseEntry::Type::GpuDriver; else if ( entryType == "browserplugin" ) - entry.type = LicenseEntry::BrowserPlugin; + entry.type = LicenseEntry::Type::BrowserPlugin; else if ( entryType == "codec" ) - entry.type = LicenseEntry::Codec; + entry.type = LicenseEntry::Type::Codec; else if ( entryType == "package" ) - entry.type = LicenseEntry::Package; + entry.type = LicenseEntry::Type::Package; else - entry.type = LicenseEntry::Software; + entry.type = LicenseEntry::Type::Software; entriesList.append( entry ); }