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

[libcalamares] Replace factory method with constructor

Browse Source
This commit is contained in:
Adriaan de Groot 2024-02-20 16:53:55 +01:00
parent 0d9d2ac59a
commit 4aa2c4988c
1 changed files with 2 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -25,20 +25,6 @@
namespace Calamares
{
static CommandLine
get_variant_object( const QVariantMap& m )
{
QString command = Calamares::getString( m, "command" );
qint64 timeout = Calamares::getInteger( m, "timeout", -1 );
if ( !command.isEmpty() )
{
return CommandLine( command, timeout >= 0 ? std::chrono::seconds( timeout ) : CommandLine::TimeoutNotSet() );
}
cWarning() << "Bad CommandLine element" << m;
return CommandLine();
}
static CommandList_t
get_variant_stringlist( const QVariantList& l )
{
@ -52,7 +38,7 @@ get_variant_stringlist( const QVariantList& l )
}
else if ( Calamares::typeOf( v ) == Calamares::MapVariantType )
{
auto command( get_variant_object( v.toMap() ) );
CommandLine command( v.toMap() );
if ( command.isValid() )
{
retl.append( command );
@ -153,7 +139,7 @@ CommandList::CommandList::CommandList( const QVariant& v, bool doChroot, std::ch
}
else if ( Calamares::typeOf( v ) == Calamares::MapVariantType )
{
auto c( get_variant_object( v.toMap() ) );
CommandLine c( v.toMap() );
if ( c.isValid() )
{
append( c );