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

[libcalamares] Reduce warnings

Browse Source 
- improve variable names, don't shadow
This commit is contained in:
Adriaan de Groot 2019-04-11 13:09:01 +02:00
parent c13c7c4891
commit 5279e78c9f
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/libcalamares/utils/CommandList.cpp
View File

@ -45,21 +45,21 @@ static CommandLine get_variant_object( const QVariantMap& m )
static CommandList_t get_variant_stringlist( const QVariantList& l )
{
CommandList_t retl;
unsigned int c = 0;
unsigned int count = 0;
for ( const auto& v : l )
{
if ( v.type() == QVariant::String )
retl.append( CommandLine( v.toString(), CommandLine::TimeoutNotSet ) );
else if ( v.type() == QVariant::Map )
{
auto c( get_variant_object( v.toMap() ) );
if ( c.isValid() )
retl.append( c );
auto command( get_variant_object( v.toMap() ) );
if ( command.isValid() )
retl.append( command );
// Otherwise warning is already given
}
else
cWarning() << "Bad CommandList element" << c << v.type() << v;
++c;
cWarning() << "Bad CommandList element" << count << v.type() << v;
++count;
}
return retl;
}