Rename the export cli files to the cleaner structure

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

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
 {

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
 {

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
 {

kicad/cli/command_pcb_export_base.cpp

@@ -18,7 +18,7 @@
  * with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "command_export_pcb_base.h"
+#include "command_pcb_export_base.h"
 #include <cli/exit_codes.h>
 #include <kiface_base.h>
 #include <bitset>

kicad/cli/command_pcb_export_drill.cpp

@@ -18,7 +18,7 @@
  * with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "command_export_pcb_drill.h"
+#include "command_pcb_export_drill.h"
 #include <cli/exit_codes.h>
 #include "jobs/job_export_pcb_drill.h"
 #include <kiface_base.h>

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
 {

kicad/cli/command_pcb_export_dxf.cpp

@@ -18,7 +18,7 @@
  * with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "command_export_pcb_dxf.h"
+#include "command_pcb_export_dxf.h"
 #include <cli/exit_codes.h>
 #include "jobs/job_export_pcb_dxf.h"
 #include <kiface_base.h>

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
 {

kicad/cli/command_pcb_export_gerber.cpp

@@ -18,7 +18,7 @@
  * with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "command_export_pcb_gerber.h"
+#include "command_pcb_export_gerber.h"
 #include <cli/exit_codes.h>
 #include "jobs/job_export_pcb_gerber.h"
 #include <kiface_base.h>

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;
 

kicad/cli/command_pcb_export_gerbers.cpp

@@ -18,7 +18,7 @@
  * with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "command_export_pcb_gerbers.h"
+#include "command_pcb_export_gerbers.h"
 #include <cli/exit_codes.h>
 #include "jobs/job_export_pcb_gerbers.h"
 #include <kiface_base.h>

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
 {

kicad/cli/command_pcb_export_pdf.cpp

@@ -18,7 +18,7 @@
  * with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "command_export_pcb_pdf.h"
+#include "command_pcb_export_pdf.h"
 #include <cli/exit_codes.h>
 #include "jobs/job_export_pcb_pdf.h"
 #include <kiface_base.h>

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
 {

kicad/cli/command_pcb_export_pos.cpp

@@ -18,7 +18,7 @@
  * with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "command_export_pcb_pos.h"
+#include "command_pcb_export_pos.h"
 #include <cli/exit_codes.h>
 #include "jobs/job_export_pcb_pos.h"
 #include <kiface_base.h>

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
 {

kicad/cli/command_pcb_export_step.cpp

@@ -18,7 +18,7 @@
  * with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "command_export_pcb_step.h"
+#include "command_pcb_export_step.h"
 #include <cli/exit_codes.h>
 #include "jobs/job_export_pcb_step.h"
 #include <kiface_base.h>

kicad/cli/command_pcb_export_svg.cpp

@@ -19,9 +19,9 @@
  * with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "command_export_pcb_svg.h"
+#include "command_pcb_export_svg.h"
 #include <cli/exit_codes.h>
-#include "command_export_pcb_base.h"
+#include "command_pcb_export_base.h"
 #include "jobs/job_export_pcb_svg.h"
 #include <kiface_base.h>
 #include <layer_ids.h>

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
 {

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
 {

kicad/cli/command_sch_export_bom.cpp

@@ -18,7 +18,7 @@
  * with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "command_export_sch_bom.h"
+#include "command_sch_export_bom.h"
 #include <cli/exit_codes.h>
 #include "jobs/job_export_sch_bom.h"
 #include <kiface_base.h>

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
 {

kicad/cli/command_sch_export_netlist.cpp

@@ -18,7 +18,7 @@
  * with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "command_export_sch_netlist.h"
+#include "command_sch_export_netlist.h"
 #include <cli/exit_codes.h>
 #include "jobs/job_export_sch_netlist.h"
 #include <kiface_base.h>

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
 {

kicad/cli/command_sch_export_plot.cpp

@@ -20,7 +20,7 @@
 
 #include <kiface_base.h>
 #include <sch_plotter.h>
-#include "command_export_sch_plot.h"
+#include "command_sch_export_plot.h"
 #include <cli/exit_codes.h>
 #include "jobs/job_export_sch_plot.h"
 #include <layer_ids.h>

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 <plotters/plotter.h>
 
 namespace CLI

kicad/cli/command_sch_export_pythonbom.cpp

@@ -18,7 +18,7 @@
  * with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "command_export_sch_pythonbom.h"
+#include "command_sch_export_pythonbom.h"
 #include <cli/exit_codes.h>
 #include "jobs/job_export_sch_pythonbom.h"
 #include <kiface_base.h>

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
 {

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
 {

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
 {

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"