From be728f78001672b7c45fcd3d07938407e43849b3 Mon Sep 17 00:00:00 2001 From: Marek Roszko Date: Mon, 4 Nov 2024 20:51:15 -0500 Subject: [PATCH] Remove aIsCli which never ended being used --- common/jobs/job.cpp | 3 +-- common/jobs/job.h | 4 +--- common/jobs/job_export_pcb_3d.cpp | 4 ++-- common/jobs/job_export_pcb_3d.h | 2 +- common/jobs/job_export_pcb_drill.cpp | 4 ++-- common/jobs/job_export_pcb_drill.h | 2 +- common/jobs/job_export_pcb_dxf.cpp | 4 ++-- common/jobs/job_export_pcb_dxf.h | 2 +- common/jobs/job_export_pcb_gencad.cpp | 4 ++-- common/jobs/job_export_pcb_gencad.h | 2 +- common/jobs/job_export_pcb_gerber.cpp | 8 ++++---- common/jobs/job_export_pcb_gerber.h | 4 ++-- common/jobs/job_export_pcb_gerbers.cpp | 4 ++-- common/jobs/job_export_pcb_gerbers.h | 2 +- common/jobs/job_export_pcb_ipc2581.cpp | 4 ++-- common/jobs/job_export_pcb_ipc2581.h | 2 +- common/jobs/job_export_pcb_pdf.cpp | 4 ++-- common/jobs/job_export_pcb_pdf.h | 2 +- common/jobs/job_export_pcb_plot.cpp | 5 ++--- common/jobs/job_export_pcb_plot.h | 2 +- common/jobs/job_export_pcb_pos.cpp | 4 ++-- common/jobs/job_export_pcb_pos.h | 2 +- common/jobs/job_export_pcb_svg.cpp | 4 ++-- common/jobs/job_export_pcb_svg.h | 2 +- common/jobs/job_export_sch_bom.cpp | 4 ++-- common/jobs/job_export_sch_bom.h | 2 +- common/jobs/job_export_sch_netlist.cpp | 4 ++-- common/jobs/job_export_sch_netlist.h | 2 +- common/jobs/job_export_sch_plot.cpp | 24 +++++++++++----------- common/jobs/job_export_sch_plot.h | 12 +++++------ common/jobs/job_export_sch_pythonbom.cpp | 4 ++-- common/jobs/job_export_sch_pythonbom.h | 2 +- common/jobs/job_fp_export_svg.cpp | 4 ++-- common/jobs/job_fp_export_svg.h | 2 +- common/jobs/job_fp_upgrade.cpp | 4 ++-- common/jobs/job_fp_upgrade.h | 2 +- common/jobs/job_pcb_drc.cpp | 4 ++-- common/jobs/job_pcb_drc.h | 2 +- common/jobs/job_pcb_render.cpp | 4 ++-- common/jobs/job_pcb_render.h | 2 +- common/jobs/job_registry.h | 2 +- common/jobs/job_sch_erc.cpp | 4 ++-- common/jobs/job_sch_erc.h | 2 +- common/jobs/job_special_execute.cpp | 4 ++-- common/jobs/job_special_execute.h | 2 +- common/jobs/job_sym_export_svg.cpp | 4 ++-- common/jobs/job_sym_export_svg.h | 2 +- common/jobs/job_sym_upgrade.cpp | 4 ++-- common/jobs/job_sym_upgrade.h | 2 +- kicad/cli/command_fp_export_svg.cpp | 2 +- kicad/cli/command_fp_upgrade.cpp | 2 +- kicad/cli/command_pcb_drc.cpp | 2 +- kicad/cli/command_pcb_export_3d.cpp | 2 +- kicad/cli/command_pcb_export_drill.cpp | 2 +- kicad/cli/command_pcb_export_dxf.cpp | 2 +- kicad/cli/command_pcb_export_gencad.cpp | 2 +- kicad/cli/command_pcb_export_gerber.cpp | 2 +- kicad/cli/command_pcb_export_gerbers.cpp | 2 +- kicad/cli/command_pcb_export_ipc2581.cpp | 2 +- kicad/cli/command_pcb_export_pdf.cpp | 2 +- kicad/cli/command_pcb_export_pos.cpp | 2 +- kicad/cli/command_pcb_export_svg.cpp | 2 +- kicad/cli/command_pcb_render.cpp | 2 +- kicad/cli/command_sch_erc.cpp | 2 +- kicad/cli/command_sch_export_bom.cpp | 2 +- kicad/cli/command_sch_export_netlist.cpp | 2 +- kicad/cli/command_sch_export_plot.cpp | 2 +- kicad/cli/command_sch_export_pythonbom.cpp | 2 +- kicad/cli/command_sym_export_svg.cpp | 2 +- kicad/cli/command_sym_upgrade.cpp | 2 +- pcbnew/pcbnew_jobs_handler.cpp | 24 ++++++++-------------- 71 files changed, 119 insertions(+), 131 deletions(-) diff --git a/common/jobs/job.cpp b/common/jobs/job.cpp index 3edb4257a4..54af58eafa 100644 --- a/common/jobs/job.cpp +++ b/common/jobs/job.cpp @@ -21,9 +21,8 @@ #include #include -JOB::JOB( const std::string& aType, bool aOutputIsDirectory, bool aIsCli ) : +JOB::JOB( const std::string& aType, bool aOutputIsDirectory ) : m_type( aType ), - m_isCli( aIsCli ), m_varOverrides(), m_tempOutputDirectory(), m_outputPath(), diff --git a/common/jobs/job.h b/common/jobs/job.h index 8b9aff32fc..a6313cea10 100644 --- a/common/jobs/job.h +++ b/common/jobs/job.h @@ -78,12 +78,11 @@ struct KICOMMON_API JOB_OUTPUT class KICOMMON_API JOB { public: - JOB( const std::string& aType, bool aOutputIsDirectory, bool aIsCli ); + JOB( const std::string& aType, bool aOutputIsDirectory ); virtual ~JOB(); const std::string& GetType() const { return m_type; }; - bool IsCli() const { return m_isCli; }; const std::map& GetVarOverrides() const { return m_varOverrides; } @@ -125,7 +124,6 @@ public: protected: std::string m_type; - bool m_isCli; std::map m_varOverrides; wxString m_tempOutputDirectory; diff --git a/common/jobs/job_export_pcb_3d.cpp b/common/jobs/job_export_pcb_3d.cpp index 8b397e5a93..1efc57fd54 100644 --- a/common/jobs/job_export_pcb_3d.cpp +++ b/common/jobs/job_export_pcb_3d.cpp @@ -74,8 +74,8 @@ wxString EXPORTER_STEP_PARAMS::GetFormatName() const } -JOB_EXPORT_PCB_3D::JOB_EXPORT_PCB_3D( bool aIsCli ) : - JOB( "3d", false, aIsCli ), +JOB_EXPORT_PCB_3D::JOB_EXPORT_PCB_3D() : + JOB( "3d", false ), m_hasUserOrigin( false ), m_filename(), m_format( JOB_EXPORT_PCB_3D::FORMAT::UNKNOWN ), diff --git a/common/jobs/job_export_pcb_3d.h b/common/jobs/job_export_pcb_3d.h index 76e1554f59..29196eafd9 100644 --- a/common/jobs/job_export_pcb_3d.h +++ b/common/jobs/job_export_pcb_3d.h @@ -101,7 +101,7 @@ public: class KICOMMON_API JOB_EXPORT_PCB_3D : public JOB { public: - JOB_EXPORT_PCB_3D( bool aIsCli ); + JOB_EXPORT_PCB_3D(); wxString GetDescription() override; enum class FORMAT diff --git a/common/jobs/job_export_pcb_drill.cpp b/common/jobs/job_export_pcb_drill.cpp index 6846bf6231..7bd4b44fdd 100644 --- a/common/jobs/job_export_pcb_drill.cpp +++ b/common/jobs/job_export_pcb_drill.cpp @@ -57,8 +57,8 @@ NLOHMANN_JSON_SERIALIZE_ENUM( JOB_EXPORT_PCB_DRILL::MAP_FORMAT, { JOB_EXPORT_PCB_DRILL::MAP_FORMAT::SVG, "svg" }, } ) -JOB_EXPORT_PCB_DRILL::JOB_EXPORT_PCB_DRILL( bool aIsCli ) : - JOB( "drill", true, aIsCli ), +JOB_EXPORT_PCB_DRILL::JOB_EXPORT_PCB_DRILL() : + JOB( "drill", true ), m_filename(), m_excellonMirrorY( false ), m_excellonMinimalHeader( false ), diff --git a/common/jobs/job_export_pcb_drill.h b/common/jobs/job_export_pcb_drill.h index ff5887082e..20b05ccc7f 100644 --- a/common/jobs/job_export_pcb_drill.h +++ b/common/jobs/job_export_pcb_drill.h @@ -29,7 +29,7 @@ class KICOMMON_API JOB_EXPORT_PCB_DRILL : public JOB { public: - JOB_EXPORT_PCB_DRILL( bool aIsCli ); + JOB_EXPORT_PCB_DRILL(); wxString GetDescription() override; diff --git a/common/jobs/job_export_pcb_dxf.cpp b/common/jobs/job_export_pcb_dxf.cpp index 54b0185d13..a6eada5085 100644 --- a/common/jobs/job_export_pcb_dxf.cpp +++ b/common/jobs/job_export_pcb_dxf.cpp @@ -28,8 +28,8 @@ NLOHMANN_JSON_SERIALIZE_ENUM( JOB_EXPORT_PCB_DXF::DXF_UNITS, { JOB_EXPORT_PCB_DXF::DXF_UNITS::MILLIMETERS, "mm" }, } ) -JOB_EXPORT_PCB_DXF::JOB_EXPORT_PCB_DXF( bool aIsCli ) : - JOB_EXPORT_PCB_PLOT( JOB_EXPORT_PCB_PLOT::PLOT_FORMAT::DXF, "dxf", false, aIsCli ), +JOB_EXPORT_PCB_DXF::JOB_EXPORT_PCB_DXF() : + JOB_EXPORT_PCB_PLOT( JOB_EXPORT_PCB_PLOT::PLOT_FORMAT::DXF, "dxf", false ), m_plotGraphicItemsUsingContours( true ), m_useDrillOrigin( false ), m_dxfUnits( DXF_UNITS::INCHES ) diff --git a/common/jobs/job_export_pcb_dxf.h b/common/jobs/job_export_pcb_dxf.h index 8d9314318e..c8615b3d8e 100644 --- a/common/jobs/job_export_pcb_dxf.h +++ b/common/jobs/job_export_pcb_dxf.h @@ -31,7 +31,7 @@ class KICOMMON_API JOB_EXPORT_PCB_DXF : public JOB_EXPORT_PCB_PLOT { public: - JOB_EXPORT_PCB_DXF( bool aIsCli ); + JOB_EXPORT_PCB_DXF(); wxString GetDescription() override; enum class DXF_UNITS diff --git a/common/jobs/job_export_pcb_gencad.cpp b/common/jobs/job_export_pcb_gencad.cpp index 8c7e6627ab..a1b292fb72 100644 --- a/common/jobs/job_export_pcb_gencad.cpp +++ b/common/jobs/job_export_pcb_gencad.cpp @@ -21,8 +21,8 @@ #include -JOB_EXPORT_PCB_GENCAD::JOB_EXPORT_PCB_GENCAD( bool aIsCli ) : - JOB( "gencad", false, aIsCli ), +JOB_EXPORT_PCB_GENCAD::JOB_EXPORT_PCB_GENCAD() : + JOB( "gencad", false ), m_flipBottomPads( false ), m_useIndividualShapes( false ), m_storeOriginCoords( false ), diff --git a/common/jobs/job_export_pcb_gencad.h b/common/jobs/job_export_pcb_gencad.h index b21558ead7..3b1b82c505 100644 --- a/common/jobs/job_export_pcb_gencad.h +++ b/common/jobs/job_export_pcb_gencad.h @@ -30,7 +30,7 @@ class KICOMMON_API JOB_EXPORT_PCB_GENCAD : public JOB { public: - JOB_EXPORT_PCB_GENCAD( bool aIsCli ); + JOB_EXPORT_PCB_GENCAD(); wxString m_filename; bool m_flipBottomPads; diff --git a/common/jobs/job_export_pcb_gerber.cpp b/common/jobs/job_export_pcb_gerber.cpp index f02bcc06b7..312abf821e 100644 --- a/common/jobs/job_export_pcb_gerber.cpp +++ b/common/jobs/job_export_pcb_gerber.cpp @@ -23,8 +23,8 @@ #include -JOB_EXPORT_PCB_GERBER::JOB_EXPORT_PCB_GERBER( const std::string& aType, bool aIsCli ) : - JOB_EXPORT_PCB_PLOT( JOB_EXPORT_PCB_PLOT::PLOT_FORMAT::GERBER, aType, false, aIsCli ), +JOB_EXPORT_PCB_GERBER::JOB_EXPORT_PCB_GERBER( const std::string& aType ) : + JOB_EXPORT_PCB_PLOT( JOB_EXPORT_PCB_PLOT::PLOT_FORMAT::GERBER, aType, false ), m_subtractSolderMaskFromSilk( false ), m_includeNetlistAttributes( true ), m_useX2Format( true ), @@ -71,8 +71,8 @@ JOB_EXPORT_PCB_GERBER::JOB_EXPORT_PCB_GERBER( const std::string& aType, bool aIs } -JOB_EXPORT_PCB_GERBER::JOB_EXPORT_PCB_GERBER( bool aIsCli ) : - JOB_EXPORT_PCB_GERBER( "gerber", aIsCli ) +JOB_EXPORT_PCB_GERBER::JOB_EXPORT_PCB_GERBER() : + JOB_EXPORT_PCB_GERBER( "gerber" ) { } diff --git a/common/jobs/job_export_pcb_gerber.h b/common/jobs/job_export_pcb_gerber.h index 37366b42ce..bba4fdd9fa 100644 --- a/common/jobs/job_export_pcb_gerber.h +++ b/common/jobs/job_export_pcb_gerber.h @@ -30,8 +30,8 @@ class KICOMMON_API JOB_EXPORT_PCB_GERBER : public JOB_EXPORT_PCB_PLOT { public: - JOB_EXPORT_PCB_GERBER( const std::string& aType, bool aIsCli ); - JOB_EXPORT_PCB_GERBER( bool aIsCli ); + JOB_EXPORT_PCB_GERBER( const std::string& aType ); + JOB_EXPORT_PCB_GERBER(); wxString GetDescription() override; bool m_subtractSolderMaskFromSilk; diff --git a/common/jobs/job_export_pcb_gerbers.cpp b/common/jobs/job_export_pcb_gerbers.cpp index fd9dce9380..76c599988f 100644 --- a/common/jobs/job_export_pcb_gerbers.cpp +++ b/common/jobs/job_export_pcb_gerbers.cpp @@ -23,8 +23,8 @@ #include #include -JOB_EXPORT_PCB_GERBERS::JOB_EXPORT_PCB_GERBERS( bool aIsCli ) : - JOB_EXPORT_PCB_GERBER( "gerbers", aIsCli ), +JOB_EXPORT_PCB_GERBERS::JOB_EXPORT_PCB_GERBERS() : + JOB_EXPORT_PCB_GERBER( "gerbers" ), m_layersIncludeOnAll(), m_layersIncludeOnAllSet( false ), m_useBoardPlotParams( false ) diff --git a/common/jobs/job_export_pcb_gerbers.h b/common/jobs/job_export_pcb_gerbers.h index 8f7eb00177..b4f5dbf09a 100644 --- a/common/jobs/job_export_pcb_gerbers.h +++ b/common/jobs/job_export_pcb_gerbers.h @@ -31,7 +31,7 @@ class KICOMMON_API JOB_EXPORT_PCB_GERBERS : public JOB_EXPORT_PCB_GERBER { public: - JOB_EXPORT_PCB_GERBERS( bool aIsCli ); + JOB_EXPORT_PCB_GERBERS(); wxString GetDescription() override; LSET m_layersIncludeOnAll; diff --git a/common/jobs/job_export_pcb_ipc2581.cpp b/common/jobs/job_export_pcb_ipc2581.cpp index e1b5509c84..a635e0cc8a 100644 --- a/common/jobs/job_export_pcb_ipc2581.cpp +++ b/common/jobs/job_export_pcb_ipc2581.cpp @@ -35,8 +35,8 @@ NLOHMANN_JSON_SERIALIZE_ENUM( JOB_EXPORT_PCB_IPC2581::IPC2581_VERSION, { JOB_EXPORT_PCB_IPC2581::IPC2581_VERSION::C, "C" }, } ) -JOB_EXPORT_PCB_IPC2581::JOB_EXPORT_PCB_IPC2581( bool aIsCli ) : - JOB( "ipc2581", false, aIsCli ), +JOB_EXPORT_PCB_IPC2581::JOB_EXPORT_PCB_IPC2581() : + JOB( "ipc2581", false ), m_filename(), m_drawingSheet(), m_units( IPC2581_UNITS::MILLIMETERS ), diff --git a/common/jobs/job_export_pcb_ipc2581.h b/common/jobs/job_export_pcb_ipc2581.h index b965185f2f..8d03d1996a 100644 --- a/common/jobs/job_export_pcb_ipc2581.h +++ b/common/jobs/job_export_pcb_ipc2581.h @@ -28,7 +28,7 @@ class KICOMMON_API JOB_EXPORT_PCB_IPC2581 : public JOB { public: - JOB_EXPORT_PCB_IPC2581( bool aIsCli ); + JOB_EXPORT_PCB_IPC2581(); wxString GetDescription() override; void SetDefaultOutputPath( const wxString& aReferenceName ); diff --git a/common/jobs/job_export_pcb_pdf.cpp b/common/jobs/job_export_pcb_pdf.cpp index 8e502095fb..297eda16eb 100644 --- a/common/jobs/job_export_pcb_pdf.cpp +++ b/common/jobs/job_export_pcb_pdf.cpp @@ -23,8 +23,8 @@ #include -JOB_EXPORT_PCB_PDF::JOB_EXPORT_PCB_PDF( bool aIsCli ) : - JOB_EXPORT_PCB_PLOT( JOB_EXPORT_PCB_PLOT::PLOT_FORMAT::PDF, "pdf", false, aIsCli ) +JOB_EXPORT_PCB_PDF::JOB_EXPORT_PCB_PDF() : + JOB_EXPORT_PCB_PLOT( JOB_EXPORT_PCB_PLOT::PLOT_FORMAT::PDF, "pdf", false ) { m_plotDrawingSheet = false; diff --git a/common/jobs/job_export_pcb_pdf.h b/common/jobs/job_export_pcb_pdf.h index 6b642c6271..b2c37cf22f 100644 --- a/common/jobs/job_export_pcb_pdf.h +++ b/common/jobs/job_export_pcb_pdf.h @@ -31,7 +31,7 @@ class KICOMMON_API JOB_EXPORT_PCB_PDF : public JOB_EXPORT_PCB_PLOT { public: - JOB_EXPORT_PCB_PDF( bool aIsCli ); + JOB_EXPORT_PCB_PDF(); wxString GetDescription() override; }; diff --git a/common/jobs/job_export_pcb_plot.cpp b/common/jobs/job_export_pcb_plot.cpp index 6dc647a304..f086ce4acd 100644 --- a/common/jobs/job_export_pcb_plot.cpp +++ b/common/jobs/job_export_pcb_plot.cpp @@ -3,9 +3,8 @@ #include JOB_EXPORT_PCB_PLOT::JOB_EXPORT_PCB_PLOT( PLOT_FORMAT aFormat, const std::string& aType, - bool aOutputIsDirectory, - bool aIsCli ) - : JOB( aType, aOutputIsDirectory, aIsCli ), + bool aOutputIsDirectory ) + : JOB( aType, aOutputIsDirectory ), m_plotFormat( aFormat ), m_filename(), m_colorTheme(), diff --git a/common/jobs/job_export_pcb_plot.h b/common/jobs/job_export_pcb_plot.h index 23aec50f68..d2e80d1086 100644 --- a/common/jobs/job_export_pcb_plot.h +++ b/common/jobs/job_export_pcb_plot.h @@ -40,7 +40,7 @@ public: SVG }; - JOB_EXPORT_PCB_PLOT( PLOT_FORMAT aFormat, const std::string& aType, bool aOutputIsDirectory, bool aIsCli ); + JOB_EXPORT_PCB_PLOT( PLOT_FORMAT aFormat, const std::string& aType, bool aOutputIsDirectory ); PLOT_FORMAT m_plotFormat; diff --git a/common/jobs/job_export_pcb_pos.cpp b/common/jobs/job_export_pcb_pos.cpp index 74fd4a416f..9589a3cde6 100644 --- a/common/jobs/job_export_pcb_pos.cpp +++ b/common/jobs/job_export_pcb_pos.cpp @@ -43,8 +43,8 @@ NLOHMANN_JSON_SERIALIZE_ENUM( JOB_EXPORT_PCB_POS::UNITS, { JOB_EXPORT_PCB_POS::UNITS::MILLIMETERS, "mm" }, } ) -JOB_EXPORT_PCB_POS::JOB_EXPORT_PCB_POS( bool aIsCli ) : - JOB( "pos", false, aIsCli ), +JOB_EXPORT_PCB_POS::JOB_EXPORT_PCB_POS() : + JOB( "pos", false ), m_filename(), m_useDrillPlaceFileOrigin( true ), m_smdOnly( false ), diff --git a/common/jobs/job_export_pcb_pos.h b/common/jobs/job_export_pcb_pos.h index 58ab0f34cb..bba4e3b3d0 100644 --- a/common/jobs/job_export_pcb_pos.h +++ b/common/jobs/job_export_pcb_pos.h @@ -29,7 +29,7 @@ class KICOMMON_API JOB_EXPORT_PCB_POS : public JOB { public: - JOB_EXPORT_PCB_POS( bool aIsCli ); + JOB_EXPORT_PCB_POS(); wxString GetDescription() override; void SetDefaultOutputPath( const wxString& aReferenceName ); diff --git a/common/jobs/job_export_pcb_svg.cpp b/common/jobs/job_export_pcb_svg.cpp index 9ccce1fc5d..a9b54968a5 100644 --- a/common/jobs/job_export_pcb_svg.cpp +++ b/common/jobs/job_export_pcb_svg.cpp @@ -23,8 +23,8 @@ #include -JOB_EXPORT_PCB_SVG::JOB_EXPORT_PCB_SVG( bool aIsCli ) : - JOB_EXPORT_PCB_PLOT( JOB_EXPORT_PCB_PLOT::PLOT_FORMAT::SVG, "svg", false, aIsCli ), +JOB_EXPORT_PCB_SVG::JOB_EXPORT_PCB_SVG() : + JOB_EXPORT_PCB_PLOT( JOB_EXPORT_PCB_PLOT::PLOT_FORMAT::SVG, "svg", false ), m_pageSizeMode( 0 ) { m_plotDrawingSheet = true; diff --git a/common/jobs/job_export_pcb_svg.h b/common/jobs/job_export_pcb_svg.h index 654cecc89c..8c5d3e64fa 100644 --- a/common/jobs/job_export_pcb_svg.h +++ b/common/jobs/job_export_pcb_svg.h @@ -31,7 +31,7 @@ class KICOMMON_API JOB_EXPORT_PCB_SVG : public JOB_EXPORT_PCB_PLOT { public: - JOB_EXPORT_PCB_SVG( bool aIsCli ); + JOB_EXPORT_PCB_SVG(); wxString GetDescription() override; int m_pageSizeMode; diff --git a/common/jobs/job_export_sch_bom.cpp b/common/jobs/job_export_sch_bom.cpp index 1f72b1c3c4..9c83a29da6 100644 --- a/common/jobs/job_export_sch_bom.cpp +++ b/common/jobs/job_export_sch_bom.cpp @@ -23,8 +23,8 @@ #include -JOB_EXPORT_SCH_BOM::JOB_EXPORT_SCH_BOM( bool aIsCli ) : - JOB( "bom", false, aIsCli ), +JOB_EXPORT_SCH_BOM::JOB_EXPORT_SCH_BOM() : + JOB( "bom", false), m_filename(), m_fieldDelimiter(), diff --git a/common/jobs/job_export_sch_bom.h b/common/jobs/job_export_sch_bom.h index 97d668680d..ab639aaf53 100644 --- a/common/jobs/job_export_sch_bom.h +++ b/common/jobs/job_export_sch_bom.h @@ -29,7 +29,7 @@ class KICOMMON_API JOB_EXPORT_SCH_BOM : public JOB { public: - JOB_EXPORT_SCH_BOM( bool aIsCli ); + JOB_EXPORT_SCH_BOM(); wxString GetDescription() override; // Basic options diff --git a/common/jobs/job_export_sch_netlist.cpp b/common/jobs/job_export_sch_netlist.cpp index 694f6818d7..2d21e166e1 100644 --- a/common/jobs/job_export_sch_netlist.cpp +++ b/common/jobs/job_export_sch_netlist.cpp @@ -35,8 +35,8 @@ NLOHMANN_JSON_SERIALIZE_ENUM( JOB_EXPORT_SCH_NETLIST::FORMAT, { JOB_EXPORT_SCH_NETLIST::FORMAT::SPICEMODEL, "spicemodel" }, } ) -JOB_EXPORT_SCH_NETLIST::JOB_EXPORT_SCH_NETLIST( bool aIsCli ) : - JOB( "netlist", false, aIsCli ), +JOB_EXPORT_SCH_NETLIST::JOB_EXPORT_SCH_NETLIST() : + JOB( "netlist", false ), m_filename(), format( FORMAT::KICADSEXPR ), m_spiceSaveAllVoltages( false ), diff --git a/common/jobs/job_export_sch_netlist.h b/common/jobs/job_export_sch_netlist.h index d0717811cd..c1cae35a2a 100644 --- a/common/jobs/job_export_sch_netlist.h +++ b/common/jobs/job_export_sch_netlist.h @@ -28,7 +28,7 @@ class KICOMMON_API JOB_EXPORT_SCH_NETLIST : public JOB { public: - JOB_EXPORT_SCH_NETLIST( bool aIsCli ); + JOB_EXPORT_SCH_NETLIST(); wxString GetDescription() override; wxString m_filename; diff --git a/common/jobs/job_export_sch_plot.cpp b/common/jobs/job_export_sch_plot.cpp index 063e460954..5f73ec9131 100644 --- a/common/jobs/job_export_sch_plot.cpp +++ b/common/jobs/job_export_sch_plot.cpp @@ -63,8 +63,8 @@ NLOHMANN_JSON_SERIALIZE_ENUM( SCH_PLOT_FORMAT, { SCH_PLOT_FORMAT::DXF, "dxf" }, } ) -JOB_EXPORT_SCH_PLOT::JOB_EXPORT_SCH_PLOT( bool aIsCli ) : - JOB( "plot", false, aIsCli ), +JOB_EXPORT_SCH_PLOT::JOB_EXPORT_SCH_PLOT() : + JOB( "plot", false ), m_plotFormat( SCH_PLOT_FORMAT::PDF ), m_filename(), m_drawingSheet(), @@ -122,36 +122,36 @@ wxString JOB_EXPORT_SCH_PLOT::GetDescription() } -JOB_EXPORT_SCH_PLOT_PDF::JOB_EXPORT_SCH_PLOT_PDF( bool aIsCli ) : - JOB_EXPORT_SCH_PLOT( aIsCli ) +JOB_EXPORT_SCH_PLOT_PDF::JOB_EXPORT_SCH_PLOT_PDF() : + JOB_EXPORT_SCH_PLOT() { m_plotFormat = SCH_PLOT_FORMAT::PDF; } -JOB_EXPORT_SCH_PLOT_DXF ::JOB_EXPORT_SCH_PLOT_DXF ( bool aIsCli ) : - JOB_EXPORT_SCH_PLOT( aIsCli ) +JOB_EXPORT_SCH_PLOT_DXF ::JOB_EXPORT_SCH_PLOT_DXF () : + JOB_EXPORT_SCH_PLOT() { m_plotFormat = SCH_PLOT_FORMAT::DXF; } -JOB_EXPORT_SCH_PLOT_SVG::JOB_EXPORT_SCH_PLOT_SVG( bool aIsCli ) : - JOB_EXPORT_SCH_PLOT( aIsCli ) +JOB_EXPORT_SCH_PLOT_SVG::JOB_EXPORT_SCH_PLOT_SVG() : + JOB_EXPORT_SCH_PLOT() { m_plotFormat = SCH_PLOT_FORMAT::SVG; } -JOB_EXPORT_SCH_PLOT_PS::JOB_EXPORT_SCH_PLOT_PS( bool aIsCli ) : - JOB_EXPORT_SCH_PLOT( aIsCli ) +JOB_EXPORT_SCH_PLOT_PS::JOB_EXPORT_SCH_PLOT_PS() : + JOB_EXPORT_SCH_PLOT() { m_plotFormat = SCH_PLOT_FORMAT::POST; } -JOB_EXPORT_SCH_PLOT_HPGL::JOB_EXPORT_SCH_PLOT_HPGL( bool aIsCli ) : - JOB_EXPORT_SCH_PLOT( aIsCli ) +JOB_EXPORT_SCH_PLOT_HPGL::JOB_EXPORT_SCH_PLOT_HPGL() : + JOB_EXPORT_SCH_PLOT() { m_plotFormat = SCH_PLOT_FORMAT::HPGL; } diff --git a/common/jobs/job_export_sch_plot.h b/common/jobs/job_export_sch_plot.h index 9897fd49e5..8e185f06ab 100644 --- a/common/jobs/job_export_sch_plot.h +++ b/common/jobs/job_export_sch_plot.h @@ -75,7 +75,7 @@ enum class SCH_PLOT_FORMAT class KICOMMON_API JOB_EXPORT_SCH_PLOT : public JOB { public: - JOB_EXPORT_SCH_PLOT( bool aIsCli ); + JOB_EXPORT_SCH_PLOT(); wxString GetDescription() override; SCH_PLOT_FORMAT m_plotFormat; @@ -106,35 +106,35 @@ public: class KICOMMON_API JOB_EXPORT_SCH_PLOT_PDF : public JOB_EXPORT_SCH_PLOT { public: - JOB_EXPORT_SCH_PLOT_PDF( bool aIsCli ); + JOB_EXPORT_SCH_PLOT_PDF(); }; class KICOMMON_API JOB_EXPORT_SCH_PLOT_DXF : public JOB_EXPORT_SCH_PLOT { public: - JOB_EXPORT_SCH_PLOT_DXF( bool aIsCli ); + JOB_EXPORT_SCH_PLOT_DXF(); }; class KICOMMON_API JOB_EXPORT_SCH_PLOT_SVG : public JOB_EXPORT_SCH_PLOT { public: - JOB_EXPORT_SCH_PLOT_SVG( bool aIsCli ); + JOB_EXPORT_SCH_PLOT_SVG(); }; class KICOMMON_API JOB_EXPORT_SCH_PLOT_PS : public JOB_EXPORT_SCH_PLOT { public: - JOB_EXPORT_SCH_PLOT_PS( bool aIsCli ); + JOB_EXPORT_SCH_PLOT_PS(); }; class KICOMMON_API JOB_EXPORT_SCH_PLOT_HPGL : public JOB_EXPORT_SCH_PLOT { public: - JOB_EXPORT_SCH_PLOT_HPGL( bool aIsCli ); + JOB_EXPORT_SCH_PLOT_HPGL(); }; #endif \ No newline at end of file diff --git a/common/jobs/job_export_sch_pythonbom.cpp b/common/jobs/job_export_sch_pythonbom.cpp index c159282e9a..3c643c96ad 100644 --- a/common/jobs/job_export_sch_pythonbom.cpp +++ b/common/jobs/job_export_sch_pythonbom.cpp @@ -23,8 +23,8 @@ #include -JOB_EXPORT_SCH_PYTHONBOM::JOB_EXPORT_SCH_PYTHONBOM( bool aIsCli ) : - JOB( "pythonbom", false, aIsCli ), +JOB_EXPORT_SCH_PYTHONBOM::JOB_EXPORT_SCH_PYTHONBOM() : + JOB( "pythonbom", false ), m_filename() { } diff --git a/common/jobs/job_export_sch_pythonbom.h b/common/jobs/job_export_sch_pythonbom.h index 60a79aee1b..3f43438cdc 100644 --- a/common/jobs/job_export_sch_pythonbom.h +++ b/common/jobs/job_export_sch_pythonbom.h @@ -28,7 +28,7 @@ class KICOMMON_API JOB_EXPORT_SCH_PYTHONBOM : public JOB { public: - JOB_EXPORT_SCH_PYTHONBOM( bool aIsCli ); + JOB_EXPORT_SCH_PYTHONBOM(); wxString GetDescription() override; wxString m_filename; diff --git a/common/jobs/job_fp_export_svg.cpp b/common/jobs/job_fp_export_svg.cpp index 1bc54c56e2..59c45bed51 100644 --- a/common/jobs/job_fp_export_svg.cpp +++ b/common/jobs/job_fp_export_svg.cpp @@ -21,8 +21,8 @@ #include -JOB_FP_EXPORT_SVG::JOB_FP_EXPORT_SVG( bool aIsCli ) : - JOB( "fpsvg", true, aIsCli ), +JOB_FP_EXPORT_SVG::JOB_FP_EXPORT_SVG() : + JOB( "fpsvg", true ), m_libraryPath(), m_footprint(), m_blackAndWhite( false ), diff --git a/common/jobs/job_fp_export_svg.h b/common/jobs/job_fp_export_svg.h index da3fdb4bfe..ad814b1594 100644 --- a/common/jobs/job_fp_export_svg.h +++ b/common/jobs/job_fp_export_svg.h @@ -30,7 +30,7 @@ class KICOMMON_API JOB_FP_EXPORT_SVG : public JOB { public: - JOB_FP_EXPORT_SVG( bool aIsCli ); + JOB_FP_EXPORT_SVG(); wxString m_libraryPath; wxString m_footprint; diff --git a/common/jobs/job_fp_upgrade.cpp b/common/jobs/job_fp_upgrade.cpp index 621dee3525..29abd8efa8 100644 --- a/common/jobs/job_fp_upgrade.cpp +++ b/common/jobs/job_fp_upgrade.cpp @@ -21,8 +21,8 @@ #include -JOB_FP_UPGRADE::JOB_FP_UPGRADE( bool aIsCli ) : - JOB( "fpupgrade", true, aIsCli ), +JOB_FP_UPGRADE::JOB_FP_UPGRADE() : + JOB( "fpupgrade", true ), m_libraryPath(), m_force( false ) { diff --git a/common/jobs/job_fp_upgrade.h b/common/jobs/job_fp_upgrade.h index 0e96de0db9..d042a23810 100644 --- a/common/jobs/job_fp_upgrade.h +++ b/common/jobs/job_fp_upgrade.h @@ -28,7 +28,7 @@ class KICOMMON_API JOB_FP_UPGRADE : public JOB { public: - JOB_FP_UPGRADE( bool aIsCli ); + JOB_FP_UPGRADE(); wxString m_libraryPath; wxString m_outputLibraryPath; diff --git a/common/jobs/job_pcb_drc.cpp b/common/jobs/job_pcb_drc.cpp index b6c6c5bae9..5dadd43084 100644 --- a/common/jobs/job_pcb_drc.cpp +++ b/common/jobs/job_pcb_drc.cpp @@ -35,8 +35,8 @@ NLOHMANN_JSON_SERIALIZE_ENUM( JOB_PCB_DRC::OUTPUT_FORMAT, { JOB_PCB_DRC::OUTPUT_FORMAT::JSON, "json" }, } ) -JOB_PCB_DRC::JOB_PCB_DRC( bool aIsCli ) : - JOB( "drc", false, aIsCli ), +JOB_PCB_DRC::JOB_PCB_DRC() : + JOB( "drc", false ), m_filename(), m_reportAllTrackErrors( false ), m_units( JOB_PCB_DRC::UNITS::MILLIMETERS ), diff --git a/common/jobs/job_pcb_drc.h b/common/jobs/job_pcb_drc.h index a1d238fcd7..2d69456c75 100644 --- a/common/jobs/job_pcb_drc.h +++ b/common/jobs/job_pcb_drc.h @@ -30,7 +30,7 @@ class KICOMMON_API JOB_PCB_DRC : public JOB { public: - JOB_PCB_DRC( bool aIsCli ); + JOB_PCB_DRC(); wxString GetDescription() override; wxString m_filename; diff --git a/common/jobs/job_pcb_render.cpp b/common/jobs/job_pcb_render.cpp index 2dd0c8e302..f7f1e4b3b5 100644 --- a/common/jobs/job_pcb_render.cpp +++ b/common/jobs/job_pcb_render.cpp @@ -22,7 +22,7 @@ #include -JOB_PCB_RENDER::JOB_PCB_RENDER( bool aIsCli ) : - JOB( "render", false, aIsCli ), m_filename() +JOB_PCB_RENDER::JOB_PCB_RENDER() : + JOB( "render", false ), m_filename() { } \ No newline at end of file diff --git a/common/jobs/job_pcb_render.h b/common/jobs/job_pcb_render.h index 7cf52b85bd..0801188b25 100644 --- a/common/jobs/job_pcb_render.h +++ b/common/jobs/job_pcb_render.h @@ -31,7 +31,7 @@ class KICOMMON_API JOB_PCB_RENDER : public JOB { public: - JOB_PCB_RENDER( bool aIsCli ); + JOB_PCB_RENDER(); wxString m_filename; wxString m_outputFile; diff --git a/common/jobs/job_registry.h b/common/jobs/job_registry.h index 4f529056b2..4cb2b8ba39 100644 --- a/common/jobs/job_registry.h +++ b/common/jobs/job_registry.h @@ -64,7 +64,7 @@ private: #define REGISTER_JOB( job_name, title, face, T ) bool job_name##_entry = JOB_REGISTRY::Add( #job_name, \ { face, []() \ { \ - return new T( true ); \ + return new T(); \ }, \ title } ) // newline required to appease warning for REGISTER_JOB macro \ No newline at end of file diff --git a/common/jobs/job_sch_erc.cpp b/common/jobs/job_sch_erc.cpp index 02dc7a4089..7e800d013e 100644 --- a/common/jobs/job_sch_erc.cpp +++ b/common/jobs/job_sch_erc.cpp @@ -35,8 +35,8 @@ NLOHMANN_JSON_SERIALIZE_ENUM( JOB_SCH_ERC::OUTPUT_FORMAT, { JOB_SCH_ERC::OUTPUT_FORMAT::JSON, "json" }, } ) -JOB_SCH_ERC::JOB_SCH_ERC( bool aIsCli ) : - JOB( "erc", false, aIsCli ), +JOB_SCH_ERC::JOB_SCH_ERC() : + JOB( "erc", false ), m_filename(), m_units( JOB_SCH_ERC::UNITS::MILLIMETERS ), m_severity( RPT_SEVERITY_ERROR | RPT_SEVERITY_WARNING ), diff --git a/common/jobs/job_sch_erc.h b/common/jobs/job_sch_erc.h index 5086029e1a..e2500abe7c 100644 --- a/common/jobs/job_sch_erc.h +++ b/common/jobs/job_sch_erc.h @@ -30,7 +30,7 @@ class KICOMMON_API JOB_SCH_ERC : public JOB { public: - JOB_SCH_ERC( bool aIsCli ); + JOB_SCH_ERC(); wxString GetDescription() override; wxString m_filename; diff --git a/common/jobs/job_special_execute.cpp b/common/jobs/job_special_execute.cpp index 99d0f5e0ea..1c27ec3ec4 100644 --- a/common/jobs/job_special_execute.cpp +++ b/common/jobs/job_special_execute.cpp @@ -22,8 +22,8 @@ #include #include -JOB_SPECIAL_EXECUTE::JOB_SPECIAL_EXECUTE( bool aIsCli ) : - JOB( "special_execute", false, aIsCli ), +JOB_SPECIAL_EXECUTE::JOB_SPECIAL_EXECUTE() : + JOB( "special_execute", false ), m_command(), m_ignoreExitcode( false ), m_recordOutput( true ) diff --git a/common/jobs/job_special_execute.h b/common/jobs/job_special_execute.h index 86f589bdb9..eb6b33bd3a 100644 --- a/common/jobs/job_special_execute.h +++ b/common/jobs/job_special_execute.h @@ -27,7 +27,7 @@ class KICOMMON_API JOB_SPECIAL_EXECUTE : public JOB { public: - JOB_SPECIAL_EXECUTE( bool aIsCli ); + JOB_SPECIAL_EXECUTE(); wxString GetDescription() override; diff --git a/common/jobs/job_sym_export_svg.cpp b/common/jobs/job_sym_export_svg.cpp index c8982d2561..24e2f81336 100644 --- a/common/jobs/job_sym_export_svg.cpp +++ b/common/jobs/job_sym_export_svg.cpp @@ -21,8 +21,8 @@ #include -JOB_SYM_EXPORT_SVG::JOB_SYM_EXPORT_SVG( bool aIsCli ) : - JOB( "symsvg", true, aIsCli ), +JOB_SYM_EXPORT_SVG::JOB_SYM_EXPORT_SVG() : + JOB( "symsvg", true), m_libraryPath(), m_symbol(), m_blackAndWhite( false ), diff --git a/common/jobs/job_sym_export_svg.h b/common/jobs/job_sym_export_svg.h index b508ae1ff8..a47d52f934 100644 --- a/common/jobs/job_sym_export_svg.h +++ b/common/jobs/job_sym_export_svg.h @@ -28,7 +28,7 @@ class KICOMMON_API JOB_SYM_EXPORT_SVG : public JOB { public: - JOB_SYM_EXPORT_SVG( bool aIsCli ); + JOB_SYM_EXPORT_SVG(); wxString m_libraryPath; wxString m_symbol; diff --git a/common/jobs/job_sym_upgrade.cpp b/common/jobs/job_sym_upgrade.cpp index 43e923809f..17aca481a2 100644 --- a/common/jobs/job_sym_upgrade.cpp +++ b/common/jobs/job_sym_upgrade.cpp @@ -21,8 +21,8 @@ #include -JOB_SYM_UPGRADE::JOB_SYM_UPGRADE( bool aIsCli ) : - JOB( "symupgrade", false, aIsCli ), +JOB_SYM_UPGRADE::JOB_SYM_UPGRADE() : + JOB( "symupgrade", false ), m_libraryPath(), m_outputLibraryPath(), m_force( false ) diff --git a/common/jobs/job_sym_upgrade.h b/common/jobs/job_sym_upgrade.h index 6f74937ec4..a2e62a4184 100644 --- a/common/jobs/job_sym_upgrade.h +++ b/common/jobs/job_sym_upgrade.h @@ -28,7 +28,7 @@ class KICOMMON_API JOB_SYM_UPGRADE : public JOB { public: - JOB_SYM_UPGRADE( bool aIsCli ); + JOB_SYM_UPGRADE(); wxString m_libraryPath; wxString m_outputLibraryPath; diff --git a/kicad/cli/command_fp_export_svg.cpp b/kicad/cli/command_fp_export_svg.cpp index e8304cc7ea..329b2a1e2b 100644 --- a/kicad/cli/command_fp_export_svg.cpp +++ b/kicad/cli/command_fp_export_svg.cpp @@ -78,7 +78,7 @@ int CLI::FP_EXPORT_SVG_COMMAND::doPerform( KIWAY& aKiway ) if( baseExit != EXIT_CODES::OK ) return baseExit; - std::unique_ptr svgJob = std::make_unique( true ); + std::unique_ptr svgJob = std::make_unique(); svgJob->m_libraryPath = m_argInput; svgJob->m_outputDirectory = m_argOutput; diff --git a/kicad/cli/command_fp_upgrade.cpp b/kicad/cli/command_fp_upgrade.cpp index c97473d224..0e7b83d548 100644 --- a/kicad/cli/command_fp_upgrade.cpp +++ b/kicad/cli/command_fp_upgrade.cpp @@ -44,7 +44,7 @@ CLI::FP_UPGRADE_COMMAND::FP_UPGRADE_COMMAND() : PCB_EXPORT_BASE_COMMAND( "upgrad int CLI::FP_UPGRADE_COMMAND::doPerform( KIWAY& aKiway ) { - std::unique_ptr fpJob = std::make_unique( true ); + std::unique_ptr fpJob = std::make_unique(); fpJob->m_libraryPath = m_argInput; fpJob->m_outputLibraryPath = m_argOutput; diff --git a/kicad/cli/command_pcb_drc.cpp b/kicad/cli/command_pcb_drc.cpp index 3ab386acb2..82b2a731d7 100644 --- a/kicad/cli/command_pcb_drc.cpp +++ b/kicad/cli/command_pcb_drc.cpp @@ -93,7 +93,7 @@ CLI::PCB_DRC_COMMAND::PCB_DRC_COMMAND() : COMMAND( "drc" ) int CLI::PCB_DRC_COMMAND::doPerform( KIWAY& aKiway ) { - std::unique_ptr drcJob( new JOB_PCB_DRC( true ) ); + std::unique_ptr drcJob( new JOB_PCB_DRC() ); drcJob->m_outputFile = m_argOutput; drcJob->m_filename = m_argInput; diff --git a/kicad/cli/command_pcb_export_3d.cpp b/kicad/cli/command_pcb_export_3d.cpp index cb14fd1e34..529a62fbb4 100644 --- a/kicad/cli/command_pcb_export_3d.cpp +++ b/kicad/cli/command_pcb_export_3d.cpp @@ -201,7 +201,7 @@ CLI::PCB_EXPORT_3D_COMMAND::PCB_EXPORT_3D_COMMAND( const std::string& aNa int CLI::PCB_EXPORT_3D_COMMAND::doPerform( KIWAY& aKiway ) { - std::unique_ptr step( new JOB_EXPORT_PCB_3D( true ) ); + std::unique_ptr step( new JOB_EXPORT_PCB_3D() ); EXPORTER_STEP_PARAMS& params = step->m_3dparams; if( m_format != JOB_EXPORT_PCB_3D::FORMAT::UNKNOWN diff --git a/kicad/cli/command_pcb_export_drill.cpp b/kicad/cli/command_pcb_export_drill.cpp index 5e13176101..5767062ae0 100644 --- a/kicad/cli/command_pcb_export_drill.cpp +++ b/kicad/cli/command_pcb_export_drill.cpp @@ -103,7 +103,7 @@ CLI::PCB_EXPORT_DRILL_COMMAND::PCB_EXPORT_DRILL_COMMAND() : PCB_EXPORT_BASE_COMM int CLI::PCB_EXPORT_DRILL_COMMAND::doPerform( KIWAY& aKiway ) { - std::unique_ptr drillJob( new JOB_EXPORT_PCB_DRILL( true ) ); + std::unique_ptr drillJob( new JOB_EXPORT_PCB_DRILL() ); drillJob->m_filename = m_argInput; drillJob->SetOutputPath( m_argOutput ); diff --git a/kicad/cli/command_pcb_export_dxf.cpp b/kicad/cli/command_pcb_export_dxf.cpp index aaaa960399..e5aefabfeb 100644 --- a/kicad/cli/command_pcb_export_dxf.cpp +++ b/kicad/cli/command_pcb_export_dxf.cpp @@ -76,7 +76,7 @@ int CLI::PCB_EXPORT_DXF_COMMAND::doPerform( KIWAY& aKiway ) if( baseExit != EXIT_CODES::OK ) return baseExit; - std::unique_ptr dxfJob( new JOB_EXPORT_PCB_DXF( true ) ); + std::unique_ptr dxfJob( new JOB_EXPORT_PCB_DXF() ); dxfJob->m_filename = m_argInput; dxfJob->SetOutputPath( m_argOutput ); diff --git a/kicad/cli/command_pcb_export_gencad.cpp b/kicad/cli/command_pcb_export_gencad.cpp index 34b4b8e887..4500366643 100644 --- a/kicad/cli/command_pcb_export_gencad.cpp +++ b/kicad/cli/command_pcb_export_gencad.cpp @@ -75,7 +75,7 @@ int CLI::PCB_EXPORT_GENCAD_COMMAND::doPerform( KIWAY& aKiway ) if( baseExit != EXIT_CODES::OK ) return baseExit; - std::unique_ptr gencadJob( new JOB_EXPORT_PCB_GENCAD( true ) ); + std::unique_ptr gencadJob( new JOB_EXPORT_PCB_GENCAD() ); gencadJob->m_filename = m_argInput; gencadJob->SetVarOverrides( m_argDefineVars ); diff --git a/kicad/cli/command_pcb_export_gerber.cpp b/kicad/cli/command_pcb_export_gerber.cpp index ff6c287c24..e8dcee8630 100644 --- a/kicad/cli/command_pcb_export_gerber.cpp +++ b/kicad/cli/command_pcb_export_gerber.cpp @@ -132,7 +132,7 @@ int CLI::PCB_EXPORT_GERBER_COMMAND::doPerform( KIWAY& aKiway ) if( exitCode != EXIT_CODES::OK ) return exitCode; - std::unique_ptr gerberJob( new JOB_EXPORT_PCB_GERBER( true ) ); + std::unique_ptr gerberJob( new JOB_EXPORT_PCB_GERBER() ); exitCode = populateJob( gerberJob.get() ); diff --git a/kicad/cli/command_pcb_export_gerbers.cpp b/kicad/cli/command_pcb_export_gerbers.cpp index 255f597c49..331f4c8295 100644 --- a/kicad/cli/command_pcb_export_gerbers.cpp +++ b/kicad/cli/command_pcb_export_gerbers.cpp @@ -65,7 +65,7 @@ int CLI::PCB_EXPORT_GERBERS_COMMAND::doPerform( KIWAY& aKiway ) if( exitCode != EXIT_CODES::OK ) return exitCode; - std::unique_ptr gerberJob( new JOB_EXPORT_PCB_GERBERS( true ) ); + std::unique_ptr gerberJob( new JOB_EXPORT_PCB_GERBERS() ); exitCode = populateJob( gerberJob.get() ); diff --git a/kicad/cli/command_pcb_export_ipc2581.cpp b/kicad/cli/command_pcb_export_ipc2581.cpp index 8c0e104494..802aad0884 100644 --- a/kicad/cli/command_pcb_export_ipc2581.cpp +++ b/kicad/cli/command_pcb_export_ipc2581.cpp @@ -107,7 +107,7 @@ int CLI::PCB_EXPORT_IPC2581_COMMAND::doPerform( KIWAY& aKiway ) if( exitCode != EXIT_CODES::OK ) return exitCode; - std::unique_ptr ipc2581Job( new JOB_EXPORT_PCB_IPC2581( true ) ); + std::unique_ptr ipc2581Job( new JOB_EXPORT_PCB_IPC2581() ); ipc2581Job->m_filename = m_argInput; ipc2581Job->SetOutputPath( m_argOutput ); diff --git a/kicad/cli/command_pcb_export_pdf.cpp b/kicad/cli/command_pcb_export_pdf.cpp index c4cbdd613c..4c1f2d70c1 100644 --- a/kicad/cli/command_pcb_export_pdf.cpp +++ b/kicad/cli/command_pcb_export_pdf.cpp @@ -96,7 +96,7 @@ int CLI::PCB_EXPORT_PDF_COMMAND::doPerform( KIWAY& aKiway ) if( baseExit != EXIT_CODES::OK ) return baseExit; - std::unique_ptr pdfJob( new JOB_EXPORT_PCB_PDF( true ) ); + std::unique_ptr pdfJob( new JOB_EXPORT_PCB_PDF() ); pdfJob->m_filename = m_argInput; pdfJob->SetOutputPath( m_argOutput ); diff --git a/kicad/cli/command_pcb_export_pos.cpp b/kicad/cli/command_pcb_export_pos.cpp index dee661e497..c6293b5371 100644 --- a/kicad/cli/command_pcb_export_pos.cpp +++ b/kicad/cli/command_pcb_export_pos.cpp @@ -96,7 +96,7 @@ int CLI::PCB_EXPORT_POS_COMMAND::doPerform( KIWAY& aKiway ) if( baseExit != EXIT_CODES::OK ) return baseExit; - std::unique_ptr aPosJob( new JOB_EXPORT_PCB_POS( true ) ); + std::unique_ptr aPosJob( new JOB_EXPORT_PCB_POS() ); aPosJob->m_filename = m_argInput; aPosJob->SetOutputPath( m_argOutput ); diff --git a/kicad/cli/command_pcb_export_svg.cpp b/kicad/cli/command_pcb_export_svg.cpp index 5fd8870f2a..d860c51c3b 100644 --- a/kicad/cli/command_pcb_export_svg.cpp +++ b/kicad/cli/command_pcb_export_svg.cpp @@ -100,7 +100,7 @@ int CLI::PCB_EXPORT_SVG_COMMAND::doPerform( KIWAY& aKiway ) if( baseExit != EXIT_CODES::OK ) return baseExit; - std::unique_ptr svgJob( new JOB_EXPORT_PCB_SVG( true ) ); + std::unique_ptr svgJob( new JOB_EXPORT_PCB_SVG() ); svgJob->m_mirror = m_argParser.get( ARG_MIRROR ); svgJob->m_blackAndWhite = m_argParser.get( ARG_BLACKANDWHITE ); diff --git a/kicad/cli/command_pcb_render.cpp b/kicad/cli/command_pcb_render.cpp index 5a227e3fcd..74dc469d86 100644 --- a/kicad/cli/command_pcb_render.cpp +++ b/kicad/cli/command_pcb_render.cpp @@ -241,7 +241,7 @@ CLI::PCB_RENDER_COMMAND::PCB_RENDER_COMMAND() : COMMAND( "render" ) int CLI::PCB_RENDER_COMMAND::doPerform( KIWAY& aKiway ) { - std::unique_ptr renderJob( new JOB_PCB_RENDER( true ) ); + std::unique_ptr renderJob( new JOB_PCB_RENDER() ); renderJob->m_outputFile = m_argOutput; renderJob->m_filename = m_argInput; diff --git a/kicad/cli/command_sch_erc.cpp b/kicad/cli/command_sch_erc.cpp index 094a4e56d6..230a251e84 100644 --- a/kicad/cli/command_sch_erc.cpp +++ b/kicad/cli/command_sch_erc.cpp @@ -83,7 +83,7 @@ CLI::SCH_ERC_COMMAND::SCH_ERC_COMMAND() : COMMAND( "erc" ) int CLI::SCH_ERC_COMMAND::doPerform( KIWAY& aKiway ) { - std::unique_ptr ercJob( new JOB_SCH_ERC( true ) ); + std::unique_ptr ercJob( new JOB_SCH_ERC() ); ercJob->m_outputFile = m_argOutput; ercJob->m_filename = m_argInput; diff --git a/kicad/cli/command_sch_export_bom.cpp b/kicad/cli/command_sch_export_bom.cpp index 4c98e652a8..ef61a11e0c 100644 --- a/kicad/cli/command_sch_export_bom.cpp +++ b/kicad/cli/command_sch_export_bom.cpp @@ -130,7 +130,7 @@ std::vector CLI::SCH_EXPORT_BOM_COMMAND::convertStringList( const wxSt int CLI::SCH_EXPORT_BOM_COMMAND::doPerform( KIWAY& aKiway ) { - std::unique_ptr bomJob = std::make_unique( true ); + std::unique_ptr bomJob = std::make_unique(); // Basic options bomJob->m_filename = m_argInput; diff --git a/kicad/cli/command_sch_export_netlist.cpp b/kicad/cli/command_sch_export_netlist.cpp index 1be9fe6a01..1807fb0c18 100644 --- a/kicad/cli/command_sch_export_netlist.cpp +++ b/kicad/cli/command_sch_export_netlist.cpp @@ -46,7 +46,7 @@ CLI::SCH_EXPORT_NETLIST_COMMAND::SCH_EXPORT_NETLIST_COMMAND() : COMMAND( "netlis int CLI::SCH_EXPORT_NETLIST_COMMAND::doPerform( KIWAY& aKiway ) { std::unique_ptr netJob = - std::make_unique( true ); + std::make_unique(); netJob->m_filename = m_argInput; netJob->SetOutputPath( m_argOutput ); diff --git a/kicad/cli/command_sch_export_plot.cpp b/kicad/cli/command_sch_export_plot.cpp index 6a3367918e..1e142b96ca 100644 --- a/kicad/cli/command_sch_export_plot.cpp +++ b/kicad/cli/command_sch_export_plot.cpp @@ -143,7 +143,7 @@ int CLI::SCH_EXPORT_PLOT_COMMAND::doPerform( KIWAY& aKiway ) } std::unique_ptr plotJob = - std::make_unique( true ); + std::make_unique(); plotJob->m_filename = filename; plotJob->m_plotFormat = m_plotFormat; plotJob->m_plotPages = pages; diff --git a/kicad/cli/command_sch_export_pythonbom.cpp b/kicad/cli/command_sch_export_pythonbom.cpp index 364c442dad..e1809fcab6 100644 --- a/kicad/cli/command_sch_export_pythonbom.cpp +++ b/kicad/cli/command_sch_export_pythonbom.cpp @@ -41,7 +41,7 @@ CLI::SCH_EXPORT_PYTHONBOM_COMMAND::SCH_EXPORT_PYTHONBOM_COMMAND() : int CLI::SCH_EXPORT_PYTHONBOM_COMMAND::doPerform( KIWAY& aKiway ) { std::unique_ptr bomJob = - std::make_unique( true ); + std::make_unique(); bomJob->m_filename = m_argInput; bomJob->SetOutputPath( m_argOutput ); diff --git a/kicad/cli/command_sym_export_svg.cpp b/kicad/cli/command_sym_export_svg.cpp index 577fd67b49..e360b58167 100644 --- a/kicad/cli/command_sym_export_svg.cpp +++ b/kicad/cli/command_sym_export_svg.cpp @@ -70,7 +70,7 @@ CLI::SYM_EXPORT_SVG_COMMAND::SYM_EXPORT_SVG_COMMAND() : COMMAND( "svg" ) int CLI::SYM_EXPORT_SVG_COMMAND::doPerform( KIWAY& aKiway ) { - std::unique_ptr svgJob = std::make_unique( true ); + std::unique_ptr svgJob = std::make_unique(); svgJob->m_libraryPath = m_argInput; svgJob->m_outputDirectory = m_argOutput; diff --git a/kicad/cli/command_sym_upgrade.cpp b/kicad/cli/command_sym_upgrade.cpp index 6a58f7dcb6..b53f68d4c9 100644 --- a/kicad/cli/command_sym_upgrade.cpp +++ b/kicad/cli/command_sym_upgrade.cpp @@ -48,7 +48,7 @@ CLI::SYM_UPGRADE_COMMAND::SYM_UPGRADE_COMMAND() : COMMAND( "upgrade" ) int CLI::SYM_UPGRADE_COMMAND::doPerform( KIWAY& aKiway ) { - std::unique_ptr symJob = std::make_unique( true ); + std::unique_ptr symJob = std::make_unique(); symJob->m_libraryPath = m_argInput; symJob->m_outputLibraryPath = m_argOutput; diff --git a/pcbnew/pcbnew_jobs_handler.cpp b/pcbnew/pcbnew_jobs_handler.cpp index c204ffaf63..75f78c3146 100644 --- a/pcbnew/pcbnew_jobs_handler.cpp +++ b/pcbnew/pcbnew_jobs_handler.cpp @@ -621,13 +621,10 @@ int PCBNEW_JOBS_HANDLER::JobExportSvg( JOB* aJob ) brd->GetProject()->ApplyTextVars( aJob->GetVarOverrides() ); brd->SynchronizeProperties(); - if( aJob->IsCli() ) - { - if( EXPORT_SVG::Plot( brd, svgPlotOptions ) ) - m_reporter->Report( _( "Successfully created svg file" ) + wxS( "\n" ), RPT_SEVERITY_INFO ); - else - m_reporter->Report( _( "Error creating svg file" ) + wxS( "\n" ), RPT_SEVERITY_ERROR ); - } + if( EXPORT_SVG::Plot( brd, svgPlotOptions ) ) + m_reporter->Report( _( "Successfully created svg file" ) + wxS( "\n" ), RPT_SEVERITY_INFO ); + else + m_reporter->Report( _( "Error creating svg file" ) + wxS( "\n" ), RPT_SEVERITY_ERROR ); return CLI::EXIT_CODES::OK; } @@ -970,14 +967,12 @@ int PCBNEW_JOBS_HANDLER::JobExportGencad( JOB* aJob ) wxString msg; msg.Printf( _( "Failed to create file '%s'.\n" ), aGencadJob->GetFullOutputPath() ); - if( aJob->IsCli() ) - m_reporter->Report( msg, RPT_SEVERITY_ERROR ); + m_reporter->Report( msg, RPT_SEVERITY_ERROR ); return CLI::EXIT_CODES::ERR_UNKNOWN; } - if( aJob->IsCli() ) - m_reporter->Report( _( "Successfully created genCAD file\n" ), RPT_SEVERITY_INFO ); + m_reporter->Report( _( "Successfully created genCAD file\n" ), RPT_SEVERITY_INFO ); return CLI::EXIT_CODES::OK; } @@ -1325,9 +1320,7 @@ int PCBNEW_JOBS_HANDLER::JobExportFpUpgrade( JOB* aJob ) return CLI::EXIT_CODES::ERR_INVALID_INPUT_FILE; } - - if( aJob->IsCli() ) - m_reporter->Report( _( "Loading footprint library\n" ), RPT_SEVERITY_INFO ); + m_reporter->Report( _( "Loading footprint library\n" ), RPT_SEVERITY_INFO ); PCB_IO_KICAD_SEXPR pcb_io( CTL_FOR_LIBRARY ); FP_CACHE fpLib( &pcb_io, upgradeJob->m_libraryPath ); @@ -1398,8 +1391,7 @@ int PCBNEW_JOBS_HANDLER::JobExportFpSvg( JOB* aJob ) if( svgJob == nullptr ) return CLI::EXIT_CODES::ERR_UNKNOWN; - if( aJob->IsCli() ) - m_reporter->Report( _( "Loading footprint library\n" ), RPT_SEVERITY_INFO ); + m_reporter->Report( _( "Loading footprint library\n" ), RPT_SEVERITY_INFO ); PCB_IO_KICAD_SEXPR pcb_io( CTL_FOR_LIBRARY ); FP_CACHE fpLib( &pcb_io, svgJob->m_libraryPath );