From 46b959c3e3d29f5e831448617dfa2a77bb793d97 Mon Sep 17 00:00:00 2001 From: Wayne Stambaugh Date: Wed, 18 Aug 2021 16:38:14 -0400 Subject: [PATCH] Move plotter headers into include folder. --- common/basic_gal.cpp | 2 +- common/bitmap_base.cpp | 5 ++- common/gr_text.cpp | 3 +- common/plotters/DXF_plotter.cpp | 2 +- common/plotters/GERBER_plotter.cpp | 4 +-- common/plotters/HPGL_plotter.cpp | 2 +- common/plotters/PDF_plotter.cpp | 2 +- common/plotters/PS_plotter.cpp | 2 +- common/plotters/SVG_plotter.cpp | 2 +- common/plotters/common_plot_functions.cpp | 5 ++- common/plotters/plotter.cpp | 4 +-- eeschema/dialogs/dialog_plot_schematic.cpp | 6 ++-- eeschema/dialogs/dialog_plot_schematic.h | 2 +- eeschema/lib_arc.cpp | 2 +- eeschema/lib_bezier.cpp | 2 +- eeschema/lib_circle.cpp | 3 +- eeschema/lib_field.cpp | 3 +- eeschema/lib_polyline.cpp | 3 +- eeschema/lib_rectangle.cpp | 5 +-- eeschema/lib_symbol.cpp | 2 +- eeschema/lib_text.cpp | 3 +- eeschema/sch_bitmap.cpp | 2 +- eeschema/sch_field.cpp | 3 +- eeschema/sch_item.h | 6 +--- eeschema/sch_junction.cpp | 2 +- eeschema/sch_line.cpp | 2 +- eeschema/sch_no_connect.cpp | 2 +- eeschema/sch_painter.cpp | 2 +- .../cadstar/cadstar_sch_archive_loader.h | 6 ++-- eeschema/sch_screen.cpp | 2 +- eeschema/sch_sheet.cpp | 3 +- eeschema/sch_sheet_pin.cpp | 3 +- eeschema/sch_text.cpp | 2 +- .../symbol_editor/symbol_editor_plotter.cpp | 2 +- .../plotters/gbr_plotter_aperture_macros.h | 0 .../plotters/gbr_plotter_apertures.h | 0 include/{ => plotters}/plotter.h | 0 {common => include}/plotters/plotter_dxf.h | 2 +- {common => include}/plotters/plotter_gerber.h | 2 +- {common => include}/plotters/plotter_hpgl.h | 2 +- .../plotters/plotters_pslike.h | 2 +- include/plotters_specific.h | 32 ------------------- pcbnew/dialogs/dialog_plot.cpp | 4 +-- pcbnew/exporters/gen_drill_report_files.cpp | 6 ++-- pcbnew/exporters/gendrill_Excellon_writer.cpp | 2 +- pcbnew/exporters/gendrill_gerber_writer.cpp | 2 +- pcbnew/exporters/gerber_jobfile_writer.cpp | 4 +-- pcbnew/exporters/gerber_placefile_writer.cpp | 2 +- pcbnew/pcb_plot_params.cpp | 2 +- pcbnew/pcb_plot_params.h | 3 +- pcbnew/pcbplot.cpp | 2 +- pcbnew/plot_board_layers.cpp | 5 ++- pcbnew/plot_brditems_plotter.cpp | 2 +- pcbnew/python/swig/pcbnew.i | 2 +- 54 files changed, 70 insertions(+), 107 deletions(-) rename {common => include}/plotters/gbr_plotter_aperture_macros.h (100%) rename {common => include}/plotters/gbr_plotter_apertures.h (100%) rename include/{ => plotters}/plotter.h (100%) rename {common => include}/plotters/plotter_dxf.h (99%) rename {common => include}/plotters/plotter_gerber.h (99%) rename {common => include}/plotters/plotter_hpgl.h (99%) rename {common => include}/plotters/plotters_pslike.h (99%) delete mode 100644 include/plotters_specific.h diff --git a/common/basic_gal.cpp b/common/basic_gal.cpp index 018396c6a0..63bc89bbef 100644 --- a/common/basic_gal.cpp +++ b/common/basic_gal.cpp @@ -32,7 +32,7 @@ */ #include -#include +#include #include #include diff --git a/common/bitmap_base.cpp b/common/bitmap_base.cpp index 8c5bb384c7..ea712fa204 100644 --- a/common/bitmap_base.cpp +++ b/common/bitmap_base.cpp @@ -28,11 +28,10 @@ #include #include // for EDA_RECT -#include // for COLOR4D #include -#include // for KiROUND +#include // for KiROUND #include // for make_unique, unique_ptr -#include +#include #include #include // for wxBitmap #include diff --git a/common/gr_text.cpp b/common/gr_text.cpp index 9f68b91d0d..0f36751423 100644 --- a/common/gr_text.cpp +++ b/common/gr_text.cpp @@ -30,11 +30,10 @@ */ #include -#include +#include #include // EDA_TEXT_HJUSTIFY_T and EDA_TEXT_VJUSTIFY_T #include #include -#include #include // for KiROUND #include diff --git a/common/plotters/DXF_plotter.cpp b/common/plotters/DXF_plotter.cpp index 6e14aa564e..0935fe9142 100644 --- a/common/plotters/DXF_plotter.cpp +++ b/common/plotters/DXF_plotter.cpp @@ -25,7 +25,7 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "plotter_dxf.h" +#include #include #include #include diff --git a/common/plotters/GERBER_plotter.cpp b/common/plotters/GERBER_plotter.cpp index cea86be09b..3255b77c02 100644 --- a/common/plotters/GERBER_plotter.cpp +++ b/common/plotters/GERBER_plotter.cpp @@ -32,8 +32,8 @@ #include -#include "plotter_gerber.h" -#include "gbr_plotter_aperture_macros.h" +#include +#include #include diff --git a/common/plotters/HPGL_plotter.cpp b/common/plotters/HPGL_plotter.cpp index 31aceb0fa8..0e04de36e7 100644 --- a/common/plotters/HPGL_plotter.cpp +++ b/common/plotters/HPGL_plotter.cpp @@ -200,7 +200,7 @@ #include // for KiROUND #include -#include "plotter_hpgl.h" +#include /// Compute the distance between two DPOINT points. diff --git a/common/plotters/PDF_plotter.cpp b/common/plotters/PDF_plotter.cpp index 992548de8f..95949a492e 100644 --- a/common/plotters/PDF_plotter.cpp +++ b/common/plotters/PDF_plotter.cpp @@ -37,7 +37,7 @@ #include #include -#include "plotters_pslike.h" +#include std::string PDF_PLOTTER::encodeStringForPlotter( const wxString& aText ) diff --git a/common/plotters/PS_plotter.cpp b/common/plotters/PS_plotter.cpp index edd27d534c..96877f590d 100644 --- a/common/plotters/PS_plotter.cpp +++ b/common/plotters/PS_plotter.cpp @@ -32,7 +32,7 @@ #include // for KiROUND #include -#include "plotters_pslike.h" +#include /* Forward declaration of the font width metrics diff --git a/common/plotters/SVG_plotter.cpp b/common/plotters/SVG_plotter.cpp index b1b2124237..e2a1f0e93b 100644 --- a/common/plotters/SVG_plotter.cpp +++ b/common/plotters/SVG_plotter.cpp @@ -100,7 +100,7 @@ #include #include -#include "plotters_pslike.h" +#include /** diff --git a/common/plotters/common_plot_functions.cpp b/common/plotters/common_plot_functions.cpp index ff7f3f8103..289b3c8175 100644 --- a/common/plotters/common_plot_functions.cpp +++ b/common/plotters/common_plot_functions.cpp @@ -23,7 +23,10 @@ */ #include -#include +#include +#include +#include +#include #include #include #include diff --git a/common/plotters/plotter.cpp b/common/plotters/plotter.cpp index 84311ed736..f9527cc58b 100644 --- a/common/plotters/plotter.cpp +++ b/common/plotters/plotter.cpp @@ -37,11 +37,9 @@ * is not handled here. */ -#include -#include #include #include -#include +#include #include #include #include diff --git a/eeschema/dialogs/dialog_plot_schematic.cpp b/eeschema/dialogs/dialog_plot_schematic.cpp index b5a6d1d8c0..854f49354b 100644 --- a/eeschema/dialogs/dialog_plot_schematic.cpp +++ b/eeschema/dialogs/dialog_plot_schematic.cpp @@ -31,9 +31,9 @@ #include #include #include -#include "../../common/plotters/plotter_hpgl.h" -#include "../../common/plotters/plotter_dxf.h" -#include "../../common/plotters/plotters_pslike.h" +#include +#include +#include #include #include #include diff --git a/eeschema/dialogs/dialog_plot_schematic.h b/eeschema/dialogs/dialog_plot_schematic.h index c06efc4118..d4c275cfe6 100644 --- a/eeschema/dialogs/dialog_plot_schematic.h +++ b/eeschema/dialogs/dialog_plot_schematic.h @@ -31,7 +31,7 @@ #ifndef __DIALOG_PLOT_SCHEMATIC__ #define __DIALOG_PLOT_SCHEMATIC__ -#include +#include #include #include diff --git a/eeschema/lib_arc.cpp b/eeschema/lib_arc.cpp index 0517cc69e9..b38f6a0755 100644 --- a/eeschema/lib_arc.cpp +++ b/eeschema/lib_arc.cpp @@ -24,7 +24,7 @@ */ #include -#include +#include #include #include #include diff --git a/eeschema/lib_bezier.cpp b/eeschema/lib_bezier.cpp index 894be6bb2d..ba084613ce 100644 --- a/eeschema/lib_bezier.cpp +++ b/eeschema/lib_bezier.cpp @@ -22,7 +22,7 @@ */ #include -#include +#include #include #include #include diff --git a/eeschema/lib_circle.cpp b/eeschema/lib_circle.cpp index a759ca9df2..a18000e696 100644 --- a/eeschema/lib_circle.cpp +++ b/eeschema/lib_circle.cpp @@ -22,8 +22,9 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA */ +#include #include -#include +#include #include #include #include diff --git a/eeschema/lib_field.cpp b/eeschema/lib_field.cpp index 1cd0f2fbcc..8a3a3aa1ed 100644 --- a/eeschema/lib_field.cpp +++ b/eeschema/lib_field.cpp @@ -23,11 +23,10 @@ */ #include -#include #include #include #include -#include +#include #include #include #include diff --git a/eeschema/lib_polyline.cpp b/eeschema/lib_polyline.cpp index 7a1431621d..ad4be65aa7 100644 --- a/eeschema/lib_polyline.cpp +++ b/eeschema/lib_polyline.cpp @@ -23,8 +23,7 @@ */ #include -#include -#include +#include #include #include #include diff --git a/eeschema/lib_rectangle.cpp b/eeschema/lib_rectangle.cpp index 629d3631cd..a719f4d72d 100644 --- a/eeschema/lib_rectangle.cpp +++ b/eeschema/lib_rectangle.cpp @@ -22,13 +22,14 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA */ + +#include #include -#include +#include #include #include #include #include -#include #include #include #include diff --git a/eeschema/lib_symbol.cpp b/eeschema/lib_symbol.cpp index 51506b9eee..dbc5089b17 100644 --- a/eeschema/lib_symbol.cpp +++ b/eeschema/lib_symbol.cpp @@ -24,7 +24,7 @@ */ #include -#include +#include #include #include #include diff --git a/eeschema/lib_text.cpp b/eeschema/lib_text.cpp index b6d648de6c..22ab447bae 100644 --- a/eeschema/lib_text.cpp +++ b/eeschema/lib_text.cpp @@ -27,8 +27,7 @@ #include #include -#include -#include +#include #include #include #include diff --git a/eeschema/sch_bitmap.cpp b/eeschema/sch_bitmap.cpp index b63cbf4633..d800c0bcc0 100644 --- a/eeschema/sch_bitmap.cpp +++ b/eeschema/sch_bitmap.cpp @@ -27,7 +27,7 @@ */ #include -#include +#include #include #include #include diff --git a/eeschema/sch_field.cpp b/eeschema/sch_field.cpp index 40c31c427d..a1a5e00b08 100644 --- a/eeschema/sch_field.cpp +++ b/eeschema/sch_field.cpp @@ -34,9 +34,8 @@ #include #include // for ExpandTextVars #include -#include #include -#include +#include #include #include #include diff --git a/eeschema/sch_item.h b/eeschema/sch_item.h index 5bcd3c0758..a1cf249d1a 100644 --- a/eeschema/sch_item.h +++ b/eeschema/sch_item.h @@ -27,16 +27,12 @@ #include #include -#include #include -#include // for PLOT_DASH_TYPE definition - -#include +#include // for PLOT_DASH_TYPE definition #include #include -#include #include class CONNECTION_GRAPH; diff --git a/eeschema/sch_junction.cpp b/eeschema/sch_junction.cpp index 784c702c77..f6f24928c5 100644 --- a/eeschema/sch_junction.cpp +++ b/eeschema/sch_junction.cpp @@ -29,7 +29,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/eeschema/sch_line.cpp b/eeschema/sch_line.cpp index a29916f1cd..1d083e0d2b 100644 --- a/eeschema/sch_line.cpp +++ b/eeschema/sch_line.cpp @@ -25,7 +25,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/eeschema/sch_no_connect.cpp b/eeschema/sch_no_connect.cpp index 9d2552ea15..0dbd7737fb 100644 --- a/eeschema/sch_no_connect.cpp +++ b/eeschema/sch_no_connect.cpp @@ -28,7 +28,7 @@ */ #include -#include +#include #include #include #include diff --git a/eeschema/sch_painter.cpp b/eeschema/sch_painter.cpp index b550eecce9..e8a2fb664f 100644 --- a/eeschema/sch_painter.cpp +++ b/eeschema/sch_painter.cpp @@ -44,7 +44,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/eeschema/sch_plugins/cadstar/cadstar_sch_archive_loader.h b/eeschema/sch_plugins/cadstar/cadstar_sch_archive_loader.h index 7e73a4367e..2e59453c7d 100644 --- a/eeschema/sch_plugins/cadstar/cadstar_sch_archive_loader.h +++ b/eeschema/sch_plugins/cadstar/cadstar_sch_archive_loader.h @@ -28,9 +28,9 @@ #include -#include // SCH_LAYER_ID -#include // PLOT_DASH_TYPE -#include // ELECTRICAL_PINTYPE +#include // SCH_LAYER_ID +#include // PLOT_DASH_TYPE +#include // ELECTRICAL_PINTYPE #include #include diff --git a/eeschema/sch_screen.cpp b/eeschema/sch_screen.cpp index 97bacae32c..d3bcf2fd13 100644 --- a/eeschema/sch_screen.cpp +++ b/eeschema/sch_screen.cpp @@ -36,7 +36,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/eeschema/sch_sheet.cpp b/eeschema/sch_sheet.cpp index fce444aca4..fc8c58d13c 100644 --- a/eeschema/sch_sheet.cpp +++ b/eeschema/sch_sheet.cpp @@ -25,10 +25,9 @@ #include #include #include -#include #include #include -#include +#include #include #include #include // for KiROUND diff --git a/eeschema/sch_sheet_pin.cpp b/eeschema/sch_sheet_pin.cpp index 7547f53d55..0ca26dd575 100644 --- a/eeschema/sch_sheet_pin.cpp +++ b/eeschema/sch_sheet_pin.cpp @@ -27,9 +27,8 @@ #include #include #include -#include #include -#include +#include #include #include #include diff --git a/eeschema/sch_text.cpp b/eeschema/sch_text.cpp index e3e6e091ac..6567402323 100644 --- a/eeschema/sch_text.cpp +++ b/eeschema/sch_text.cpp @@ -30,7 +30,7 @@ #include #include -#include +#include #include #include #include diff --git a/eeschema/symbol_editor/symbol_editor_plotter.cpp b/eeschema/symbol_editor/symbol_editor_plotter.cpp index 911b0f9a91..a95b8611e6 100644 --- a/eeschema/symbol_editor/symbol_editor_plotter.cpp +++ b/eeschema/symbol_editor/symbol_editor_plotter.cpp @@ -25,7 +25,7 @@ #include #include #include -#include "../../common/plotters/plotters_pslike.h" +#include void SYMBOL_EDIT_FRAME::SVGPlotSymbol( const wxString& aFullFileName ) { diff --git a/common/plotters/gbr_plotter_aperture_macros.h b/include/plotters/gbr_plotter_aperture_macros.h similarity index 100% rename from common/plotters/gbr_plotter_aperture_macros.h rename to include/plotters/gbr_plotter_aperture_macros.h diff --git a/common/plotters/gbr_plotter_apertures.h b/include/plotters/gbr_plotter_apertures.h similarity index 100% rename from common/plotters/gbr_plotter_apertures.h rename to include/plotters/gbr_plotter_apertures.h diff --git a/include/plotter.h b/include/plotters/plotter.h similarity index 100% rename from include/plotter.h rename to include/plotters/plotter.h diff --git a/common/plotters/plotter_dxf.h b/include/plotters/plotter_dxf.h similarity index 99% rename from common/plotters/plotter_dxf.h rename to include/plotters/plotter_dxf.h index 9206266bf9..13ea51ed32 100644 --- a/common/plotters/plotter_dxf.h +++ b/include/plotters/plotter_dxf.h @@ -25,7 +25,7 @@ #pragma once -#include +#include "plotter.h" class DXF_PLOTTER : public PLOTTER diff --git a/common/plotters/plotter_gerber.h b/include/plotters/plotter_gerber.h similarity index 99% rename from common/plotters/plotter_gerber.h rename to include/plotters/plotter_gerber.h index af612a0c3f..a27014b9c9 100644 --- a/common/plotters/plotter_gerber.h +++ b/include/plotters/plotter_gerber.h @@ -26,7 +26,7 @@ #pragma once -#include +#include "plotter.h" #include "gbr_plotter_apertures.h" class SHAPE_ARC; diff --git a/common/plotters/plotter_hpgl.h b/include/plotters/plotter_hpgl.h similarity index 99% rename from common/plotters/plotter_hpgl.h rename to include/plotters/plotter_hpgl.h index e4d2e8dd1a..fa88e7f2b7 100644 --- a/common/plotters/plotter_hpgl.h +++ b/include/plotters/plotter_hpgl.h @@ -27,7 +27,7 @@ #include -#include +#include "plotter.h" class HPGL_PLOTTER : public PLOTTER diff --git a/common/plotters/plotters_pslike.h b/include/plotters/plotters_pslike.h similarity index 99% rename from common/plotters/plotters_pslike.h rename to include/plotters/plotters_pslike.h index 16a3a49966..b28c373955 100644 --- a/common/plotters/plotters_pslike.h +++ b/include/plotters/plotters_pslike.h @@ -25,7 +25,7 @@ #pragma once -#include +#include "plotter.h" /** diff --git a/include/plotters_specific.h b/include/plotters_specific.h deleted file mode 100644 index f9fb7db6ae..0000000000 --- a/include/plotters_specific.h +++ /dev/null @@ -1,32 +0,0 @@ -/* - * This program source code file is part of KiCad, a free EDA CAD application. - * - * Copyright (C) 2020 Jean-Pierre Charras, jp.charras at wanadoo.fr - * Copyright (C) 2016-2020 KiCad Developers, see AUTHORS.txt for contributors. - * - * This program is free software: you can redistribute it and/or modify it - * under the terms of the GNU General Public License as published by the - * Free Software Foundation, either version 3 of the License, or (at your - * option) any later version. - * - * This program is distributed in the hope that it will be useful, but - * WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * General Public License for more details. - * - * You should have received a copy of the GNU General Public License along - * with this program. If not, see . - */ - -/** - * Plotting engines (PostScript, Gerber, HPGL and DXF) - * - * @file plotters_specific.h - */ - -#pragma once - -#include <../common/plotters/plotter_hpgl.h> -#include <../common/plotters/plotter_gerber.h> -#include <../common/plotters/plotter_dxf.h> -#include <../common/plotters/plotters_pslike.h> diff --git a/pcbnew/dialogs/dialog_plot.cpp b/pcbnew/dialogs/dialog_plot.cpp index e9f5bf67e3..137e25c547 100644 --- a/pcbnew/dialogs/dialog_plot.cpp +++ b/pcbnew/dialogs/dialog_plot.cpp @@ -1,7 +1,7 @@ /* * This program source code file is part of KiCad, a free EDA CAD application. * - * Copyright (C) 1992-2018 KiCad Developers, see AUTHORS.txt for contributors. + * Copyright (C) 1992-2021 KiCad Developers, see AUTHORS.txt for contributors. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License @@ -23,7 +23,7 @@ #include -#include +#include #include #include #include diff --git a/pcbnew/exporters/gen_drill_report_files.cpp b/pcbnew/exporters/gen_drill_report_files.cpp index fb549794fa..fa9d0369c6 100644 --- a/pcbnew/exporters/gen_drill_report_files.cpp +++ b/pcbnew/exporters/gen_drill_report_files.cpp @@ -27,9 +27,11 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA */ -#include +#include +#include +#include +#include #include -#include #include #include #include diff --git a/pcbnew/exporters/gendrill_Excellon_writer.cpp b/pcbnew/exporters/gendrill_Excellon_writer.cpp index 34bb429430..1fb0d16680 100644 --- a/pcbnew/exporters/gendrill_Excellon_writer.cpp +++ b/pcbnew/exporters/gendrill_Excellon_writer.cpp @@ -35,7 +35,7 @@ * and the CNC-7 manual. */ -#include +#include #include #include #include diff --git a/pcbnew/exporters/gendrill_gerber_writer.cpp b/pcbnew/exporters/gendrill_gerber_writer.cpp index 4bcea74872..fb81db10b8 100644 --- a/pcbnew/exporters/gendrill_gerber_writer.cpp +++ b/pcbnew/exporters/gendrill_gerber_writer.cpp @@ -27,7 +27,7 @@ * @brief Functions to create drill files in gerber X2 format. */ -#include "../../common/plotters/plotter_gerber.h" +#include #include #include #include diff --git a/pcbnew/exporters/gerber_jobfile_writer.cpp b/pcbnew/exporters/gerber_jobfile_writer.cpp index ddd764f535..0048f77bbf 100644 --- a/pcbnew/exporters/gerber_jobfile_writer.cpp +++ b/pcbnew/exporters/gerber_jobfile_writer.cpp @@ -2,7 +2,7 @@ * This program source code file is part of KiCad, a free EDA CAD application. * * Copyright (C) 2018 Jean_Pierre Charras - * Copyright (C) 1992-2020 KiCad Developers, see AUTHORS.txt for contributors. + * Copyright (C) 1992-2021 KiCad Developers, see AUTHORS.txt for contributors. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License @@ -34,7 +34,7 @@ #include #include #include -#include +#include #include #include diff --git a/pcbnew/exporters/gerber_placefile_writer.cpp b/pcbnew/exporters/gerber_placefile_writer.cpp index f1862c4ca0..05b02f6189 100644 --- a/pcbnew/exporters/gerber_placefile_writer.cpp +++ b/pcbnew/exporters/gerber_placefile_writer.cpp @@ -27,7 +27,7 @@ #include -#include "../../common/plotters/plotter_gerber.h" +#include #include #include #include diff --git a/pcbnew/pcb_plot_params.cpp b/pcbnew/pcb_plot_params.cpp index cbb98e11c2..4af8a1a2b6 100644 --- a/pcbnew/pcb_plot_params.cpp +++ b/pcbnew/pcb_plot_params.cpp @@ -28,7 +28,7 @@ #include // for KiROUND #include #include -#include +#include #include diff --git a/pcbnew/pcb_plot_params.h b/pcbnew/pcb_plot_params.h index 478c3f3316..cf1aa4f74e 100644 --- a/pcbnew/pcb_plot_params.h +++ b/pcbnew/pcb_plot_params.h @@ -23,8 +23,7 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA */ -#include -#include +#include #include class COLOR_SETTINGS; diff --git a/pcbnew/pcbplot.cpp b/pcbnew/pcbplot.cpp index eee4683cee..c6c4733d48 100644 --- a/pcbnew/pcbplot.cpp +++ b/pcbnew/pcbplot.cpp @@ -27,7 +27,7 @@ * @file pcbnew/pcbplot.cpp */ -#include +#include #include #include #include diff --git a/pcbnew/plot_board_layers.cpp b/pcbnew/plot_board_layers.cpp index 4b342f1b16..257b966ac1 100644 --- a/pcbnew/plot_board_layers.cpp +++ b/pcbnew/plot_board_layers.cpp @@ -49,7 +49,10 @@ #include #include -#include +#include +#include +#include +#include #include #include #include diff --git a/pcbnew/plot_brditems_plotter.cpp b/pcbnew/plot_brditems_plotter.cpp index 9f374a8177..4e7e531323 100644 --- a/pcbnew/plot_brditems_plotter.cpp +++ b/pcbnew/plot_brditems_plotter.cpp @@ -35,7 +35,7 @@ #include #include // for KiROUND, Clamp #include // for VECTOR2I -#include "../common/plotters/plotter_gerber.h" +#include #include #include // for BOARD_DESIGN_SETTINGS diff --git a/pcbnew/python/swig/pcbnew.i b/pcbnew/python/swig/pcbnew.i index 9504d6be12..85136734f8 100644 --- a/pcbnew/python/swig/pcbnew.i +++ b/pcbnew/python/swig/pcbnew.i @@ -113,7 +113,7 @@ HANDLE_EXCEPTIONS(PLUGIN::FootprintDelete) %include %include -%include +%include %include %include %include