more cleanup about removing useless include

5 years ago · 7865d8de43
46 changed files with 4 additions and 85 deletions
--- a/eeschema/annotate.cpp
+++ b/eeschema/annotate.cpp
@ -23,7 +23,6 @@

 #include <algorithm>

-#include <fctsys.h>
 #include <sch_draw_panel.h>
 #include <confirm.h>
 #include <reporter.h>
--- a/eeschema/bus-wire-junction.cpp
+++ b/eeschema/bus-wire-junction.cpp
@ -22,8 +22,6 @@
 * 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
 */

-#include <fctsys.h>
-
 #include <core/kicad_algo.h>
 #include <eeschema_id.h>
 #include <general.h>
--- a/eeschema/class_libentry.cpp
+++ b/eeschema/class_libentry.cpp
@ -23,12 +23,9 @@
 * 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
 */

-#include <fctsys.h>
-#include <macros.h>
 #include <kicad_string.h>
 #include <sch_draw_panel.h>
 #include <plotter.h>
-#include <gr_basic.h>
 #include <sch_screen.h>
 #include <richio.h>
 #include <trace_helpers.h>
--- a/eeschema/class_library.cpp
+++ b/eeschema/class_library.cpp
@ -28,10 +28,7 @@
 */

 #include <algorithm>
-#include <fctsys.h>
 #include <kiface_i.h>
-#include <gr_basic.h>
-#include <macros.h>
 #include <eda_base_frame.h>
 #include <kicad_string.h>
 #include <gestfich.h>
--- a/eeschema/component_references_lister.cpp
+++ b/eeschema/component_references_lister.cpp
@ -35,7 +35,6 @@
 #include <vector>
 #include <unordered_set>

-#include <fctsys.h>
 #include <refdes_utils.h>
 #include <reporter.h>

--- a/eeschema/cross-probing.cpp
+++ b/eeschema/cross-probing.cpp
@ -23,7 +23,6 @@
 * 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
 */

-#include <fctsys.h>
 #include <kiface_i.h>
 #include <kiway_express.h>
 #include <eda_dde.h>
@ -217,7 +216,7 @@ SCH_ITEM* SCH_EDITOR_CONTROL::FindComponentAndItem( const wxString& aReference,
                double ratio      = std::max( -1.0, fabs( bbSize.y / screenSize.y ) );
                // Original KiCad code for how much to scale the zoom
                double kicadRatio = std::max( fabs( bbSize.x / screenSize.x ),
-                                              fabs( bbSize.y / screenSize.y ) ); 
+                                              fabs( bbSize.y / screenSize.y ) );

                // If the width of the part we're probing is bigger than what the screen width will be
                // after the zoom, then punt and use the KiCad zoom algorithm since it guarantees the
--- a/eeschema/eeschema.cpp
+++ b/eeschema/eeschema.cpp
@ -24,6 +24,7 @@
 */

 #include <fctsys.h>
+
 #include <pgm_base.h>
 #include <kiface_i.h>
 #include <confirm.h>
--- a/eeschema/eeschema_config.cpp
+++ b/eeschema/eeschema_config.cpp
@ -31,7 +31,6 @@
 #include <dialogs/panel_libedit_settings.h>
 #include <dialogs/dialog_schematic_setup.h>
 #include <eeschema_config.h>
-#include <fctsys.h>
 #include <kiway.h>
 #include <lib_edit_frame.h>
 #include <panel_gal_display_options.h>
--- a/eeschema/erc.cpp
+++ b/eeschema/erc.cpp
@ -30,7 +30,6 @@

 #include "connection_graph.h"
 #include <erc.h>
-#include <fctsys.h>
 #include <kicad_string.h>
 #include <lib_pin.h>
 #include <sch_edit_frame.h>
--- a/eeschema/getpart.cpp
+++ b/eeschema/getpart.cpp
@ -27,7 +27,6 @@
 #include <class_library.h>
 #include <confirm.h>
 #include <eeschema_id.h>
-#include <fctsys.h>
 #include <general.h>
 #include <kiway.h>
 #include <lib_edit_frame.h>
--- a/eeschema/hierarch.cpp
+++ b/eeschema/hierarch.cpp
@ -23,14 +23,12 @@
 * 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
 */

-#include <fctsys.h>
 #include <sch_draw_panel.h>
 #include <confirm.h>
 #include <id.h>
 #include <bitmaps.h>
 #include <dialog_shim.h>
 #include <sch_edit_frame.h>
-#include <general.h>
 #include <sch_sheet.h>
 #include <sch_sheet_path.h>
 #include <schematic.h>
--- a/eeschema/lib_arc.cpp
+++ b/eeschema/lib_arc.cpp
@ -23,9 +23,6 @@
 * 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
 */

-#include <fctsys.h>
-#include <gr_basic.h>
-#include <macros.h>
 #include <sch_draw_panel.h>
 #include <plotter.h>
 #include <trigo.h>
--- a/eeschema/lib_bezier.cpp
+++ b/eeschema/lib_bezier.cpp
@ -21,9 +21,6 @@
 * 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
 */

-#include <fctsys.h>
-#include <gr_basic.h>
-#include <macros.h>
 #include <sch_draw_panel.h>
 #include <plotter.h>
 #include <trigo.h>
--- a/eeschema/lib_circle.cpp
+++ b/eeschema/lib_circle.cpp
@ -22,9 +22,6 @@
 * 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
 */

-#include <fctsys.h>
-#include <gr_basic.h>
-#include <macros.h>
 #include <sch_draw_panel.h>
 #include <plotter.h>
 #include <trigo.h>
--- a/eeschema/lib_field.cpp
+++ b/eeschema/lib_field.cpp
@ -22,9 +22,7 @@
 * 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
 */

-#include <fctsys.h>
 #include <pgm_base.h>
-#include <gr_basic.h>
 #include <base_struct.h>
 #include <gr_text.h>
 #include <kicad_string.h>
--- a/eeschema/lib_item.cpp
+++ b/eeschema/lib_item.cpp
@ -23,8 +23,6 @@
 * 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
 */

-#include <fctsys.h>
-#include <gr_basic.h>
 #include <sch_draw_panel.h>
 #include <msgpanel.h>

--- a/eeschema/lib_pin.cpp
+++ b/eeschema/lib_pin.cpp
@ -23,7 +23,6 @@
 * 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
 */

-#include <fctsys.h>
 #include <pgm_base.h>
 #include <sch_draw_panel.h>
 #include <sch_edit_frame.h>
@ -122,7 +121,7 @@ LIB_PIN::LIB_PIN( LIB_PART* aParent ) :

 LIB_PIN::LIB_PIN( LIB_PART* aParent, const wxString& aName, const wxString& aNumber,
        int aOrientation, ELECTRICAL_PINTYPE aPinType, int aLength, int aNameTextSize,
-        int aNumTextSize, int aConvert, const wxPoint& aPos, int aUnit ) : 
+        int aNumTextSize, int aConvert, const wxPoint& aPos, int aUnit ) :
        LIB_ITEM( LIB_PIN_T, aParent ),
        m_position( aPos ),
        m_length( aLength ),
--- a/eeschema/lib_polyline.cpp
+++ b/eeschema/lib_polyline.cpp
@ -22,9 +22,6 @@
 * 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
 */

-#include <fctsys.h>
-#include <gr_basic.h>
-#include <macros.h>
 #include <sch_draw_panel.h>
 #include <eda_draw_frame.h>
 #include <plotter.h>
--- a/eeschema/lib_rectangle.cpp
+++ b/eeschema/lib_rectangle.cpp
@ -22,9 +22,6 @@
 * 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
 */

-#include <fctsys.h>
-#include <gr_basic.h>
-#include <macros.h>
 #include <sch_draw_panel.h>
 #include <plotter.h>
 #include <trigo.h>
--- a/eeschema/lib_text.cpp
+++ b/eeschema/lib_text.cpp
@ -25,9 +25,6 @@
 * @file lib_text.cpp
 */

-#include <fctsys.h>
-#include <gr_basic.h>
-#include <macros.h>
 #include <sch_draw_panel.h>
 #include <plotter.h>
 #include <gr_text.h>
--- a/eeschema/lib_view_frame.cpp
+++ b/eeschema/lib_view_frame.cpp
@ -31,7 +31,6 @@
 #include <dialog_choose_component.h>
 #include <eeschema_id.h>
 #include <eeschema_settings.h>
-#include <fctsys.h>
 #include <kiface_i.h>
 #include <kiway.h>
 #include <lib_view_frame.h>
--- a/eeschema/libarch.cpp
+++ b/eeschema/libarch.cpp
@ -28,7 +28,6 @@
 * @brief Module for generation of component archive files.
 */

-#include <fctsys.h>
 #include <confirm.h>
 #include <wildcards_and_files_ext.h>

--- a/eeschema/netlist_generator.cpp
+++ b/eeschema/netlist_generator.cpp
@ -23,7 +23,6 @@
 * 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
 */

-#include <fctsys.h>
 #include <kicad_string.h>
 #include <gestfich.h>
 #include <pgm_base.h>
--- a/eeschema/plot_schematic_DXF.cpp
+++ b/eeschema/plot_schematic_DXF.cpp
@ -25,7 +25,6 @@
 * 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
 */

-#include <fctsys.h>
 #include <plotters_specific.h>
 #include <sch_edit_frame.h>
 #include <sch_sheet_path.h>
--- a/eeschema/plot_schematic_HPGL.cpp
+++ b/eeschema/plot_schematic_HPGL.cpp
@ -25,7 +25,6 @@
 * 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
 */

-#include <fctsys.h>
 #include <plotters_specific.h>
 #include <sch_edit_frame.h>
 #include <base_units.h>
--- a/eeschema/plot_schematic_PDF.cpp
+++ b/eeschema/plot_schematic_PDF.cpp
@ -25,7 +25,6 @@
 * 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
 */

-#include <fctsys.h>
 #include <plotters_specific.h>
 #include <sch_edit_frame.h>
 #include <base_units.h>
--- a/eeschema/plot_schematic_PS.cpp
+++ b/eeschema/plot_schematic_PS.cpp
@ -24,7 +24,6 @@
 * 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
 */

-#include <fctsys.h>
 #include <plotters_specific.h>
 #include <sch_edit_frame.h>
 #include <base_units.h>
--- a/eeschema/plot_schematic_SVG.cpp
+++ b/eeschema/plot_schematic_SVG.cpp
@ -27,7 +27,6 @@
 * @file plot_schematic_SVG.cpp
 */

-#include <fctsys.h>
 #include <pgm_base.h>
 #include <sch_draw_panel.h>
 #include <sch_edit_frame.h>
--- a/eeschema/sch_bitmap.cpp
+++ b/eeschema/sch_bitmap.cpp
@ -26,12 +26,9 @@
 * @file sch_bitmap.cpp
 */

-#include <fctsys.h>
 #include <sch_draw_panel.h>
 #include <plotter.h>
 #include <settings/color_settings.h>
-#include <trigo.h>
-#include <macros.h>
 #include <bitmaps.h>
 #include <base_units.h>
 #include <eda_draw_frame.h>
--- a/eeschema/sch_bus_entry.cpp
+++ b/eeschema/sch_bus_entry.cpp
@ -22,7 +22,6 @@
 * 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
 */

-#include <fctsys.h>
 #include <sch_draw_panel.h>
 #include <bitmaps.h>
 #include <schematic.h>
--- a/eeschema/sch_component.cpp
+++ b/eeschema/sch_component.cpp
@ -22,7 +22,6 @@
 * 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
 */

-#include <fctsys.h>
 #include <sch_edit_frame.h>
 #include <msgpanel.h>
 #include <bitmaps.h>
--- a/eeschema/sch_field.cpp
+++ b/eeschema/sch_field.cpp
@ -30,11 +30,8 @@
 * They can be renamed and can appear in reports
 */

-#include <fctsys.h>
 #include <base_struct.h>
-#include <gr_basic.h>
 #include <gr_text.h>
-#include <macros.h>
 #include <sch_edit_frame.h>
 #include <plotter.h>
 #include <bitmaps.h>
--- a/eeschema/sch_item.cpp
+++ b/eeschema/sch_item.cpp
@ -22,9 +22,6 @@
 * 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
 */

-#include <fctsys.h>
-#include <common.h>
-#include <gr_basic.h>
 #include <base_struct.h>
 #include <trace_helpers.h>
 #include <sch_item.h>
--- a/eeschema/sch_junction.cpp
+++ b/eeschema/sch_junction.cpp
@ -26,12 +26,8 @@
 * @file sch_junction.cpp
 */

-#include <fctsys.h>
-#include <gr_basic.h>
-#include <macros.h>
 #include <sch_draw_panel.h>
 #include <trigo.h>
-#include <common.h>
 #include <plotter.h>
 #include <bitmaps.h>

--- a/eeschema/sch_line.cpp
+++ b/eeschema/sch_line.cpp
@ -22,7 +22,6 @@
 * 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
 */

-#include <fctsys.h>
 #include <sch_painter.h>
 #include <plotter.h>
 #include <sch_line.h>
--- a/eeschema/sch_marker.cpp
+++ b/eeschema/sch_marker.cpp
@ -22,7 +22,6 @@
 * 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
 */

-#include <fctsys.h>
 #include <sch_draw_panel.h>
 #include <trigo.h>
 #include <msgpanel.h>
--- a/eeschema/sch_no_connect.cpp
+++ b/eeschema/sch_no_connect.cpp
@ -27,11 +27,7 @@
 * @brief Class SCH_NO_CONNECT implementation.
 */

-#include <fctsys.h>
-#include <gr_basic.h>
-#include <macros.h>
 #include <sch_draw_panel.h>
-#include <common.h>
 #include <plotter.h>
 #include <bitmaps.h>
 #include <schematic.h>
--- a/eeschema/sch_screen.cpp
+++ b/eeschema/sch_screen.cpp
@ -29,10 +29,8 @@
 * @brief Implementation of SCH_SCREEN and SCH_SCREENS classes.
 */

-#include <common.h>
 #include <eda_rect.h>
-#include <fctsys.h>
-#include <gr_text.h>
+//#include <gr_text.h>
 #include <id.h>
 #include <kicad_string.h>
 #include <kiway.h>
--- a/eeschema/sch_sheet.cpp
+++ b/eeschema/sch_sheet.cpp
@ -22,7 +22,6 @@
 * 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
 */

-#include <fctsys.h>
 #include <sch_draw_panel.h>
 #include <gr_text.h>
 #include <trigo.h>
--- a/eeschema/sch_sheet_path.cpp
+++ b/eeschema/sch_sheet_path.cpp
@ -23,8 +23,6 @@
 * 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
 */

-#include <fctsys.h>
-
 #include <sch_screen.h>
 #include <sch_item.h>
 #include <sch_marker.h>
--- a/eeschema/sch_sheet_pin.cpp
+++ b/eeschema/sch_sheet_pin.cpp
@ -25,10 +25,8 @@
 #include <algorithm>

 #include <bitmaps.h>
-#include <fctsys.h>
 #include <general.h>
 #include <geometry/shape_line_chain.h>
-#include <gr_basic.h>
 #include <gr_text.h>
 #include <kicad_string.h>
 #include <plotter.h>
--- a/eeschema/sch_text.cpp
+++ b/eeschema/sch_text.cpp
@ -28,7 +28,6 @@
 * @brief Code for handling schematic texts (texts, labels, hlabels and global labels).
 */

-#include <fctsys.h>
 #include <sch_component.h>
 #include <sch_edit_frame.h>
 #include <plotter.h>
--- a/eeschema/schematic_undo_redo.cpp
+++ b/eeschema/schematic_undo_redo.cpp
@ -22,7 +22,6 @@
 * 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
 */

-#include <fctsys.h>
 #include <sch_edit_frame.h>
 #include <tool/tool_manager.h>
 #include <sch_bus_entry.h>
--- a/eeschema/sheet.cpp
+++ b/eeschema/sheet.cpp
@ -22,7 +22,6 @@
 * 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
 */

-#include <fctsys.h>
 #include <sch_draw_panel.h>
 #include <confirm.h>
 #include <kiface_i.h>
--- a/eeschema/symbol_lib_table.cpp
+++ b/eeschema/symbol_lib_table.cpp
@ -23,9 +23,6 @@
 */


-#include <fctsys.h>
-#include <common.h>
-#include <macros.h>
 #include <lib_id.h>
 #include <lib_table_lexer.h>
 #include <pgm_base.h>
--- a/eeschema/toolbars_sch_editor.cpp
+++ b/eeschema/toolbars_sch_editor.cpp
@ -24,7 +24,6 @@
 * 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
 */

-#include <fctsys.h>
 #include <sch_draw_panel.h>
 #include <sch_edit_frame.h>
 #include <kiface_i.h>