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

[calamares] Fix test-application command-line-args

Browse Source 
- use C++11 uniform-initialization
- while here, remove space from name of --global option
This commit is contained in:
Adriaan de Groot 2021-09-27 14:26:43 +02:00
parent 7cda1d2edd
commit 815bb62ae5
1 changed files with 8 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/calamares/testmain.cpp
View File

@ -71,22 +71,20 @@ handle_args( QCoreApplication& a )
{ {
QCommandLineOption debugLevelOption( QCommandLineOption debugLevelOption(
QStringLiteral( "D" ), "Verbose output for debugging purposes (0-8), ignored.", "level" ); QStringLiteral( "D" ), "Verbose output for debugging purposes (0-8), ignored.", "level" );
QCommandLineOption globalOption( QStringList() << QStringLiteral( "g" ) << QStringLiteral( "global " ), QCommandLineOption globalOption( { QStringLiteral( "g" ), QStringLiteral( "global" ) },
QStringLiteral( "Global settings document" ), QStringLiteral( "Global settings document" ),
"global.yaml" ); "global.yaml" );
QCommandLineOption jobOption( QStringList() << QStringLiteral( "j" ) << QStringLiteral( "job" ), QCommandLineOption jobOption(
QStringLiteral( "Job settings document" ), { QStringLiteral( "j" ), QStringLiteral( "job" ) }, QStringLiteral( "Job settings document" ), "job.yaml" );
"job.yaml" ); QCommandLineOption langOption( { QStringLiteral( "l" ), QStringLiteral( "language" ) },
QCommandLineOption langOption( QStringList() << QStringLiteral( "l" ) << QStringLiteral( "language" ),
QStringLiteral( "Language (global)" ), QStringLiteral( "Language (global)" ),
"languagecode" ); "languagecode" );
QCommandLineOption brandOption( QStringList() << QStringLiteral( "b" ) << QStringLiteral( "branding" ), QCommandLineOption brandOption( { QStringLiteral( "b" ), QStringLiteral( "branding" ) },
QStringLiteral( "Branding directory" ), QStringLiteral( "Branding directory" ),
"path/to/branding.desc", "path/to/branding.desc",
"src/branding/default/branding.desc" ); "src/branding/default/branding.desc" );
QCommandLineOption uiOption( QStringList() << QStringLiteral( "U" ) << QStringLiteral( "ui" ), QCommandLineOption uiOption( { QStringLiteral( "U" ), QStringLiteral( "ui" ) }, QStringLiteral( "Enable UI" ) );
QStringLiteral( "Enable UI" ) ); QCommandLineOption slideshowOption( { QStringLiteral( "s" ), QStringLiteral( "slideshow" ) },
QCommandLineOption slideshowOption( QStringList() << QStringLiteral( "s" ) << QStringLiteral( "slideshow" ),
QStringLiteral( "Run slideshow module" ) ); QStringLiteral( "Run slideshow module" ) );
QCommandLineParser parser; QCommandLineParser parser;
parser.setApplicationDescription( "Calamares module tester" ); parser.setApplicationDescription( "Calamares module tester" );
@ -101,7 +99,7 @@ handle_args( QCoreApplication& a )
parser.addOption( uiOption ); parser.addOption( uiOption );
parser.addOption( slideshowOption ); parser.addOption( slideshowOption );
#ifdef WITH_PYTHON #ifdef WITH_PYTHON
QCommandLineOption pythonOption( QStringList() << QStringLiteral( "P" ) << QStringLiteral( "no-injected-python" ), QCommandLineOption pythonOption( { QStringLiteral( "P" ), QStringLiteral( "no-injected-python" ) },
QStringLiteral( "Do not disable potentially-harmful Python commands" ) ); QStringLiteral( "Do not disable potentially-harmful Python commands" ) );
parser.addOption( pythonOption ); parser.addOption( pythonOption );
#endif #endif