GitHubのミラーです
https://github.com/FascodeNet/alterlinux-calamares
Revision | 815bb62ae520d24923b6cc1aed8c1340117f508f (tree) |
---|---|
Time | 2021-09-27 21:26:43 |
Author | Adriaan de Groot <groot@kde....> |
Commiter | Adriaan de Groot |
[calamares] Fix test-application command-line-args
- use C++11 uniform-initialization
- while here, remove space from name of --global option
@@ -71,22 +71,20 @@ handle_args( QCoreApplication& a ) | ||
71 | 71 | { |
72 | 72 | QCommandLineOption debugLevelOption( |
73 | 73 | QStringLiteral( "D" ), "Verbose output for debugging purposes (0-8), ignored.", "level" ); |
74 | - QCommandLineOption globalOption( QStringList() << QStringLiteral( "g" ) << QStringLiteral( "global " ), | |
74 | + QCommandLineOption globalOption( { QStringLiteral( "g" ), QStringLiteral( "global" ) }, | |
75 | 75 | QStringLiteral( "Global settings document" ), |
76 | 76 | "global.yaml" ); |
77 | - QCommandLineOption jobOption( QStringList() << QStringLiteral( "j" ) << QStringLiteral( "job" ), | |
78 | - QStringLiteral( "Job settings document" ), | |
79 | - "job.yaml" ); | |
80 | - QCommandLineOption langOption( QStringList() << QStringLiteral( "l" ) << QStringLiteral( "language" ), | |
77 | + QCommandLineOption jobOption( | |
78 | + { QStringLiteral( "j" ), QStringLiteral( "job" ) }, QStringLiteral( "Job settings document" ), "job.yaml" ); | |
79 | + QCommandLineOption langOption( { QStringLiteral( "l" ), QStringLiteral( "language" ) }, | |
81 | 80 | QStringLiteral( "Language (global)" ), |
82 | 81 | "languagecode" ); |
83 | - QCommandLineOption brandOption( QStringList() << QStringLiteral( "b" ) << QStringLiteral( "branding" ), | |
82 | + QCommandLineOption brandOption( { QStringLiteral( "b" ), QStringLiteral( "branding" ) }, | |
84 | 83 | QStringLiteral( "Branding directory" ), |
85 | 84 | "path/to/branding.desc", |
86 | 85 | "src/branding/default/branding.desc" ); |
87 | - QCommandLineOption uiOption( QStringList() << QStringLiteral( "U" ) << QStringLiteral( "ui" ), | |
88 | - QStringLiteral( "Enable UI" ) ); | |
89 | - QCommandLineOption slideshowOption( QStringList() << QStringLiteral( "s" ) << QStringLiteral( "slideshow" ), | |
86 | + QCommandLineOption uiOption( { QStringLiteral( "U" ), QStringLiteral( "ui" ) }, QStringLiteral( "Enable UI" ) ); | |
87 | + QCommandLineOption slideshowOption( { QStringLiteral( "s" ), QStringLiteral( "slideshow" ) }, | |
90 | 88 | QStringLiteral( "Run slideshow module" ) ); |
91 | 89 | QCommandLineParser parser; |
92 | 90 | parser.setApplicationDescription( "Calamares module tester" ); |
@@ -101,7 +99,7 @@ handle_args( QCoreApplication& a ) | ||
101 | 99 | parser.addOption( uiOption ); |
102 | 100 | parser.addOption( slideshowOption ); |
103 | 101 | #ifdef WITH_PYTHON |
104 | - QCommandLineOption pythonOption( QStringList() << QStringLiteral( "P" ) << QStringLiteral( "no-injected-python" ), | |
102 | + QCommandLineOption pythonOption( { QStringLiteral( "P" ), QStringLiteral( "no-injected-python" ) }, | |
105 | 103 | QStringLiteral( "Do not disable potentially-harmful Python commands" ) ); |
106 | 104 | parser.addOption( pythonOption ); |
107 | 105 | #endif |