napcok/calamares
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Compatibility: revert conveniences from master

Browse Source
This commit is contained in:
Adriaan de Groot 2017-12-03 12:58:54 -05:00
parent 3a94f02547
commit ac92d4911d
2 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/modules/plasmalnf/PlasmaLnfViewStep.cpp
View File

@ -107,10 +107,10 @@ void PlasmaLnfViewStep::onLeave()
} }
Calamares::JobList QList<Calamares::job_ptr>
PlasmaLnfViewStep::jobs() const PlasmaLnfViewStep::jobs() const
{ {
Calamares::JobList l; QList<Calamares::job_ptr> l;
cDebug() << "Creating Plasma LNF jobs .."; cDebug() << "Creating Plasma LNF jobs ..";
if ( !m_themeId.isEmpty() && !m_lnfPath.isEmpty() ) if ( !m_themeId.isEmpty() && !m_lnfPath.isEmpty() )
@ -124,7 +124,10 @@ PlasmaLnfViewStep::jobs() const
void void
PlasmaLnfViewStep::setConfigurationMap( const QVariantMap& configurationMap ) PlasmaLnfViewStep::setConfigurationMap( const QVariantMap& configurationMap )
{ {
m_lnfPath = CalamaresUtils::getString( configurationMap, "lnftool" ); QString lnfPath;
if ( configurationMap.contains( "lnftool" ) && configurationMap.value( "lnftool" ).type() == QVariant::String )
lnfPath = configurationMap.value( "lnftool" ).toString();
m_lnfPath = lnfPath;
Calamares::set_lnftool( m_lnfPath ); Calamares::set_lnftool( m_lnfPath );
if (m_lnfPath.isEmpty()) if (m_lnfPath.isEmpty())

2
src/modules/plasmalnf/PlasmaLnfViewStep.h
View File

@ -52,7 +52,7 @@ public:
void onLeave() override; void onLeave() override;
Calamares::JobList jobs() const override; QList<Calamares::job_ptr> jobs() const override;
void setConfigurationMap( const QVariantMap& configurationMap ) override; void setConfigurationMap( const QVariantMap& configurationMap ) override;