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

[libcalamaresui] Lambdas are fun, but not always the solution

Browse source
This commit is contained in:
Adriaan de Groot 2018-06-08 17:56:23 -04:00
parent a626e52bf3
commit dccf6f16f5
1 changed files with 22 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

38
src/libcalamaresui/modulesystem/ModuleManager.cpp
View file

@ -154,6 +154,26 @@ ModuleManager::moduleInstance( const QString& instanceKey )
} }
/**
* @brief Search a list of instance descriptions for one matching @p module and @p id
*
* @return -1 on failure, otherwise index of the instance that matches.
*/
static int findCustomInstance( const Settings::InstanceDescriptionList& customInstances,
const QString& module,
const QString& id )
{
for ( int i = 0; i < customInstances.count(); ++i )
{
const auto& thisInstance = customInstances[ i ];
if ( thisInstance.value( "module" ) == module &&
thisInstance.value( "id" ) == id )
return i;
}
return -1;
}
void void
ModuleManager::loadModules() ModuleManager::loadModules()
{ {
@ -196,25 +216,11 @@ ModuleManager::loadModules()
return; return;
} }
auto findCustomInstance =
[ customInstances ]( const QString& module,
const QString& id) -> int
{
for ( int i = 0; i < customInstances.count(); ++i )
{
auto thisInstance = customInstances[ i ];
if ( thisInstance.value( "module" ) == module &&
thisInstance.value( "id" ) == id )
return i;
}
return -1;
};
if ( moduleName != instanceId ) //means this is a custom instance if ( moduleName != instanceId ) //means this is a custom instance
{ {
if ( findCustomInstance( moduleName, instanceId ) > -1 ) if ( int found = findCustomInstance( customInstances, moduleName, instanceId ) > -1 )
{ {
configFileName = customInstances[ findCustomInstance( moduleName, instanceId ) ].value( "config" ); configFileName = customInstances[ found ].value( "config" );
} }
else //ought to be a custom instance, but cannot find instance entry else //ought to be a custom instance, but cannot find instance entry
{ {