diff --git a/kicad/CMakeLists.txt b/kicad/CMakeLists.txt index f00a412873..edb5bad62c 100644 --- a/kicad/CMakeLists.txt +++ b/kicad/CMakeLists.txt @@ -35,22 +35,22 @@ set( KICAD_SRCS set( KICAD_CLI_SRCS cli/command.cpp - cli/command_export_pcb_base.cpp + cli/command_pcb_export_base.cpp cli/command_pcb_drc.cpp - cli/command_export_pcb_drill.cpp - cli/command_export_pcb_dxf.cpp - cli/command_export_pcb_gerber.cpp - cli/command_export_pcb_gerbers.cpp - cli/command_export_pcb_pdf.cpp - cli/command_export_pcb_pos.cpp - cli/command_export_pcb_step.cpp - cli/command_export_pcb_svg.cpp + cli/command_pcb_export_drill.cpp + cli/command_pcb_export_dxf.cpp + cli/command_pcb_export_gerber.cpp + cli/command_pcb_export_gerbers.cpp + cli/command_pcb_export_pdf.cpp + cli/command_pcb_export_pos.cpp + cli/command_pcb_export_step.cpp + cli/command_pcb_export_svg.cpp cli/command_fp_export_svg.cpp cli/command_fp_upgrade.cpp - cli/command_export_sch_bom.cpp - cli/command_export_sch_pythonbom.cpp - cli/command_export_sch_netlist.cpp - cli/command_export_sch_plot.cpp + cli/command_sch_export_bom.cpp + cli/command_sch_export_pythonbom.cpp + cli/command_sch_export_netlist.cpp + cli/command_sch_export_plot.cpp cli/command_sch_erc.cpp cli/command_sym_export_svg.cpp cli/command_sym_upgrade.cpp diff --git a/kicad/cli/command_fp_export_svg.h b/kicad/cli/command_fp_export_svg.h index 0aeeb67033..f3b6d9ba7c 100644 --- a/kicad/cli/command_fp_export_svg.h +++ b/kicad/cli/command_fp_export_svg.h @@ -21,7 +21,7 @@ #ifndef COMMAND_FP_EXPORT_SVG_H #define COMMAND_FP_EXPORT_SVG_H -#include "command_export_pcb_base.h" +#include "command_pcb_export_base.h" namespace CLI { diff --git a/kicad/cli/command_fp_upgrade.h b/kicad/cli/command_fp_upgrade.h index 91c6d6fb50..7f8648ad9f 100644 --- a/kicad/cli/command_fp_upgrade.h +++ b/kicad/cli/command_fp_upgrade.h @@ -21,7 +21,7 @@ #ifndef COMMAND_FP_UPGRADE_H #define COMMAND_FP_UPGRADE_H -#include "command_export_pcb_base.h" +#include "command_pcb_export_base.h" namespace CLI { diff --git a/kicad/cli/command_pcb_drc.h b/kicad/cli/command_pcb_drc.h index ef495093b6..cd3541ed3a 100644 --- a/kicad/cli/command_pcb_drc.h +++ b/kicad/cli/command_pcb_drc.h @@ -21,7 +21,7 @@ #ifndef COMMAND_EXPORT_PCB_DRC_H #define COMMAND_EXPORT_PCB_DRC_H -#include "command_export_pcb_base.h" +#include "command_pcb_export_base.h" namespace CLI { diff --git a/kicad/cli/command_export_pcb_base.cpp b/kicad/cli/command_pcb_export_base.cpp similarity index 99% rename from kicad/cli/command_export_pcb_base.cpp rename to kicad/cli/command_pcb_export_base.cpp index a9df828011..a7c9991d05 100644 --- a/kicad/cli/command_export_pcb_base.cpp +++ b/kicad/cli/command_pcb_export_base.cpp @@ -18,7 +18,7 @@ * with this program. If not, see . */ -#include "command_export_pcb_base.h" +#include "command_pcb_export_base.h" #include #include #include diff --git a/kicad/cli/command_export_pcb_base.h b/kicad/cli/command_pcb_export_base.h similarity index 100% rename from kicad/cli/command_export_pcb_base.h rename to kicad/cli/command_pcb_export_base.h diff --git a/kicad/cli/command_export_pcb_drill.cpp b/kicad/cli/command_pcb_export_drill.cpp similarity index 99% rename from kicad/cli/command_export_pcb_drill.cpp rename to kicad/cli/command_pcb_export_drill.cpp index 1eb041b360..2f117feb71 100644 --- a/kicad/cli/command_export_pcb_drill.cpp +++ b/kicad/cli/command_pcb_export_drill.cpp @@ -18,7 +18,7 @@ * with this program. If not, see . */ -#include "command_export_pcb_drill.h" +#include "command_pcb_export_drill.h" #include #include "jobs/job_export_pcb_drill.h" #include diff --git a/kicad/cli/command_export_pcb_drill.h b/kicad/cli/command_pcb_export_drill.h similarity index 96% rename from kicad/cli/command_export_pcb_drill.h rename to kicad/cli/command_pcb_export_drill.h index 5e2fa09aa7..d1a8c9ed07 100644 --- a/kicad/cli/command_export_pcb_drill.h +++ b/kicad/cli/command_pcb_export_drill.h @@ -21,7 +21,7 @@ #ifndef COMMAND_EXPORT_PCB_DRILL_H #define COMMAND_EXPORT_PCB_DRILL_H -#include "command_export_pcb_base.h" +#include "command_pcb_export_base.h" namespace CLI { diff --git a/kicad/cli/command_export_pcb_dxf.cpp b/kicad/cli/command_pcb_export_dxf.cpp similarity index 99% rename from kicad/cli/command_export_pcb_dxf.cpp rename to kicad/cli/command_pcb_export_dxf.cpp index 5a87bf54c5..c49248ebf9 100644 --- a/kicad/cli/command_export_pcb_dxf.cpp +++ b/kicad/cli/command_pcb_export_dxf.cpp @@ -18,7 +18,7 @@ * with this program. If not, see . */ -#include "command_export_pcb_dxf.h" +#include "command_pcb_export_dxf.h" #include #include "jobs/job_export_pcb_dxf.h" #include diff --git a/kicad/cli/command_export_pcb_dxf.h b/kicad/cli/command_pcb_export_dxf.h similarity index 96% rename from kicad/cli/command_export_pcb_dxf.h rename to kicad/cli/command_pcb_export_dxf.h index 7459c908c6..161069a0e3 100644 --- a/kicad/cli/command_export_pcb_dxf.h +++ b/kicad/cli/command_pcb_export_dxf.h @@ -21,7 +21,7 @@ #ifndef COMMAND_EXPORT_PCB_DXF_H #define COMMAND_EXPORT_PCB_DXF_H -#include "command_export_pcb_base.h" +#include "command_pcb_export_base.h" namespace CLI { diff --git a/kicad/cli/command_export_pcb_gerber.cpp b/kicad/cli/command_pcb_export_gerber.cpp similarity index 99% rename from kicad/cli/command_export_pcb_gerber.cpp rename to kicad/cli/command_pcb_export_gerber.cpp index 8c10cf523d..a336878bd5 100644 --- a/kicad/cli/command_export_pcb_gerber.cpp +++ b/kicad/cli/command_pcb_export_gerber.cpp @@ -18,7 +18,7 @@ * with this program. If not, see . */ -#include "command_export_pcb_gerber.h" +#include "command_pcb_export_gerber.h" #include #include "jobs/job_export_pcb_gerber.h" #include diff --git a/kicad/cli/command_export_pcb_gerber.h b/kicad/cli/command_pcb_export_gerber.h similarity index 97% rename from kicad/cli/command_export_pcb_gerber.h rename to kicad/cli/command_pcb_export_gerber.h index e260bd79c4..e0fc222265 100644 --- a/kicad/cli/command_export_pcb_gerber.h +++ b/kicad/cli/command_pcb_export_gerber.h @@ -21,7 +21,7 @@ #ifndef COMMAND_EXPORT_PCB_GERBER_H #define COMMAND_EXPORT_PCB_GERBER_H -#include "command_export_pcb_base.h" +#include "command_pcb_export_base.h" class JOB_EXPORT_PCB_GERBER; diff --git a/kicad/cli/command_export_pcb_gerbers.cpp b/kicad/cli/command_pcb_export_gerbers.cpp similarity index 98% rename from kicad/cli/command_export_pcb_gerbers.cpp rename to kicad/cli/command_pcb_export_gerbers.cpp index 85f908e232..512b4d6b24 100644 --- a/kicad/cli/command_export_pcb_gerbers.cpp +++ b/kicad/cli/command_pcb_export_gerbers.cpp @@ -18,7 +18,7 @@ * with this program. If not, see . */ -#include "command_export_pcb_gerbers.h" +#include "command_pcb_export_gerbers.h" #include #include "jobs/job_export_pcb_gerbers.h" #include diff --git a/kicad/cli/command_export_pcb_gerbers.h b/kicad/cli/command_pcb_export_gerbers.h similarity index 96% rename from kicad/cli/command_export_pcb_gerbers.h rename to kicad/cli/command_pcb_export_gerbers.h index 4d45f22549..f9979cf628 100644 --- a/kicad/cli/command_export_pcb_gerbers.h +++ b/kicad/cli/command_pcb_export_gerbers.h @@ -21,7 +21,7 @@ #ifndef COMMAND_EXPORT_PCB_GERBERS_H #define COMMAND_EXPORT_PCB_GERBERS_H -#include "command_export_pcb_gerber.h" +#include "command_pcb_export_gerber.h" namespace CLI { diff --git a/kicad/cli/command_export_pcb_pdf.cpp b/kicad/cli/command_pcb_export_pdf.cpp similarity index 99% rename from kicad/cli/command_export_pcb_pdf.cpp rename to kicad/cli/command_pcb_export_pdf.cpp index 3ebf8235df..3eec2fea52 100644 --- a/kicad/cli/command_export_pcb_pdf.cpp +++ b/kicad/cli/command_pcb_export_pdf.cpp @@ -18,7 +18,7 @@ * with this program. If not, see . */ -#include "command_export_pcb_pdf.h" +#include "command_pcb_export_pdf.h" #include #include "jobs/job_export_pcb_pdf.h" #include diff --git a/kicad/cli/command_export_pcb_pdf.h b/kicad/cli/command_pcb_export_pdf.h similarity index 96% rename from kicad/cli/command_export_pcb_pdf.h rename to kicad/cli/command_pcb_export_pdf.h index 7b36640412..dc46d2d4dd 100644 --- a/kicad/cli/command_export_pcb_pdf.h +++ b/kicad/cli/command_pcb_export_pdf.h @@ -21,7 +21,7 @@ #ifndef COMMAND_EXPORT_PCB_PDF_H #define COMMAND_EXPORT_PCB_PDF_H -#include "command_export_pcb_base.h" +#include "command_pcb_export_base.h" namespace CLI { diff --git a/kicad/cli/command_export_pcb_pos.cpp b/kicad/cli/command_pcb_export_pos.cpp similarity index 99% rename from kicad/cli/command_export_pcb_pos.cpp rename to kicad/cli/command_pcb_export_pos.cpp index 686b09f80f..d597275278 100644 --- a/kicad/cli/command_export_pcb_pos.cpp +++ b/kicad/cli/command_pcb_export_pos.cpp @@ -18,7 +18,7 @@ * with this program. If not, see . */ -#include "command_export_pcb_pos.h" +#include "command_pcb_export_pos.h" #include #include "jobs/job_export_pcb_pos.h" #include diff --git a/kicad/cli/command_export_pcb_pos.h b/kicad/cli/command_pcb_export_pos.h similarity index 96% rename from kicad/cli/command_export_pcb_pos.h rename to kicad/cli/command_pcb_export_pos.h index fe18ca7176..6cb8417e0f 100644 --- a/kicad/cli/command_export_pcb_pos.h +++ b/kicad/cli/command_pcb_export_pos.h @@ -21,7 +21,7 @@ #ifndef COMMAND_EXPORT_PCB_POS_H #define COMMAND_EXPORT_PCB_POS_H -#include "command_export_pcb_base.h" +#include "command_pcb_export_base.h" namespace CLI { diff --git a/kicad/cli/command_export_pcb_step.cpp b/kicad/cli/command_pcb_export_step.cpp similarity index 99% rename from kicad/cli/command_export_pcb_step.cpp rename to kicad/cli/command_pcb_export_step.cpp index 91971436bc..73f4251cdc 100644 --- a/kicad/cli/command_export_pcb_step.cpp +++ b/kicad/cli/command_pcb_export_step.cpp @@ -18,7 +18,7 @@ * with this program. If not, see . */ -#include "command_export_pcb_step.h" +#include "command_pcb_export_step.h" #include #include "jobs/job_export_pcb_step.h" #include diff --git a/kicad/cli/command_export_pcb_step.h b/kicad/cli/command_pcb_export_step.h similarity index 100% rename from kicad/cli/command_export_pcb_step.h rename to kicad/cli/command_pcb_export_step.h diff --git a/kicad/cli/command_export_pcb_svg.cpp b/kicad/cli/command_pcb_export_svg.cpp similarity index 98% rename from kicad/cli/command_export_pcb_svg.cpp rename to kicad/cli/command_pcb_export_svg.cpp index 76c017385b..ee5bf961d8 100644 --- a/kicad/cli/command_export_pcb_svg.cpp +++ b/kicad/cli/command_pcb_export_svg.cpp @@ -19,9 +19,9 @@ * with this program. If not, see . */ -#include "command_export_pcb_svg.h" +#include "command_pcb_export_svg.h" #include -#include "command_export_pcb_base.h" +#include "command_pcb_export_base.h" #include "jobs/job_export_pcb_svg.h" #include #include diff --git a/kicad/cli/command_export_pcb_svg.h b/kicad/cli/command_pcb_export_svg.h similarity index 96% rename from kicad/cli/command_export_pcb_svg.h rename to kicad/cli/command_pcb_export_svg.h index a4fb4cf914..58a4e71131 100644 --- a/kicad/cli/command_export_pcb_svg.h +++ b/kicad/cli/command_pcb_export_svg.h @@ -21,7 +21,7 @@ #ifndef COMMAND_EXPORT_PCB_SVG_H #define COMMAND_EXPORT_PCB_SVG_H -#include "command_export_pcb_base.h" +#include "command_pcb_export_base.h" namespace CLI { diff --git a/kicad/cli/command_sch_erc.h b/kicad/cli/command_sch_erc.h index 2853b17b25..f25fbff819 100644 --- a/kicad/cli/command_sch_erc.h +++ b/kicad/cli/command_sch_erc.h @@ -21,7 +21,7 @@ #ifndef COMMAND_SCH_ERC_H #define COMMAND_SCH_ERC_H -#include "command_export_pcb_base.h" +#include "command_pcb_export_base.h" namespace CLI { diff --git a/kicad/cli/command_export_sch_bom.cpp b/kicad/cli/command_sch_export_bom.cpp similarity index 99% rename from kicad/cli/command_export_sch_bom.cpp rename to kicad/cli/command_sch_export_bom.cpp index cf8110be74..79d1916638 100644 --- a/kicad/cli/command_export_sch_bom.cpp +++ b/kicad/cli/command_sch_export_bom.cpp @@ -18,7 +18,7 @@ * with this program. If not, see . */ -#include "command_export_sch_bom.h" +#include "command_sch_export_bom.h" #include #include "jobs/job_export_sch_bom.h" #include diff --git a/kicad/cli/command_export_sch_bom.h b/kicad/cli/command_sch_export_bom.h similarity index 98% rename from kicad/cli/command_export_sch_bom.h rename to kicad/cli/command_sch_export_bom.h index 3f776a4ea4..0cd6d74f27 100644 --- a/kicad/cli/command_export_sch_bom.h +++ b/kicad/cli/command_sch_export_bom.h @@ -21,7 +21,7 @@ #ifndef COMMAND_EXPORT_SCH_BOM_H #define COMMAND_EXPORT_SCH_BOM_H -#include "command_export_pcb_base.h" +#include "command_pcb_export_base.h" namespace CLI { diff --git a/kicad/cli/command_export_sch_netlist.cpp b/kicad/cli/command_sch_export_netlist.cpp similarity index 98% rename from kicad/cli/command_export_sch_netlist.cpp rename to kicad/cli/command_sch_export_netlist.cpp index 90fa0c390f..35a2bdaa5a 100644 --- a/kicad/cli/command_export_sch_netlist.cpp +++ b/kicad/cli/command_sch_export_netlist.cpp @@ -18,7 +18,7 @@ * with this program. If not, see . */ -#include "command_export_sch_netlist.h" +#include "command_sch_export_netlist.h" #include #include "jobs/job_export_sch_netlist.h" #include diff --git a/kicad/cli/command_export_sch_netlist.h b/kicad/cli/command_sch_export_netlist.h similarity index 96% rename from kicad/cli/command_export_sch_netlist.h rename to kicad/cli/command_sch_export_netlist.h index 8f5630640b..1c11c7ccbd 100644 --- a/kicad/cli/command_export_sch_netlist.h +++ b/kicad/cli/command_sch_export_netlist.h @@ -21,7 +21,7 @@ #ifndef COMMAND_EXPORT_SCH_NETLIST_H #define COMMAND_EXPORT_SCH_NETLIST_H -#include "command_export_pcb_base.h" +#include "command_pcb_export_base.h" namespace CLI { diff --git a/kicad/cli/command_export_sch_plot.cpp b/kicad/cli/command_sch_export_plot.cpp similarity index 99% rename from kicad/cli/command_export_sch_plot.cpp rename to kicad/cli/command_sch_export_plot.cpp index bbe6b9feda..c1847a9a0a 100644 --- a/kicad/cli/command_export_sch_plot.cpp +++ b/kicad/cli/command_sch_export_plot.cpp @@ -20,7 +20,7 @@ #include #include -#include "command_export_sch_plot.h" +#include "command_sch_export_plot.h" #include #include "jobs/job_export_sch_plot.h" #include diff --git a/kicad/cli/command_export_sch_plot.h b/kicad/cli/command_sch_export_plot.h similarity index 97% rename from kicad/cli/command_export_sch_plot.h rename to kicad/cli/command_sch_export_plot.h index 577fc3a2c2..09e7e9427e 100644 --- a/kicad/cli/command_export_sch_plot.h +++ b/kicad/cli/command_sch_export_plot.h @@ -21,7 +21,7 @@ #ifndef COMMAND_EXPORT_SCH_PLOT_H #define COMMAND_EXPORT_SCH_PLOT_H -#include "command_export_pcb_base.h" +#include "command_pcb_export_base.h" #include namespace CLI diff --git a/kicad/cli/command_export_sch_pythonbom.cpp b/kicad/cli/command_sch_export_pythonbom.cpp similarity index 97% rename from kicad/cli/command_export_sch_pythonbom.cpp rename to kicad/cli/command_sch_export_pythonbom.cpp index 92e963ef9b..04916fa593 100644 --- a/kicad/cli/command_export_sch_pythonbom.cpp +++ b/kicad/cli/command_sch_export_pythonbom.cpp @@ -18,7 +18,7 @@ * with this program. If not, see . */ -#include "command_export_sch_pythonbom.h" +#include "command_sch_export_pythonbom.h" #include #include "jobs/job_export_sch_pythonbom.h" #include diff --git a/kicad/cli/command_export_sch_pythonbom.h b/kicad/cli/command_sch_export_pythonbom.h similarity index 96% rename from kicad/cli/command_export_sch_pythonbom.h rename to kicad/cli/command_sch_export_pythonbom.h index 93e8a40a0e..cdb3944d70 100644 --- a/kicad/cli/command_export_sch_pythonbom.h +++ b/kicad/cli/command_sch_export_pythonbom.h @@ -21,7 +21,7 @@ #ifndef COMMAND_EXPORT_SCH_PYTHONBOM_H #define COMMAND_EXPORT_SCH_PYTHONBOM_H -#include "command_export_pcb_base.h" +#include "command_pcb_export_base.h" namespace CLI { diff --git a/kicad/cli/command_sym_export_svg.h b/kicad/cli/command_sym_export_svg.h index a6a1ae7e96..a016d310bc 100644 --- a/kicad/cli/command_sym_export_svg.h +++ b/kicad/cli/command_sym_export_svg.h @@ -21,7 +21,7 @@ #ifndef COMMAND_SYM_EXPORT_SVG_H #define COMMAND_SYM_EXPORT_SVG_H -#include "command_export_pcb_base.h" +#include "command_pcb_export_base.h" namespace CLI { diff --git a/kicad/cli/command_sym_upgrade.h b/kicad/cli/command_sym_upgrade.h index 3dc727dbde..d02d5e5dd4 100644 --- a/kicad/cli/command_sym_upgrade.h +++ b/kicad/cli/command_sym_upgrade.h @@ -21,7 +21,7 @@ #ifndef COMMAND_SYM_UPGRADE_H #define COMMAND_SYM_UPGRADE_H -#include "command_export_pcb_base.h" +#include "command_pcb_export_base.h" namespace CLI { diff --git a/kicad/kicad_cli.cpp b/kicad/kicad_cli.cpp index 6b3a2aa83f..b547feb038 100644 --- a/kicad/kicad_cli.cpp +++ b/kicad/kicad_cli.cpp @@ -49,18 +49,18 @@ #include "cli/command_pcb.h" #include "cli/command_pcb_export.h" #include "cli/command_pcb_drc.h" -#include "cli/command_export_pcb_drill.h" -#include "cli/command_export_pcb_dxf.h" -#include "cli/command_export_pcb_gerber.h" -#include "cli/command_export_pcb_gerbers.h" -#include "cli/command_export_pcb_pdf.h" -#include "cli/command_export_pcb_pos.h" -#include "cli/command_export_pcb_svg.h" -#include "cli/command_export_pcb_step.h" -#include "cli/command_export_sch_bom.h" -#include "cli/command_export_sch_pythonbom.h" -#include "cli/command_export_sch_netlist.h" -#include "cli/command_export_sch_plot.h" +#include "cli/command_pcb_export_drill.h" +#include "cli/command_pcb_export_dxf.h" +#include "cli/command_pcb_export_gerber.h" +#include "cli/command_pcb_export_gerbers.h" +#include "cli/command_pcb_export_pdf.h" +#include "cli/command_pcb_export_pos.h" +#include "cli/command_pcb_export_svg.h" +#include "cli/command_pcb_export_step.h" +#include "cli/command_sch_export_bom.h" +#include "cli/command_sch_export_pythonbom.h" +#include "cli/command_sch_export_netlist.h" +#include "cli/command_sch_export_plot.h" #include "cli/command_fp.h" #include "cli/command_fp_export.h" #include "cli/command_fp_export_svg.h"