diff --git a/kicad/cli/command.cpp b/kicad/cli/command.cpp index 8e6bc6507a..70ffe0a65c 100644 --- a/kicad/cli/command.cpp +++ b/kicad/cli/command.cpp @@ -39,9 +39,8 @@ CLI::COMMAND::COMMAND( const std::string& aName ) : { m_argParser.add_argument( ARG_HELP_SHORT, ARG_HELP ) - .default_value( false ) .help( UTF8STDSTR( ARG_HELP_DESC ) ) - .implicit_value( true ) + .flag() .nargs( 0 ); } diff --git a/kicad/cli/command_pcb_export_3d.cpp b/kicad/cli/command_pcb_export_3d.cpp index 63b56dae15..ff9d855a4b 100644 --- a/kicad/cli/command_pcb_export_3d.cpp +++ b/kicad/cli/command_pcb_export_3d.cpp @@ -86,8 +86,7 @@ CLI::PCB_EXPORT_3D_COMMAND::PCB_EXPORT_3D_COMMAND( const std::string& aNa m_argParser.add_argument( ARG_NO_UNSPECIFIED ) .help( UTF8STDSTR( _( "Exclude 3D models for components with 'Unspecified' footprint " "type" ) ) ) - .implicit_value( true ) - .default_value( false ); + .flag(); m_argParser.add_argument( ARG_NO_DNP ) .help( UTF8STDSTR( _( "Exclude 3D models for components with 'Do not populate' " diff --git a/kicad/cli/command_pcb_export_gencad.cpp b/kicad/cli/command_pcb_export_gencad.cpp index da0f45bcaf..1637b683ba 100644 --- a/kicad/cli/command_pcb_export_gencad.cpp +++ b/kicad/cli/command_pcb_export_gencad.cpp @@ -34,28 +34,22 @@ CLI::PCB_EXPORT_GENCAD_COMMAND::PCB_EXPORT_GENCAD_COMMAND() : addDefineArg(); m_argParser.add_argument( "-f", ARG_FLIP_BOTTOM_PADS ) - .default_value( false ) .help( UTF8STDSTR( _( "Flip bottom footprint padstacks" ) ) ) .flag(); m_argParser.add_argument( "", ARG_UNIQUE_PINS ) - .default_value( false ) .help( UTF8STDSTR( _( "Generate unique pin names" ) ) ) .flag(); m_argParser.add_argument( "", ARG_UNIQUE_FOOTPRINTS ) - .default_value( false ) - .help( UTF8STDSTR( _( - "Generate a new shape for each footprint instance (do not reuse shapes)" ) ) ) + .help( UTF8STDSTR( _( "Generate a new shape for each footprint instance (do not reuse shapes)" ) ) ) .flag(); m_argParser.add_argument( "", ARG_USE_DRILL_ORIGIN ) - .default_value( false ) .help( UTF8STDSTR( _( "Use drill/place file origin as origin" ) ) ) .flag(); m_argParser.add_argument( "", ARG_STORE_ORIGIN_COORD ) - .default_value( false ) .help( UTF8STDSTR( _( "Save the origin coordinates in the file" ) ) ) .flag(); } diff --git a/kicad/cli/command_pcb_export_gerber.cpp b/kicad/cli/command_pcb_export_gerber.cpp index 3141e5b435..aab800c8b9 100644 --- a/kicad/cli/command_pcb_export_gerber.cpp +++ b/kicad/cli/command_pcb_export_gerber.cpp @@ -82,8 +82,7 @@ CLI::PCB_EXPORT_GERBER_COMMAND::PCB_EXPORT_GERBER_COMMAND( const std::string& aN m_argParser.add_argument( ARG_DISABLE_APERTURE_MACROS ) .help( UTF8STDSTR( _( "Disable aperture macros" ) ) ) - .implicit_value( true ) - .default_value( false ); + .flag(); m_argParser.add_argument( ARG_USE_DRILL_FILE_ORIGIN ) .help( UTF8STDSTR( _( "Use drill/place file origin" ) ) ) diff --git a/kicad/cli/command_pcb_render.cpp b/kicad/cli/command_pcb_render.cpp index 0c8c95d551..2cc1f04b90 100644 --- a/kicad/cli/command_pcb_render.cpp +++ b/kicad/cli/command_pcb_render.cpp @@ -262,7 +262,6 @@ CLI::PCB_RENDER_COMMAND::PCB_RENDER_COMMAND() : COMMAND( "render" ) m_argParser.add_argument( ARG_USE_BOARD_STACKUP_COLORS ) .default_value( true ) - .implicit_value( true ) .help( UTF8STDSTR( _( "Colors defined in board stackup override those in preset" ) ) ); m_argParser.add_argument( ARG_FLOOR ) diff --git a/kicad/cli/command_sch_erc.cpp b/kicad/cli/command_sch_erc.cpp index a2ebe8227e..6534d08030 100644 --- a/kicad/cli/command_sch_erc.cpp +++ b/kicad/cli/command_sch_erc.cpp @@ -67,8 +67,7 @@ CLI::SCH_ERC_COMMAND::SCH_ERC_COMMAND() : COMMAND( "erc" ) m_argParser.add_argument( ARG_SEVERITY_WARNING ) .help( UTF8STDSTR( _( "Report all ERC warning level violations, this can be combined " "with the other severity arguments" ) ) ) - .implicit_value( true ) - .default_value( false ); + .flag(); m_argParser.add_argument( ARG_SEVERITY_EXCLUSIONS ) .help( UTF8STDSTR( _( "Report all excluded ERC violations, this can be combined " diff --git a/kicad/cli/command_sch_export_bom.cpp b/kicad/cli/command_sch_export_bom.cpp index 2bd05e7a33..c24eab7115 100644 --- a/kicad/cli/command_sch_export_bom.cpp +++ b/kicad/cli/command_sch_export_bom.cpp @@ -70,7 +70,6 @@ CLI::SCH_EXPORT_BOM_COMMAND::SCH_EXPORT_BOM_COMMAND() : COMMAND( "bom" ) m_argParser.add_argument( ARG_SORT_ASC ) .help( UTF8STDSTR( _( ARG_SORT_ASC_DESC ) ) ) - .implicit_value( true ) .default_value( true ); m_argParser.add_argument( ARG_FILTER ) diff --git a/kicad/cli/command_sch_export_plot.cpp b/kicad/cli/command_sch_export_plot.cpp index 23ec330518..e5427cc3cf 100644 --- a/kicad/cli/command_sch_export_plot.cpp +++ b/kicad/cli/command_sch_export_plot.cpp @@ -66,8 +66,7 @@ CLI::SCH_EXPORT_PLOT_COMMAND::SCH_EXPORT_PLOT_COMMAND( const std::string& aName, m_argParser.add_argument( "-e", ARG_EXCLUDE_DRAWING_SHEET ) .help( UTF8STDSTR( _( "No drawing sheet" ) ) ) - .implicit_value( true ) - .default_value( false ); + .flag(); m_argParser.add_argument( ARG_FONT_NAME ) .help( UTF8STDSTR( _( "Default font name" ) ) ) @@ -75,8 +74,7 @@ CLI::SCH_EXPORT_PLOT_COMMAND::SCH_EXPORT_PLOT_COMMAND( const std::string& aName, m_argParser.add_argument( ARG_DRAW_HOP_OVER ) .help( UTF8STDSTR( _( "Draw hop over at wire crossings" ) ) ) - .implicit_value( true ) - .default_value( false ); + .flag(); if( aPlotFormat == SCH_PLOT_FORMAT::PDF ) { diff --git a/kicad/kicad_cli.cpp b/kicad/kicad_cli.cpp index 05977e9070..d7f604bbc7 100644 --- a/kicad/kicad_cli.cpp +++ b/kicad/kicad_cli.cpp @@ -353,15 +353,13 @@ int PGM_KICAD::OnPgmRun() argparse::default_arguments::none ); argParser.add_argument( "-v", ARG_VERSION ) - .default_value( false ) .help( UTF8STDSTR( _( "prints version information and exits" ) ) ) - .implicit_value( true ) + .flag() .nargs( 0 ); argParser.add_argument( ARG_HELP_SHORT, ARG_HELP ) - .default_value( false ) .help( UTF8STDSTR( ARG_HELP_DESC ) ) - .implicit_value( true ) + .flag() .nargs( 0 ); for( COMMAND_ENTRY& entry : commandStack )