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

[libcalamaresui] Chase stronger typing of ModuleDescriptor

Browse Source
This commit is contained in:
Adriaan de Groot 2020-01-24 21:46:18 +01:00
parent 5ad73681c2
commit f366e3840f
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/libcalamaresui/modulesystem/Module.cpp
View File

@ -57,7 +57,7 @@ Module::Module()
Module::~Module() {} Module::~Module() {}
void void
Module::initFrom( const QVariantMap& moduleDescriptor, const QString& id ) Module::initFrom( const Calamares::ModuleSystem::Descriptor& moduleDescriptor, const QString& id )
{ {
m_key = ModuleSystem::InstanceKey( moduleDescriptor.value( "name" ).toString(), id ); m_key = ModuleSystem::InstanceKey( moduleDescriptor.value( "name" ).toString(), id );
if ( moduleDescriptor.contains( EMERGENCY ) ) if ( moduleDescriptor.contains( EMERGENCY ) )
@ -67,7 +67,7 @@ Module::initFrom( const QVariantMap& moduleDescriptor, const QString& id )
} }
Module* Module*
Module::fromDescriptor( const QVariantMap& moduleDescriptor, Module::fromDescriptor( const Calamares::ModuleSystem::Descriptor& moduleDescriptor,
const QString& instanceId, const QString& instanceId,
const QString& configFileName, const QString& configFileName,
const QString& moduleDirectory ) const QString& moduleDirectory )

2
src/libcalamaresui/modulesystem/ModuleManager.cpp
View File

@ -142,7 +142,7 @@ ModuleManager::loadedInstanceKeys()
} }
QVariantMap Calamares::ModuleSystem::Descriptor
ModuleManager::moduleDescriptor( const QString& name ) ModuleManager::moduleDescriptor( const QString& name )
{ {
return m_availableDescriptorsByModuleName.value( name ); return m_availableDescriptorsByModuleName.value( name );