diff --git a/3d-viewer/3d_cache/dialogs/dlg_select_3dmodel.cpp b/3d-viewer/3d_cache/dialogs/dlg_select_3dmodel.cpp index 576910e731..586849397d 100644 --- a/3d-viewer/3d_cache/dialogs/dlg_select_3dmodel.cpp +++ b/3d-viewer/3d_cache/dialogs/dlg_select_3dmodel.cpp @@ -33,7 +33,7 @@ #include <3d_model_viewer/c3d_model_viewer.h> #include #include -#include +#include #include diff --git a/3d-viewer/3d_cache/dialogs/panel_prev_3d.cpp b/3d-viewer/3d_cache/dialogs/panel_prev_3d.cpp index f23e6c2240..e76ad4dec1 100644 --- a/3d-viewer/3d_cache/dialogs/panel_prev_3d.cpp +++ b/3d-viewer/3d_cache/dialogs/panel_prev_3d.cpp @@ -32,7 +32,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/3d-viewer/3d_canvas/board_adapter.cpp b/3d-viewer/3d_canvas/board_adapter.cpp index 312725f4e6..8e15d52659 100644 --- a/3d-viewer/3d_canvas/board_adapter.cpp +++ b/3d-viewer/3d_canvas/board_adapter.cpp @@ -30,7 +30,7 @@ #include "../3d_rendering/ccamera.h" #include "board_adapter.h" #include <3d_rendering/3d_render_raytracing/shapes2D/cpolygon2d.h> -#include +#include #include <3d_math.h> #include "3d_fastmath.h" #include diff --git a/3d-viewer/3d_canvas/board_adapter.h b/3d-viewer/3d_canvas/board_adapter.h index 7d5dfe7425..eeb9fdf513 100644 --- a/3d-viewer/3d_canvas/board_adapter.h +++ b/3d-viewer/3d_canvas/board_adapter.h @@ -36,15 +36,15 @@ #include "../common_ogl/cogl_att_list.h" #include -#include -#include +#include +#include #include #include #include #include #include #include -#include +#include #include class COLOR_SETTINGS; diff --git a/3d-viewer/3d_canvas/create_3Dgraphic_brd_items.cpp b/3d-viewer/3d_canvas/create_3Dgraphic_brd_items.cpp index 564bbd6b76..c434105326 100644 --- a/3d-viewer/3d_canvas/create_3Dgraphic_brd_items.cpp +++ b/3d-viewer/3d_canvas/create_3Dgraphic_brd_items.cpp @@ -35,9 +35,9 @@ #include "../3d_rendering/3d_render_raytracing/shapes2D/croundsegment2d.h" #include "../3d_rendering/3d_render_raytracing/shapes2D/ctriangle2d.h" #include -#include -#include -#include +#include +#include +#include #include #include #include diff --git a/3d-viewer/3d_canvas/create_layer_items.cpp b/3d-viewer/3d_canvas/create_layer_items.cpp index 904097ac7f..559608aa2a 100644 --- a/3d-viewer/3d_canvas/create_layer_items.cpp +++ b/3d-viewer/3d_canvas/create_layer_items.cpp @@ -35,9 +35,9 @@ #include "../3d_rendering/3d_render_raytracing/shapes2D/cfilledcircle2d.h" #include "../3d_rendering/3d_render_raytracing/shapes3D/ccylinder.h" -#include -#include -#include +#include +#include +#include #include #include #include diff --git a/3d-viewer/3d_canvas/create_layer_poly.cpp b/3d-viewer/3d_canvas/create_layer_poly.cpp index 15de111e72..00da10e731 100644 --- a/3d-viewer/3d_canvas/create_layer_poly.cpp +++ b/3d-viewer/3d_canvas/create_layer_poly.cpp @@ -31,7 +31,7 @@ #include "board_adapter.h" #include #include -#include +#include void BOARD_ADAPTER::buildPadShapeThickOutlineAsPolygon( const D_PAD* aPad, diff --git a/3d-viewer/3d_canvas/eda_3d_canvas.cpp b/3d-viewer/3d_canvas/eda_3d_canvas.cpp index ed83f215dc..b98496678c 100644 --- a/3d-viewer/3d_canvas/eda_3d_canvas.cpp +++ b/3d-viewer/3d_canvas/eda_3d_canvas.cpp @@ -38,7 +38,7 @@ #include <3d_rendering/3d_render_ogl_legacy/c3d_render_ogl_legacy.h> #include <3d_rendering/3d_render_raytracing/accelerators/cbvh_pbrt.h> #include <3d_viewer_id.h> -#include +#include #include #include #include // To use GetRunningMicroSecs or another profiling utility diff --git a/3d-viewer/3d_rendering/3d_render_ogl_legacy/c3d_render_createscene_ogl_legacy.cpp b/3d-viewer/3d_rendering/3d_render_ogl_legacy/c3d_render_createscene_ogl_legacy.cpp index 435498eb82..1b644c9485 100644 --- a/3d-viewer/3d_rendering/3d_render_ogl_legacy/c3d_render_createscene_ogl_legacy.cpp +++ b/3d-viewer/3d_rendering/3d_render_ogl_legacy/c3d_render_createscene_ogl_legacy.cpp @@ -29,8 +29,8 @@ #include "c3d_render_ogl_legacy.h" #include "ogl_legacy_utils.h" -#include -#include +#include +#include #include "../../3d_math.h" #include "../../3d_fastmath.h" #include diff --git a/3d-viewer/3d_rendering/3d_render_ogl_legacy/c3d_render_ogl_legacy.cpp b/3d-viewer/3d_rendering/3d_render_ogl_legacy/c3d_render_ogl_legacy.cpp index 5d0ab72f55..b5ad0c2eb7 100644 --- a/3d-viewer/3d_rendering/3d_render_ogl_legacy/c3d_render_ogl_legacy.cpp +++ b/3d-viewer/3d_rendering/3d_render_ogl_legacy/c3d_render_ogl_legacy.cpp @@ -33,8 +33,8 @@ #include "ogl_legacy_utils.h" #include "common_ogl/ogl_utils.h" #include "../cimage.h" -#include -#include +#include +#include #include <3d_math.h> #include // for KiROUND diff --git a/3d-viewer/3d_rendering/3d_render_raytracing/c3d_render_createscene.cpp b/3d-viewer/3d_rendering/3d_render_raytracing/c3d_render_createscene.cpp index 0f5c5b4282..e5ffc7a219 100644 --- a/3d-viewer/3d_rendering/3d_render_raytracing/c3d_render_createscene.cpp +++ b/3d-viewer/3d_rendering/3d_render_raytracing/c3d_render_createscene.cpp @@ -42,8 +42,8 @@ #include "3d_fastmath.h" #include "3d_math.h" -#include -#include +#include +#include #include #include // To use GetRunningMicroSecs or another profiling utility diff --git a/3d-viewer/3d_viewer/eda_3d_viewer.cpp b/3d-viewer/3d_viewer/eda_3d_viewer.cpp index cd3ef524b6..c5dc9f2aec 100644 --- a/3d-viewer/3d_viewer/eda_3d_viewer.cpp +++ b/3d-viewer/3d_viewer/eda_3d_viewer.cpp @@ -38,7 +38,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/common/CMakeLists.txt b/common/CMakeLists.txt index 612e6c674d..4e65ec822b 100644 --- a/common/CMakeLists.txt +++ b/common/CMakeLists.txt @@ -501,22 +501,22 @@ set( PCB_COMMON_SRCS ${CMAKE_SOURCE_DIR}/pcbnew/board_connected_item.cpp ${CMAKE_SOURCE_DIR}/pcbnew/board_design_settings.cpp ${CMAKE_SOURCE_DIR}/pcbnew/board_items_to_polygon_shape_transform.cpp - ${CMAKE_SOURCE_DIR}/pcbnew/class_board.cpp + ${CMAKE_SOURCE_DIR}/pcbnew/board.cpp ${CMAKE_SOURCE_DIR}/pcbnew/class_board_item.cpp ${CMAKE_SOURCE_DIR}/pcbnew/dimension.cpp ${CMAKE_SOURCE_DIR}/pcbnew/pcb_shape.cpp ${CMAKE_SOURCE_DIR}/pcbnew/fp_shape.cpp - ${CMAKE_SOURCE_DIR}/pcbnew/class_pcb_group.cpp + ${CMAKE_SOURCE_DIR}/pcbnew/pcb_group.cpp ${CMAKE_SOURCE_DIR}/pcbnew/class_marker_pcb.cpp - ${CMAKE_SOURCE_DIR}/pcbnew/class_module.cpp + ${CMAKE_SOURCE_DIR}/pcbnew/footprint.cpp ${CMAKE_SOURCE_DIR}/pcbnew/netinfo_item.cpp ${CMAKE_SOURCE_DIR}/pcbnew/netinfo_list.cpp - ${CMAKE_SOURCE_DIR}/pcbnew/class_pad.cpp + ${CMAKE_SOURCE_DIR}/pcbnew/pad.cpp ${CMAKE_SOURCE_DIR}/pcbnew/pcb_target.cpp ${CMAKE_SOURCE_DIR}/pcbnew/pcb_text.cpp ${CMAKE_SOURCE_DIR}/pcbnew/board_stackup_manager/class_board_stackup.cpp ${CMAKE_SOURCE_DIR}/pcbnew/fp_text.cpp - ${CMAKE_SOURCE_DIR}/pcbnew/class_track.cpp + ${CMAKE_SOURCE_DIR}/pcbnew/track.cpp ${CMAKE_SOURCE_DIR}/pcbnew/zone.cpp ${CMAKE_SOURCE_DIR}/pcbnew/collectors.cpp ${CMAKE_SOURCE_DIR}/pcbnew/connectivity/connectivity_algo.cpp diff --git a/common/fp_lib_table.cpp b/common/fp_lib_table.cpp index 0d5d6da677..63d75a83f0 100644 --- a/common/fp_lib_table.cpp +++ b/common/fp_lib_table.cpp @@ -33,7 +33,7 @@ #include #include #include -#include +#include #include diff --git a/common/hash_eda.cpp b/common/hash_eda.cpp index f7dd6ffc6a..8d920508c1 100644 --- a/common/hash_eda.cpp +++ b/common/hash_eda.cpp @@ -25,10 +25,10 @@ #include -#include +#include #include #include -#include +#include #include diff --git a/common/kiway.cpp b/common/kiway.cpp index fdaf174ba3..9a5fc9a042 100644 --- a/common/kiway.cpp +++ b/common/kiway.cpp @@ -224,7 +224,8 @@ KIFACE* KIWAY::KiFACE( FACE_T aFaceId, bool doLoad ) // here and catching it in the KiCad launcher resolves the crash issue. See bug // report https://bugs.launchpad.net/kicad/+bug/1577786. - msg.Printf( _( "Failed to load kiface library \"%s\"." ), dname ); + msg.Printf( _( "Failed to load kiface library \"%s\"." ), + dname ); THROW_IO_ERROR( msg ); } else if( ( addr = dso.GetSymbol( wxT( KIFACE_INSTANCE_NAME_AND_VERSION ) ) ) == NULL ) @@ -232,9 +233,9 @@ KIFACE* KIWAY::KiFACE( FACE_T aFaceId, bool doLoad ) // Failure: error reporting UI was done via wxLogSysError(). // No further reporting required here. Assume the same thing applies here as // above with the Load() call. This has not been tested. - msg.Printf( - _( "Could not read instance name and version symbol form kiface library \"%s\"." ), - dname ); + msg.Printf( _( "Could not read instance name and version symbol form kiface " + "library \"%s\"." ), + dname ); THROW_IO_ERROR( msg ); } else @@ -382,7 +383,7 @@ KIWAY_PLAYER* KIWAY::Player( FRAME_T aFrameType, bool doCreate, wxTopLevelWindow { DisplayErrorMessage( NULL, _( "Error loading editor" ), ioe.What() ); } - catch ( const std::exception& e) + catch( const std::exception& e) { DisplayErrorMessage( NULL, _( "Error loading editor" ), e.what() ); } diff --git a/common/widgets/net_selector.cpp b/common/widgets/net_selector.cpp index 49b6dec31f..65dbce512e 100644 --- a/common/widgets/net_selector.cpp +++ b/common/widgets/net_selector.cpp @@ -26,7 +26,7 @@ #include -#include +#include #include #include #include diff --git a/cvpcb/display_footprints_frame.cpp b/cvpcb/display_footprints_frame.cpp index 8f4b401f26..f40d50dc75 100644 --- a/cvpcb/display_footprints_frame.cpp +++ b/cvpcb/display_footprints_frame.cpp @@ -24,8 +24,8 @@ */ #include -#include -#include +#include +#include #include #include #include diff --git a/include/board_design_settings.h b/include/board_design_settings.h index 263fcb8f52..4d0301c2db 100644 --- a/include/board_design_settings.h +++ b/include/board_design_settings.h @@ -25,7 +25,7 @@ #ifndef BOARD_DESIGN_SETTINGS_H_ #define BOARD_DESIGN_SETTINGS_H_ -#include +#include #include #include #include diff --git a/include/pcb_base_frame.h b/include/pcb_base_frame.h index 920ffe8856..af1228d960 100644 --- a/include/pcb_base_frame.h +++ b/include/pcb_base_frame.h @@ -33,7 +33,7 @@ #include -#include +#include #include #include #include diff --git a/include/class_pcb_group.h b/include/pcb_group.h similarity index 100% rename from include/class_pcb_group.h rename to include/pcb_group.h diff --git a/pcbnew/array_creator.h b/pcbnew/array_creator.h index 21bc29b32a..b90b6189cc 100644 --- a/pcbnew/array_creator.h +++ b/pcbnew/array_creator.h @@ -27,8 +27,8 @@ #include -#include -#include +#include +#include #include #include diff --git a/pcbnew/array_pad_name_provider.cpp b/pcbnew/array_pad_name_provider.cpp index a2a42aefe3..4297023ce6 100644 --- a/pcbnew/array_pad_name_provider.cpp +++ b/pcbnew/array_pad_name_provider.cpp @@ -23,7 +23,7 @@ #include -#include +#include ARRAY_PAD_NAME_PROVIDER::ARRAY_PAD_NAME_PROVIDER( diff --git a/pcbnew/array_pad_name_provider.h b/pcbnew/array_pad_name_provider.h index a4ac7b384a..5da5be25bf 100644 --- a/pcbnew/array_pad_name_provider.h +++ b/pcbnew/array_pad_name_provider.h @@ -26,7 +26,7 @@ #include -#include +#include /** * Simple class that sequentially provides names from an #ARRAY_OPTIONS diff --git a/pcbnew/autorouter/ar_autoplacer.cpp b/pcbnew/autorouter/ar_autoplacer.cpp index d08c5dcd43..ce84e10131 100644 --- a/pcbnew/autorouter/ar_autoplacer.cpp +++ b/pcbnew/autorouter/ar_autoplacer.cpp @@ -29,11 +29,11 @@ #include #include #include -#include -#include -#include +#include +#include +#include #include -#include +#include #include #include #include diff --git a/pcbnew/autorouter/ar_autoplacer.h b/pcbnew/autorouter/ar_autoplacer.h index 5097fa5b94..33a5012392 100644 --- a/pcbnew/autorouter/ar_autoplacer.h +++ b/pcbnew/autorouter/ar_autoplacer.h @@ -31,8 +31,8 @@ #include "ar_matrix.h" -#include -#include +#include +#include #include diff --git a/pcbnew/autorouter/ar_matrix.cpp b/pcbnew/autorouter/ar_matrix.cpp index 3c06688724..b924502414 100644 --- a/pcbnew/autorouter/ar_matrix.cpp +++ b/pcbnew/autorouter/ar_matrix.cpp @@ -31,7 +31,7 @@ #include #include -#include +#include AR_MATRIX::AR_MATRIX() { diff --git a/pcbnew/autorouter/spread_footprints.cpp b/pcbnew/autorouter/spread_footprints.cpp index 6121d6a9bb..57fce064e7 100644 --- a/pcbnew/autorouter/spread_footprints.cpp +++ b/pcbnew/autorouter/spread_footprints.cpp @@ -38,8 +38,8 @@ #include #include #include -#include -#include +#include +#include #include struct TSubRect : public CRectPlacement::TRect diff --git a/pcbnew/class_board.cpp b/pcbnew/board.cpp similarity index 99% rename from pcbnew/class_board.cpp rename to pcbnew/board.cpp index a8f1e84d80..980d3b8946 100644 --- a/pcbnew/class_board.cpp +++ b/pcbnew/board.cpp @@ -31,9 +31,9 @@ #include #include #include -#include -#include -#include +#include +#include +#include #include #include #include diff --git a/pcbnew/class_board.h b/pcbnew/board.h similarity index 99% rename from pcbnew/class_board.h rename to pcbnew/board.h index 4e327636de..725b6f6ec1 100644 --- a/pcbnew/class_board.h +++ b/pcbnew/board.h @@ -27,8 +27,8 @@ #include #include -#include -#include +#include +#include #include // Needed for stl hash extensions #include #include diff --git a/pcbnew/board_commit.cpp b/pcbnew/board_commit.cpp index 1d6eddc692..1cf7b3fecf 100644 --- a/pcbnew/board_commit.cpp +++ b/pcbnew/board_commit.cpp @@ -22,8 +22,8 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA */ -#include -#include +#include +#include #include #include #include diff --git a/pcbnew/board_connected_item.cpp b/pcbnew/board_connected_item.cpp index 7babcf4e7a..08b06bfc2d 100644 --- a/pcbnew/board_connected_item.cpp +++ b/pcbnew/board_connected_item.cpp @@ -23,7 +23,7 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA */ -#include +#include #include #include #include diff --git a/pcbnew/board_design_settings.cpp b/pcbnew/board_design_settings.cpp index 1aa4422057..334ffbaa38 100644 --- a/pcbnew/board_design_settings.cpp +++ b/pcbnew/board_design_settings.cpp @@ -22,7 +22,7 @@ */ #include -#include +#include #include #include #include diff --git a/pcbnew/board_items_to_polygon_shape_transform.cpp b/pcbnew/board_items_to_polygon_shape_transform.cpp index ac56ba05d6..ee8996a393 100644 --- a/pcbnew/board_items_to_polygon_shape_transform.cpp +++ b/pcbnew/board_items_to_polygon_shape_transform.cpp @@ -25,14 +25,14 @@ #include #include #include -#include -#include -#include +#include +#include +#include #include #include #include #include -#include +#include #include #include #include diff --git a/pcbnew/board_stackup_manager/class_board_stackup.cpp b/pcbnew/board_stackup_manager/class_board_stackup.cpp index cd5b4ac3d0..cfa294b5e1 100644 --- a/pcbnew/board_stackup_manager/class_board_stackup.cpp +++ b/pcbnew/board_stackup_manager/class_board_stackup.cpp @@ -24,7 +24,7 @@ #include #include #include -#include +#include #include // For _HKI definition #include "stackup_predefined_prms.h" diff --git a/pcbnew/board_stackup_manager/panel_board_stackup.cpp b/pcbnew/board_stackup_manager/panel_board_stackup.cpp index bdc762af14..b58225fae1 100644 --- a/pcbnew/board_stackup_manager/panel_board_stackup.cpp +++ b/pcbnew/board_stackup_manager/panel_board_stackup.cpp @@ -25,7 +25,7 @@ #include #include // arrayDim definition #include -#include +#include #include #include #include diff --git a/pcbnew/board_stackup_manager/panel_board_stackup.h b/pcbnew/board_stackup_manager/panel_board_stackup.h index 6f60dd7f7a..52a049e44f 100644 --- a/pcbnew/board_stackup_manager/panel_board_stackup.h +++ b/pcbnew/board_stackup_manager/panel_board_stackup.h @@ -26,7 +26,7 @@ #define PANEL_SETUP_BOARD_STACKUP_H -#include +#include #include #include "panel_board_stackup_base.h" diff --git a/pcbnew/build_BOM_from_board.cpp b/pcbnew/build_BOM_from_board.cpp index b3fd3fb7f7..7b30266e2e 100644 --- a/pcbnew/build_BOM_from_board.cpp +++ b/pcbnew/build_BOM_from_board.cpp @@ -30,8 +30,8 @@ #include #include #include -#include -#include +#include +#include #include /* creates a BOM list rom board diff --git a/pcbnew/class_board_item.cpp b/pcbnew/class_board_item.cpp index cf3cd8a97d..e6b23e9055 100644 --- a/pcbnew/class_board_item.cpp +++ b/pcbnew/class_board_item.cpp @@ -25,7 +25,7 @@ #include #include -#include +#include #include wxString BOARD_ITEM::ShowShape( PCB_SHAPE_TYPE_T aShape ) diff --git a/pcbnew/class_marker_pcb.cpp b/pcbnew/class_marker_pcb.cpp index e33fc72399..40f4464e38 100644 --- a/pcbnew/class_marker_pcb.cpp +++ b/pcbnew/class_marker_pcb.cpp @@ -26,7 +26,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/pcbnew/collectors.cpp b/pcbnew/collectors.cpp index fc76e3da3e..b5282fe108 100644 --- a/pcbnew/collectors.cpp +++ b/pcbnew/collectors.cpp @@ -25,15 +25,15 @@ #include #include // class BOARD_ITEM -#include +#include #include -#include -#include +#include +#include #include #include #include #include -#include +#include #include #include // for KiROUND diff --git a/pcbnew/connectivity/connectivity_algo.h b/pcbnew/connectivity/connectivity_algo.h index 52cb683afa..232b2680f7 100644 --- a/pcbnew/connectivity/connectivity_algo.h +++ b/pcbnew/connectivity/connectivity_algo.h @@ -29,9 +29,9 @@ #ifndef __CONNECTIVITY_ALGO_H #define __CONNECTIVITY_ALGO_H -#include -#include -#include +#include +#include +#include #include #include diff --git a/pcbnew/connectivity/connectivity_items.h b/pcbnew/connectivity/connectivity_items.h index 02c354927c..0966a29b6d 100644 --- a/pcbnew/connectivity/connectivity_items.h +++ b/pcbnew/connectivity/connectivity_items.h @@ -29,10 +29,10 @@ #ifndef PCBNEW_CONNECTIVITY_CONNECTIVITY_ITEMS_H_ #define PCBNEW_CONNECTIVITY_CONNECTIVITY_ITEMS_H_ -#include -#include -#include -#include +#include +#include +#include +#include #include #include diff --git a/pcbnew/connectivity/from_to_cache.cpp b/pcbnew/connectivity/from_to_cache.cpp index ee7c25fdfd..1b18541321 100644 --- a/pcbnew/connectivity/from_to_cache.cpp +++ b/pcbnew/connectivity/from_to_cache.cpp @@ -20,8 +20,8 @@ #include #include #include -#include -#include +#include +#include #include #include diff --git a/pcbnew/convert_drawsegment_list_to_polygon.cpp b/pcbnew/convert_drawsegment_list_to_polygon.cpp index 8fcaae62c3..cd313d67a2 100644 --- a/pcbnew/convert_drawsegment_list_to_polygon.cpp +++ b/pcbnew/convert_drawsegment_list_to_polygon.cpp @@ -34,7 +34,7 @@ #include #include -#include +#include #include #include #include @@ -788,7 +788,7 @@ bool ConvertOutlineToPolygon( std::vector& aSegList, SHAPE_POLY_SET& return !selfIntersecting; } -#include +#include #include /* This function is used to extract a board outlines (3D view, automatic zones build ...) diff --git a/pcbnew/cross-probing.cpp b/pcbnew/cross-probing.cpp index 1af21dbdaf..4fcdc24cf5 100644 --- a/pcbnew/cross-probing.cpp +++ b/pcbnew/cross-probing.cpp @@ -31,9 +31,9 @@ * Note: these ports must be enabled for firewall protection */ -#include -#include -#include +#include +#include +#include #include #include #include diff --git a/pcbnew/dialogs/dialog_board_reannotate.h b/pcbnew/dialogs/dialog_board_reannotate.h index 1c94ce6390..12a243f32a 100644 --- a/pcbnew/dialogs/dialog_board_reannotate.h +++ b/pcbnew/dialogs/dialog_board_reannotate.h @@ -26,8 +26,8 @@ #ifndef DIALOG_BOARD_REANNOTATE_H_ #define DIALOG_BOARD_REANNOTATE_H_ -#include -#include +#include +#include #include #include #include diff --git a/pcbnew/dialogs/dialog_board_statistics.h b/pcbnew/dialogs/dialog_board_statistics.h index 77669a5fcd..00deb2805e 100644 --- a/pcbnew/dialogs/dialog_board_statistics.h +++ b/pcbnew/dialogs/dialog_board_statistics.h @@ -28,8 +28,8 @@ #include -#include -#include +#include +#include #include #include #include diff --git a/pcbnew/dialogs/dialog_copper_zones.cpp b/pcbnew/dialogs/dialog_copper_zones.cpp index d0a5bed6f1..66e5884589 100644 --- a/pcbnew/dialogs/dialog_copper_zones.cpp +++ b/pcbnew/dialogs/dialog_copper_zones.cpp @@ -31,7 +31,7 @@ #include #include #include -#include +#include #include #include diff --git a/pcbnew/dialogs/dialog_create_array.cpp b/pcbnew/dialogs/dialog_create_array.cpp index 8e88cb0c5d..d99b7aa92d 100644 --- a/pcbnew/dialogs/dialog_create_array.cpp +++ b/pcbnew/dialogs/dialog_create_array.cpp @@ -27,8 +27,8 @@ #include -#include -#include +#include +#include #include #include diff --git a/pcbnew/dialogs/dialog_dimension_properties.cpp b/pcbnew/dialogs/dialog_dimension_properties.cpp index eb5eafee78..19988e59d8 100644 --- a/pcbnew/dialogs/dialog_dimension_properties.cpp +++ b/pcbnew/dialogs/dialog_dimension_properties.cpp @@ -18,7 +18,7 @@ * with this program. If not, see . */ -#include +#include #include #include #include diff --git a/pcbnew/dialogs/dialog_drc.h b/pcbnew/dialogs/dialog_drc.h index f6d18de039..c6d06fd355 100644 --- a/pcbnew/dialogs/dialog_drc.h +++ b/pcbnew/dialogs/dialog_drc.h @@ -30,7 +30,7 @@ #include #include #include -#include +#include #include #include diff --git a/pcbnew/dialogs/dialog_edit_footprint_for_fp_editor.cpp b/pcbnew/dialogs/dialog_edit_footprint_for_fp_editor.cpp index 7f03e8a1f1..2c09179a01 100644 --- a/pcbnew/dialogs/dialog_edit_footprint_for_fp_editor.cpp +++ b/pcbnew/dialogs/dialog_edit_footprint_for_fp_editor.cpp @@ -35,7 +35,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/pcbnew/dialogs/dialog_edit_footprint_for_fp_editor.h b/pcbnew/dialogs/dialog_edit_footprint_for_fp_editor.h index 43f6562b1b..d9eb9c460e 100644 --- a/pcbnew/dialogs/dialog_edit_footprint_for_fp_editor.h +++ b/pcbnew/dialogs/dialog_edit_footprint_for_fp_editor.h @@ -28,7 +28,7 @@ #include #include #include -#include +#include #include diff --git a/pcbnew/dialogs/dialog_exchange_footprints.cpp b/pcbnew/dialogs/dialog_exchange_footprints.cpp index 706a67aea6..118c5358bb 100644 --- a/pcbnew/dialogs/dialog_exchange_footprints.cpp +++ b/pcbnew/dialogs/dialog_exchange_footprints.cpp @@ -26,8 +26,8 @@ #include #include -#include -#include +#include +#include #include #include #include diff --git a/pcbnew/dialogs/dialog_export_idf.cpp b/pcbnew/dialogs/dialog_export_idf.cpp index 9bc8769bdc..a440664440 100644 --- a/pcbnew/dialogs/dialog_export_idf.cpp +++ b/pcbnew/dialogs/dialog_export_idf.cpp @@ -23,7 +23,7 @@ */ #include -#include +#include #include #include #include diff --git a/pcbnew/dialogs/dialog_export_step.cpp b/pcbnew/dialogs/dialog_export_step.cpp index 91ace21248..1a74300520 100644 --- a/pcbnew/dialogs/dialog_export_step.cpp +++ b/pcbnew/dialogs/dialog_export_step.cpp @@ -30,7 +30,7 @@ #include "kiface_i.h" #include "confirm.h" #include "reporter.h" -#include "class_board.h" +#include "board.h" #include "dialog_export_step_base.h" #include #include diff --git a/pcbnew/dialogs/dialog_export_svg.cpp b/pcbnew/dialogs/dialog_export_svg.cpp index fceada9fb7..7e867a4c37 100644 --- a/pcbnew/dialogs/dialog_export_svg.cpp +++ b/pcbnew/dialogs/dialog_export_svg.cpp @@ -31,7 +31,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/pcbnew/dialogs/dialog_export_vrml.cpp b/pcbnew/dialogs/dialog_export_vrml.cpp index e1f1b3c1cb..8684e43d6b 100644 --- a/pcbnew/dialogs/dialog_export_vrml.cpp +++ b/pcbnew/dialogs/dialog_export_vrml.cpp @@ -28,7 +28,7 @@ */ #include -#include +#include #include #include #include diff --git a/pcbnew/dialogs/dialog_find.cpp b/pcbnew/dialogs/dialog_find.cpp index bfe0b07751..96f1f65da9 100644 --- a/pcbnew/dialogs/dialog_find.cpp +++ b/pcbnew/dialogs/dialog_find.cpp @@ -23,9 +23,9 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA */ -#include +#include #include -#include +#include #include #include #include diff --git a/pcbnew/dialogs/dialog_footprint_properties.cpp b/pcbnew/dialogs/dialog_footprint_properties.cpp index 487b98e20f..3d31f5383d 100644 --- a/pcbnew/dialogs/dialog_footprint_properties.cpp +++ b/pcbnew/dialogs/dialog_footprint_properties.cpp @@ -28,7 +28,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/pcbnew/dialogs/dialog_footprint_properties.h b/pcbnew/dialogs/dialog_footprint_properties.h index 92b32bc5c8..704387b760 100644 --- a/pcbnew/dialogs/dialog_footprint_properties.h +++ b/pcbnew/dialogs/dialog_footprint_properties.h @@ -30,7 +30,7 @@ #include #include #include -#include +#include #include diff --git a/pcbnew/dialogs/dialog_gencad_export_options.cpp b/pcbnew/dialogs/dialog_gencad_export_options.cpp index 65f62feb57..d718f6276d 100644 --- a/pcbnew/dialogs/dialog_gencad_export_options.cpp +++ b/pcbnew/dialogs/dialog_gencad_export_options.cpp @@ -27,7 +27,7 @@ #include "dialog_gencad_export_options.h" #include -#include +#include #include #include #include diff --git a/pcbnew/dialogs/dialog_gendrill.cpp b/pcbnew/dialogs/dialog_gendrill.cpp index 1cf75c1091..b543c4dc3f 100644 --- a/pcbnew/dialogs/dialog_gendrill.cpp +++ b/pcbnew/dialogs/dialog_gendrill.cpp @@ -30,9 +30,9 @@ #include #include #include -#include -#include -#include +#include +#include +#include #include #include #include diff --git a/pcbnew/dialogs/dialog_global_deletion.cpp b/pcbnew/dialogs/dialog_global_deletion.cpp index de4d49b0bb..6a8799a2fc 100644 --- a/pcbnew/dialogs/dialog_global_deletion.cpp +++ b/pcbnew/dialogs/dialog_global_deletion.cpp @@ -29,9 +29,9 @@ using namespace std::placeholders; #include #include #include -#include -#include -#include +#include +#include +#include #include #include #include diff --git a/pcbnew/dialogs/dialog_global_edit_text_and_graphics.cpp b/pcbnew/dialogs/dialog_global_edit_text_and_graphics.cpp index e3bf4d772c..11ad023053 100644 --- a/pcbnew/dialogs/dialog_global_edit_text_and_graphics.cpp +++ b/pcbnew/dialogs/dialog_global_edit_text_and_graphics.cpp @@ -26,8 +26,8 @@ #include #include #include -#include -#include +#include +#include #include #include #include diff --git a/pcbnew/dialogs/dialog_global_edit_tracks_and_vias.cpp b/pcbnew/dialogs/dialog_global_edit_tracks_and_vias.cpp index c44a889b34..7b6fb233e5 100644 --- a/pcbnew/dialogs/dialog_global_edit_tracks_and_vias.cpp +++ b/pcbnew/dialogs/dialog_global_edit_tracks_and_vias.cpp @@ -23,8 +23,8 @@ */ #include -#include -#include +#include +#include #include #include #include diff --git a/pcbnew/dialogs/dialog_import_settings.cpp b/pcbnew/dialogs/dialog_import_settings.cpp index 678f3e8a26..550ee692ee 100644 --- a/pcbnew/dialogs/dialog_import_settings.cpp +++ b/pcbnew/dialogs/dialog_import_settings.cpp @@ -23,7 +23,7 @@ #include #include -#include +#include #include #include diff --git a/pcbnew/dialogs/dialog_net_inspector.cpp b/pcbnew/dialogs/dialog_net_inspector.cpp index ad57c10cdd..f838353476 100644 --- a/pcbnew/dialogs/dialog_net_inspector.cpp +++ b/pcbnew/dialogs/dialog_net_inspector.cpp @@ -25,8 +25,8 @@ #include #include -#include -#include +#include +#include #include #include #include diff --git a/pcbnew/dialogs/dialog_netlist.cpp b/pcbnew/dialogs/dialog_netlist.cpp index 49bc9e0b6f..98814b73bf 100644 --- a/pcbnew/dialogs/dialog_netlist.cpp +++ b/pcbnew/dialogs/dialog_netlist.cpp @@ -31,7 +31,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/pcbnew/dialogs/dialog_pad_basicshapes_properties.cpp b/pcbnew/dialogs/dialog_pad_basicshapes_properties.cpp index c652a7db0f..ca0c86c255 100644 --- a/pcbnew/dialogs/dialog_pad_basicshapes_properties.cpp +++ b/pcbnew/dialogs/dialog_pad_basicshapes_properties.cpp @@ -34,7 +34,7 @@ #include #include #include -#include +#include #include // for KiROUND #include diff --git a/pcbnew/dialogs/dialog_pad_properties.cpp b/pcbnew/dialogs/dialog_pad_properties.cpp index e9d7d33d93..01f83ee71c 100644 --- a/pcbnew/dialogs/dialog_pad_properties.cpp +++ b/pcbnew/dialogs/dialog_pad_properties.cpp @@ -27,8 +27,8 @@ #include #include #include -#include -#include +#include +#include #include #include // for enum RECT_CHAMFER_POSITIONS definition #include diff --git a/pcbnew/dialogs/dialog_pad_properties.h b/pcbnew/dialogs/dialog_pad_properties.h index 282cddad61..2b1ed468ad 100644 --- a/pcbnew/dialogs/dialog_pad_properties.h +++ b/pcbnew/dialogs/dialog_pad_properties.h @@ -31,8 +31,8 @@ #include #include #include -#include -#include +#include +#include #include #include #include diff --git a/pcbnew/dialogs/dialog_plot.cpp b/pcbnew/dialogs/dialog_plot.cpp index 66275a147a..d888744391 100644 --- a/pcbnew/dialogs/dialog_plot.cpp +++ b/pcbnew/dialogs/dialog_plot.cpp @@ -34,7 +34,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/pcbnew/dialogs/dialog_plot.h b/pcbnew/dialogs/dialog_plot.h index bd2f5cba29..9963d08aa8 100644 --- a/pcbnew/dialogs/dialog_plot.h +++ b/pcbnew/dialogs/dialog_plot.h @@ -25,7 +25,7 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA */ -#include +#include #include #include #include diff --git a/pcbnew/dialogs/dialog_print_pcbnew.cpp b/pcbnew/dialogs/dialog_print_pcbnew.cpp index 4ae9e1d3b6..d085afc1c1 100644 --- a/pcbnew/dialogs/dialog_print_pcbnew.cpp +++ b/pcbnew/dialogs/dialog_print_pcbnew.cpp @@ -29,7 +29,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/pcbnew/dialogs/dialog_push_pad_properties.cpp b/pcbnew/dialogs/dialog_push_pad_properties.cpp index 284a299c26..254d3053e3 100644 --- a/pcbnew/dialogs/dialog_push_pad_properties.cpp +++ b/pcbnew/dialogs/dialog_push_pad_properties.cpp @@ -24,7 +24,7 @@ #include -#include +#include #include #include diff --git a/pcbnew/dialogs/dialog_swap_layers.cpp b/pcbnew/dialogs/dialog_swap_layers.cpp index 90cf6b4a4d..b917db62d4 100644 --- a/pcbnew/dialogs/dialog_swap_layers.cpp +++ b/pcbnew/dialogs/dialog_swap_layers.cpp @@ -23,10 +23,10 @@ #include #include -#include +#include #include #include -#include +#include #include "dialog_swap_layers.h" diff --git a/pcbnew/dialogs/dialog_target_properties.cpp b/pcbnew/dialogs/dialog_target_properties.cpp index 4dbb6af22a..e71660ca65 100644 --- a/pcbnew/dialogs/dialog_target_properties.cpp +++ b/pcbnew/dialogs/dialog_target_properties.cpp @@ -27,7 +27,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/pcbnew/dialogs/dialog_text_properties.cpp b/pcbnew/dialogs/dialog_text_properties.cpp index fface5dbcf..ddfe0fd49b 100644 --- a/pcbnew/dialogs/dialog_text_properties.cpp +++ b/pcbnew/dialogs/dialog_text_properties.cpp @@ -26,8 +26,8 @@ #include #include #include -#include -#include +#include +#include #include #include #include diff --git a/pcbnew/dialogs/dialog_track_via_properties.cpp b/pcbnew/dialogs/dialog_track_via_properties.cpp index 368f6b48c1..36762ea236 100644 --- a/pcbnew/dialogs/dialog_track_via_properties.cpp +++ b/pcbnew/dialogs/dialog_track_via_properties.cpp @@ -26,7 +26,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/pcbnew/dialogs/dialog_unused_pad_layers.cpp b/pcbnew/dialogs/dialog_unused_pad_layers.cpp index 3db6b39eb9..54d6336f4f 100644 --- a/pcbnew/dialogs/dialog_unused_pad_layers.cpp +++ b/pcbnew/dialogs/dialog_unused_pad_layers.cpp @@ -26,8 +26,8 @@ #include #include -#include -#include +#include +#include #include #include diff --git a/pcbnew/dialogs/dialog_update_pcb.cpp b/pcbnew/dialogs/dialog_update_pcb.cpp index 9db8bd9341..94729a265d 100644 --- a/pcbnew/dialogs/dialog_update_pcb.cpp +++ b/pcbnew/dialogs/dialog_update_pcb.cpp @@ -36,7 +36,7 @@ #include #include #include -#include +#include #include using namespace std::placeholders; diff --git a/pcbnew/dialogs/panel_edit_options.cpp b/pcbnew/dialogs/panel_edit_options.cpp index 177b80373e..d9fb8fb462 100644 --- a/pcbnew/dialogs/panel_edit_options.cpp +++ b/pcbnew/dialogs/panel_edit_options.cpp @@ -23,7 +23,7 @@ */ #include -#include +#include #include #include #include diff --git a/pcbnew/dialogs/panel_modedit_color_settings.cpp b/pcbnew/dialogs/panel_modedit_color_settings.cpp index 259073e12c..358c6b4686 100644 --- a/pcbnew/dialogs/panel_modedit_color_settings.cpp +++ b/pcbnew/dialogs/panel_modedit_color_settings.cpp @@ -20,7 +20,7 @@ #include -#include +#include #include #include #include diff --git a/pcbnew/dialogs/panel_pcbnew_color_settings.cpp b/pcbnew/dialogs/panel_pcbnew_color_settings.cpp index a1d0c7d26f..55f50909c8 100644 --- a/pcbnew/dialogs/panel_pcbnew_color_settings.cpp +++ b/pcbnew/dialogs/panel_pcbnew_color_settings.cpp @@ -20,7 +20,7 @@ #include -#include +#include #include #include #include @@ -32,7 +32,7 @@ #include #include #include -#include +#include #include diff --git a/pcbnew/dialogs/panel_pcbnew_display_origin.cpp b/pcbnew/dialogs/panel_pcbnew_display_origin.cpp index ca4081ebd0..7aaa7b6f3c 100644 --- a/pcbnew/dialogs/panel_pcbnew_display_origin.cpp +++ b/pcbnew/dialogs/panel_pcbnew_display_origin.cpp @@ -23,7 +23,7 @@ */ #include -#include +#include #include #include #include diff --git a/pcbnew/dialogs/panel_setup_feature_constraints.cpp b/pcbnew/dialogs/panel_setup_feature_constraints.cpp index e0d698e299..f73f0160c3 100644 --- a/pcbnew/dialogs/panel_setup_feature_constraints.cpp +++ b/pcbnew/dialogs/panel_setup_feature_constraints.cpp @@ -22,7 +22,7 @@ */ #include -#include // for BOARD +#include // for BOARD #include // for IU_PER_MM #include #include diff --git a/pcbnew/dialogs/panel_setup_layers.cpp b/pcbnew/dialogs/panel_setup_layers.cpp index d16f8a35da..e26f8dbfbb 100644 --- a/pcbnew/dialogs/panel_setup_layers.cpp +++ b/pcbnew/dialogs/panel_setup_layers.cpp @@ -28,7 +28,7 @@ #include #include #include -#include +#include #include #include diff --git a/pcbnew/dialogs/panel_setup_mask_and_paste.h b/pcbnew/dialogs/panel_setup_mask_and_paste.h index a400be1dfe..7ccb8fe9fa 100644 --- a/pcbnew/dialogs/panel_setup_mask_and_paste.h +++ b/pcbnew/dialogs/panel_setup_mask_and_paste.h @@ -25,7 +25,7 @@ #ifndef PANEL_SETUP_DEFAULT_CLEARANCES_H #define PANEL_SETUP_DEFAULT_CLEARANCES_H -#include +#include #include #include #include diff --git a/pcbnew/dialogs/panel_setup_rules.cpp b/pcbnew/dialogs/panel_setup_rules.cpp index 16cbc4384a..ec2502b992 100644 --- a/pcbnew/dialogs/panel_setup_rules.cpp +++ b/pcbnew/dialogs/panel_setup_rules.cpp @@ -25,7 +25,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/pcbnew/dialogs/panel_setup_text_and_graphics.h b/pcbnew/dialogs/panel_setup_text_and_graphics.h index 29b88457a6..d62b30d191 100644 --- a/pcbnew/dialogs/panel_setup_text_and_graphics.h +++ b/pcbnew/dialogs/panel_setup_text_and_graphics.h @@ -25,7 +25,7 @@ #ifndef PANEL_SETUP_TEXT_AND_GRAPHICS_H #define PANEL_SETUP_TEXT_AND_GRAPHICS_H -#include +#include #include #include diff --git a/pcbnew/dialogs/panel_setup_tracks_and_vias.h b/pcbnew/dialogs/panel_setup_tracks_and_vias.h index 22e3220a47..c2e4859d2e 100644 --- a/pcbnew/dialogs/panel_setup_tracks_and_vias.h +++ b/pcbnew/dialogs/panel_setup_tracks_and_vias.h @@ -25,7 +25,7 @@ #ifndef PANEL_SETUP_TRACKS_AND_VIAS_H #define PANEL_SETUP_TRACKS_AND_VIAS_H -#include +#include #include #include diff --git a/pcbnew/dimension.cpp b/pcbnew/dimension.cpp index 8b7d1d67f5..8828b34cde 100644 --- a/pcbnew/dimension.cpp +++ b/pcbnew/dimension.cpp @@ -27,7 +27,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/pcbnew/drc/drc_engine.cpp b/pcbnew/drc/drc_engine.cpp index f2920b5bdf..62be0178d7 100644 --- a/pcbnew/drc/drc_engine.cpp +++ b/pcbnew/drc/drc_engine.cpp @@ -30,7 +30,7 @@ #include #include #include -#include +#include void drcPrintDebugMessage( int level, const wxString& msg, const char *function, int line ) { diff --git a/pcbnew/drc/drc_item.cpp b/pcbnew/drc/drc_item.cpp index 06817f50c0..733718bdd6 100644 --- a/pcbnew/drc/drc_item.cpp +++ b/pcbnew/drc/drc_item.cpp @@ -26,7 +26,7 @@ #include "wx/html/m_templ.h" #include "wx/html/styleparams.h" #include -#include +#include // These, being statically-defined, require specialized I18N handling. We continue to diff --git a/pcbnew/drc/drc_results_provider.h b/pcbnew/drc/drc_results_provider.h index 62bb51a068..2bd688ae03 100644 --- a/pcbnew/drc/drc_results_provider.h +++ b/pcbnew/drc/drc_results_provider.h @@ -25,7 +25,7 @@ #ifndef DRC_PROVIDER__H #define DRC_PROVIDER__H -#include +#include #include #include #include diff --git a/pcbnew/drc/drc_rtree.h b/pcbnew/drc/drc_rtree.h index 98e5719f6e..e074711670 100644 --- a/pcbnew/drc/drc_rtree.h +++ b/pcbnew/drc/drc_rtree.h @@ -27,7 +27,7 @@ #include #include -#include +#include #include #include #include diff --git a/pcbnew/drc/drc_rule.cpp b/pcbnew/drc/drc_rule.cpp index 7419d959fa..92ba26ffa3 100644 --- a/pcbnew/drc/drc_rule.cpp +++ b/pcbnew/drc/drc_rule.cpp @@ -22,7 +22,7 @@ */ -#include +#include #include #include #include diff --git a/pcbnew/drc/drc_rule_parser.cpp b/pcbnew/drc/drc_rule_parser.cpp index aaeea65c2f..5c61ef228f 100644 --- a/pcbnew/drc/drc_rule_parser.cpp +++ b/pcbnew/drc/drc_rule_parser.cpp @@ -22,7 +22,7 @@ */ -#include +#include #include #include #include diff --git a/pcbnew/drc/drc_test_provider.cpp b/pcbnew/drc/drc_test_provider.cpp index df67d8b402..3ca97382fc 100644 --- a/pcbnew/drc/drc_test_provider.cpp +++ b/pcbnew/drc/drc_test_provider.cpp @@ -24,9 +24,9 @@ #include #include #include -#include -#include -#include +#include +#include +#include #include #include diff --git a/pcbnew/drc/drc_test_provider.h b/pcbnew/drc/drc_test_provider.h index 2d92db9c81..731066dc24 100644 --- a/pcbnew/drc/drc_test_provider.h +++ b/pcbnew/drc/drc_test_provider.h @@ -25,7 +25,7 @@ #ifndef DRC_TEST_PROVIDER__H #define DRC_TEST_PROVIDER__H -#include +#include #include #include diff --git a/pcbnew/drc/drc_test_provider_annulus.cpp b/pcbnew/drc/drc_test_provider_annulus.cpp index 23da485703..def238a849 100644 --- a/pcbnew/drc/drc_test_provider_annulus.cpp +++ b/pcbnew/drc/drc_test_provider_annulus.cpp @@ -22,7 +22,7 @@ */ #include -#include +#include #include #include #include diff --git a/pcbnew/drc/drc_test_provider_connectivity.cpp b/pcbnew/drc/drc_test_provider_connectivity.cpp index f67235c144..7563c4ff43 100644 --- a/pcbnew/drc/drc_test_provider_connectivity.cpp +++ b/pcbnew/drc/drc_test_provider_connectivity.cpp @@ -21,7 +21,7 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA */ -#include +#include #include #include diff --git a/pcbnew/drc/drc_test_provider_copper_clearance.cpp b/pcbnew/drc/drc_test_provider_copper_clearance.cpp index 1f5bff74f4..9ad84f77e7 100644 --- a/pcbnew/drc/drc_test_provider_copper_clearance.cpp +++ b/pcbnew/drc/drc_test_provider_copper_clearance.cpp @@ -22,10 +22,10 @@ */ #include -#include +#include #include -#include -#include +#include +#include #include #include diff --git a/pcbnew/drc/drc_test_provider_diff_pair_coupling.cpp b/pcbnew/drc/drc_test_provider_diff_pair_coupling.cpp index 6687eea81a..b212d91be5 100644 --- a/pcbnew/drc/drc_test_provider_diff_pair_coupling.cpp +++ b/pcbnew/drc/drc_test_provider_diff_pair_coupling.cpp @@ -19,8 +19,8 @@ #include -#include -#include +#include +#include #include #include diff --git a/pcbnew/drc/drc_test_provider_hole_clearance.cpp b/pcbnew/drc/drc_test_provider_hole_clearance.cpp index 506cd2006e..0f7c6d7f79 100644 --- a/pcbnew/drc/drc_test_provider_hole_clearance.cpp +++ b/pcbnew/drc/drc_test_provider_hole_clearance.cpp @@ -22,8 +22,8 @@ */ #include -#include -#include +#include +#include #include #include #include diff --git a/pcbnew/drc/drc_test_provider_hole_size.cpp b/pcbnew/drc/drc_test_provider_hole_size.cpp index 5f871da259..86e451e220 100644 --- a/pcbnew/drc/drc_test_provider_hole_size.cpp +++ b/pcbnew/drc/drc_test_provider_hole_size.cpp @@ -21,8 +21,8 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA */ -#include -#include +#include +#include #include #include #include diff --git a/pcbnew/drc/drc_test_provider_lvs.cpp b/pcbnew/drc/drc_test_provider_lvs.cpp index 7e3656c076..31cbe19cb5 100644 --- a/pcbnew/drc/drc_test_provider_lvs.cpp +++ b/pcbnew/drc/drc_test_provider_lvs.cpp @@ -21,7 +21,7 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA */ -#include +#include #include #include #include diff --git a/pcbnew/drc/drc_test_provider_matched_length.cpp b/pcbnew/drc/drc_test_provider_matched_length.cpp index 9958149c7e..504ffe9ace 100644 --- a/pcbnew/drc/drc_test_provider_matched_length.cpp +++ b/pcbnew/drc/drc_test_provider_matched_length.cpp @@ -18,9 +18,9 @@ */ #include -#include -#include -#include +#include +#include +#include #include #include diff --git a/pcbnew/drc/drc_test_provider_silk_clearance.cpp b/pcbnew/drc/drc_test_provider_silk_clearance.cpp index b4760efbf8..7ec6d1c7e4 100644 --- a/pcbnew/drc/drc_test_provider_silk_clearance.cpp +++ b/pcbnew/drc/drc_test_provider_silk_clearance.cpp @@ -22,7 +22,7 @@ */ #include -#include +#include #include #include diff --git a/pcbnew/drc/drc_test_provider_silk_to_mask.cpp b/pcbnew/drc/drc_test_provider_silk_to_mask.cpp index 087be042ec..e11266e039 100644 --- a/pcbnew/drc/drc_test_provider_silk_to_mask.cpp +++ b/pcbnew/drc/drc_test_provider_silk_to_mask.cpp @@ -22,7 +22,7 @@ */ #include -#include +#include #include #include diff --git a/pcbnew/drc/drc_test_provider_track_width.cpp b/pcbnew/drc/drc_test_provider_track_width.cpp index e4edeeae8d..a757b760f4 100644 --- a/pcbnew/drc/drc_test_provider_track_width.cpp +++ b/pcbnew/drc/drc_test_provider_track_width.cpp @@ -22,7 +22,7 @@ */ //#include -#include +#include #include #include #include diff --git a/pcbnew/drc/drc_test_provider_via_diameter.cpp b/pcbnew/drc/drc_test_provider_via_diameter.cpp index c4be95c0f4..778ac25ef1 100644 --- a/pcbnew/drc/drc_test_provider_via_diameter.cpp +++ b/pcbnew/drc/drc_test_provider_via_diameter.cpp @@ -21,7 +21,7 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA */ -#include +#include #include #include #include diff --git a/pcbnew/edit.cpp b/pcbnew/edit.cpp index 1f7e4ff132..5c1b582956 100644 --- a/pcbnew/edit.cpp +++ b/pcbnew/edit.cpp @@ -30,9 +30,9 @@ #include #include #include -#include -#include -#include +#include +#include +#include #include #include #include diff --git a/pcbnew/edit_track_width.cpp b/pcbnew/edit_track_width.cpp index 056a6d051e..b6d60ca87d 100644 --- a/pcbnew/edit_track_width.cpp +++ b/pcbnew/edit_track_width.cpp @@ -25,7 +25,7 @@ #include #include #include -#include +#include #include #include diff --git a/pcbnew/exporters/export_d356.cpp b/pcbnew/exporters/export_d356.cpp index 04e590f4e3..514ff9359b 100644 --- a/pcbnew/exporters/export_d356.cpp +++ b/pcbnew/exporters/export_d356.cpp @@ -37,9 +37,9 @@ #include #include #include -#include -#include -#include +#include +#include +#include #include #include #include // for KiROUND diff --git a/pcbnew/exporters/export_footprint_associations.cpp b/pcbnew/exporters/export_footprint_associations.cpp index 856b4b720c..861139b1c4 100644 --- a/pcbnew/exporters/export_footprint_associations.cpp +++ b/pcbnew/exporters/export_footprint_associations.cpp @@ -24,8 +24,8 @@ #include #include #include -#include -#include +#include +#include #include #include diff --git a/pcbnew/exporters/export_footprints_placefile.h b/pcbnew/exporters/export_footprints_placefile.h index 8a8203b5f1..72d7d46320 100644 --- a/pcbnew/exporters/export_footprints_placefile.h +++ b/pcbnew/exporters/export_footprints_placefile.h @@ -25,8 +25,8 @@ #define EXPORT_FOOTPRINTS_PLACEFILE_H -#include -#include +#include +#include /** * The ASCII format of the kicad place file is: diff --git a/pcbnew/exporters/export_gencad.cpp b/pcbnew/exporters/export_gencad.cpp index b694f54aec..780ee6e455 100644 --- a/pcbnew/exporters/export_gencad.cpp +++ b/pcbnew/exporters/export_gencad.cpp @@ -30,10 +30,10 @@ */ #include -#include +#include #include -#include -#include +#include +#include #include #include #include diff --git a/pcbnew/exporters/export_hyperlynx.cpp b/pcbnew/exporters/export_hyperlynx.cpp index 09dfc14212..061e5c5747 100644 --- a/pcbnew/exporters/export_hyperlynx.cpp +++ b/pcbnew/exporters/export_hyperlynx.cpp @@ -23,10 +23,10 @@ #include #include -#include +#include #include -#include -#include +#include +#include #include #include #include diff --git a/pcbnew/exporters/export_idf.cpp b/pcbnew/exporters/export_idf.cpp index 39e769dd8b..34082e1820 100644 --- a/pcbnew/exporters/export_idf.cpp +++ b/pcbnew/exporters/export_idf.cpp @@ -30,8 +30,8 @@ #include #include #include -#include -#include +#include +#include #include #include #include <3d_cache/3d_info.h> diff --git a/pcbnew/exporters/export_vrml.cpp b/pcbnew/exporters/export_vrml.cpp index 787a701589..e26520ae86 100644 --- a/pcbnew/exporters/export_vrml.cpp +++ b/pcbnew/exporters/export_vrml.cpp @@ -32,11 +32,11 @@ #include "3d_cache/3d_cache.h" #include "3d_cache/3d_info.h" -#include "class_board.h" +#include "board.h" #include "fp_shape.h" -#include "class_module.h" +#include "footprint.h" #include "pcb_text.h" -#include "class_track.h" +#include "track.h" #include "zone.h" #include "convert_to_biu.h" #include diff --git a/pcbnew/exporters/gen_drill_report_files.cpp b/pcbnew/exporters/gen_drill_report_files.cpp index 6822c7a8b6..cb9e178313 100644 --- a/pcbnew/exporters/gen_drill_report_files.cpp +++ b/pcbnew/exporters/gen_drill_report_files.cpp @@ -35,7 +35,7 @@ #include #include // for KiROUND -#include +#include #include #include diff --git a/pcbnew/exporters/gen_footprints_placefile.cpp b/pcbnew/exporters/gen_footprints_placefile.cpp index 307c45755b..9c6c49a5b4 100644 --- a/pcbnew/exporters/gen_footprints_placefile.cpp +++ b/pcbnew/exporters/gen_footprints_placefile.cpp @@ -35,8 +35,8 @@ #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 e07e2ed9eb..1940f6f61a 100644 --- a/pcbnew/exporters/gendrill_Excellon_writer.cpp +++ b/pcbnew/exporters/gendrill_Excellon_writer.cpp @@ -45,7 +45,7 @@ #include #include -#include +#include #include #include #include diff --git a/pcbnew/exporters/gendrill_file_writer_base.cpp b/pcbnew/exporters/gendrill_file_writer_base.cpp index 8501e34f47..41526b666b 100644 --- a/pcbnew/exporters/gendrill_file_writer_base.cpp +++ b/pcbnew/exporters/gendrill_file_writer_base.cpp @@ -23,9 +23,9 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA */ -#include -#include -#include +#include +#include +#include #include #include diff --git a/pcbnew/exporters/gendrill_gerber_writer.cpp b/pcbnew/exporters/gendrill_gerber_writer.cpp index bebb0ffc04..f80d8e22b3 100644 --- a/pcbnew/exporters/gendrill_gerber_writer.cpp +++ b/pcbnew/exporters/gendrill_gerber_writer.cpp @@ -34,17 +34,12 @@ #include #include #include -#include - -#include -#include - +#include +#include #include #include -#include #include #include -#include GERBER_WRITER::GERBER_WRITER( BOARD* aPcb ) @@ -58,9 +53,8 @@ GERBER_WRITER::GERBER_WRITER( BOARD* aPcb ) } -void GERBER_WRITER::CreateDrillandMapFilesSet( const wxString& aPlotDirectory, - bool aGenDrill, bool aGenMap, - REPORTER * aReporter ) +void GERBER_WRITER::CreateDrillandMapFilesSet( const wxString& aPlotDirectory, bool aGenDrill, + bool aGenMap, REPORTER* aReporter ) { // Note: In Gerber drill files, NPTH and PTH are always separate files m_merge_PTH_NPTH = false; diff --git a/pcbnew/exporters/gerber_jobfile_writer.cpp b/pcbnew/exporters/gerber_jobfile_writer.cpp index 67d100135a..a5c76217ea 100644 --- a/pcbnew/exporters/gerber_jobfile_writer.cpp +++ b/pcbnew/exporters/gerber_jobfile_writer.cpp @@ -36,9 +36,9 @@ #include #include -#include -#include -#include +#include +#include +#include #include #include diff --git a/pcbnew/exporters/gerber_placefile_writer.cpp b/pcbnew/exporters/gerber_placefile_writer.cpp index 09d97a8b6a..a996c32746 100644 --- a/pcbnew/exporters/gerber_placefile_writer.cpp +++ b/pcbnew/exporters/gerber_placefile_writer.cpp @@ -33,13 +33,13 @@ #include #include -#include +#include #include #include #include #include -#include +#include PLACEFILE_GERBER_WRITER::PLACEFILE_GERBER_WRITER( BOARD* aPcb ) diff --git a/pcbnew/files.cpp b/pcbnew/files.cpp index 703d4c6b52..0f05046ba7 100644 --- a/pcbnew/files.cpp +++ b/pcbnew/files.cpp @@ -39,7 +39,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/pcbnew/class_module.cpp b/pcbnew/footprint.cpp similarity index 99% rename from pcbnew/class_module.cpp rename to pcbnew/footprint.cpp index 21b54f58bf..0ebfc90e65 100644 --- a/pcbnew/class_module.cpp +++ b/pcbnew/footprint.cpp @@ -30,9 +30,9 @@ #include #include #include -#include +#include #include -#include +#include #include #include #include diff --git a/pcbnew/class_module.h b/pcbnew/footprint.h similarity index 100% rename from pcbnew/class_module.h rename to pcbnew/footprint.h diff --git a/pcbnew/footprint_edit_frame.cpp b/pcbnew/footprint_edit_frame.cpp index d2a2d4c0e5..3edf6be5ca 100644 --- a/pcbnew/footprint_edit_frame.cpp +++ b/pcbnew/footprint_edit_frame.cpp @@ -33,8 +33,8 @@ #include "tools/selection_tool.h" #include <3d_viewer/eda_3d_viewer.h> #include -#include -#include +#include +#include #include #include #include diff --git a/pcbnew/footprint_info_impl.cpp b/pcbnew/footprint_info_impl.cpp index e650a24f6d..459158ae25 100644 --- a/pcbnew/footprint_info_impl.cpp +++ b/pcbnew/footprint_info_impl.cpp @@ -22,7 +22,7 @@ #include -#include +#include #include #include #include diff --git a/pcbnew/footprint_libraries_utils.cpp b/pcbnew/footprint_libraries_utils.cpp index 154c5db792..12823719c5 100644 --- a/pcbnew/footprint_libraries_utils.cpp +++ b/pcbnew/footprint_libraries_utils.cpp @@ -34,8 +34,8 @@ #include #include #include -#include -#include +#include +#include #include #include #include diff --git a/pcbnew/footprint_preview_panel.cpp b/pcbnew/footprint_preview_panel.cpp index 457bdb6a75..3d4b90f723 100644 --- a/pcbnew/footprint_preview_panel.cpp +++ b/pcbnew/footprint_preview_panel.cpp @@ -24,8 +24,8 @@ #include #include "pcbnew_settings.h" -#include -#include +#include +#include #include #include #include diff --git a/pcbnew/footprint_viewer_frame.cpp b/pcbnew/footprint_viewer_frame.cpp index 7e0f1558a8..8ea0ccee01 100644 --- a/pcbnew/footprint_viewer_frame.cpp +++ b/pcbnew/footprint_viewer_frame.cpp @@ -26,8 +26,8 @@ #include <3d_viewer/eda_3d_viewer.h> #include #include -#include -#include +#include +#include #include #include #include diff --git a/pcbnew/footprint_wizard_frame.cpp b/pcbnew/footprint_wizard_frame.cpp index 0eaf28a3a0..63dff17650 100644 --- a/pcbnew/footprint_wizard_frame.cpp +++ b/pcbnew/footprint_wizard_frame.cpp @@ -31,7 +31,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/pcbnew/footprint_wizard_frame_functions.cpp b/pcbnew/footprint_wizard_frame_functions.cpp index adaf7e50e8..8c1727c689 100644 --- a/pcbnew/footprint_wizard_frame_functions.cpp +++ b/pcbnew/footprint_wizard_frame_functions.cpp @@ -26,8 +26,8 @@ #include #include -#include -#include +#include +#include #include #include diff --git a/pcbnew/fp_shape.cpp b/pcbnew/fp_shape.cpp index 4c50516c99..bce8d302fb 100644 --- a/pcbnew/fp_shape.cpp +++ b/pcbnew/fp_shape.cpp @@ -29,8 +29,8 @@ #include #include #include -#include -#include +#include +#include #include #include diff --git a/pcbnew/fp_text.cpp b/pcbnew/fp_text.cpp index 30b72d0400..a1eda8c08b 100644 --- a/pcbnew/fp_text.cpp +++ b/pcbnew/fp_text.cpp @@ -26,8 +26,8 @@ #include #include #include -#include -#include +#include +#include #include #include diff --git a/pcbnew/fp_tree_synchronizing_adapter.cpp b/pcbnew/fp_tree_synchronizing_adapter.cpp index 57cb86483d..1d766d86c8 100644 --- a/pcbnew/fp_tree_synchronizing_adapter.cpp +++ b/pcbnew/fp_tree_synchronizing_adapter.cpp @@ -28,8 +28,8 @@ #include #include #include -#include -#include +#include +#include #include #include diff --git a/pcbnew/generate_footprint_info.cpp b/pcbnew/generate_footprint_info.cpp index deac9f2266..b0a6ca5c95 100644 --- a/pcbnew/generate_footprint_info.cpp +++ b/pcbnew/generate_footprint_info.cpp @@ -20,7 +20,7 @@ #include #include -#include +#include #include diff --git a/pcbnew/graphics_cleaner.h b/pcbnew/graphics_cleaner.h index b877c51d63..7630d77356 100644 --- a/pcbnew/graphics_cleaner.h +++ b/pcbnew/graphics_cleaner.h @@ -24,7 +24,7 @@ #ifndef KICAD_GRAPHICS_CLEANER_H #define KICAD_GRAPHICS_CLEANER_H -#include +#include class MODULE; class BOARD_COMMIT; diff --git a/pcbnew/grid_layer_box_helpers.cpp b/pcbnew/grid_layer_box_helpers.cpp index b4171869e8..6977630ee3 100644 --- a/pcbnew/grid_layer_box_helpers.cpp +++ b/pcbnew/grid_layer_box_helpers.cpp @@ -23,7 +23,7 @@ #include -#include +#include #include #include #include diff --git a/pcbnew/import_gfx/dialog_import_gfx.cpp b/pcbnew/import_gfx/dialog_import_gfx.cpp index ce86254f7e..5cbc25552a 100644 --- a/pcbnew/import_gfx/dialog_import_gfx.cpp +++ b/pcbnew/import_gfx/dialog_import_gfx.cpp @@ -29,7 +29,7 @@ #include #include #include -#include +#include #include diff --git a/pcbnew/import_gfx/dxf_import_plugin.cpp b/pcbnew/import_gfx/dxf_import_plugin.cpp index f29a09b5e3..abea80299f 100644 --- a/pcbnew/import_gfx/dxf_import_plugin.cpp +++ b/pcbnew/import_gfx/dxf_import_plugin.cpp @@ -35,7 +35,7 @@ #include #include -#include +#include #include "common.h" diff --git a/pcbnew/import_gfx/graphics_importer_pcbnew.cpp b/pcbnew/import_gfx/graphics_importer_pcbnew.cpp index f19328d836..33e54ddc72 100644 --- a/pcbnew/import_gfx/graphics_importer_pcbnew.cpp +++ b/pcbnew/import_gfx/graphics_importer_pcbnew.cpp @@ -25,7 +25,7 @@ #include "graphics_importer_pcbnew.h" -#include +#include #include #include #include diff --git a/pcbnew/initpcb.cpp b/pcbnew/initpcb.cpp index 2a38c94e9b..acd897f2af 100644 --- a/pcbnew/initpcb.cpp +++ b/pcbnew/initpcb.cpp @@ -32,7 +32,7 @@ #include #include -#include +#include #include #include diff --git a/pcbnew/kicad_clipboard.cpp b/pcbnew/kicad_clipboard.cpp index 52abce879d..75217e33b5 100644 --- a/pcbnew/kicad_clipboard.cpp +++ b/pcbnew/kicad_clipboard.cpp @@ -25,8 +25,8 @@ #include #include -#include -#include +#include +#include #include #include #include diff --git a/pcbnew/kicad_clipboard.h b/pcbnew/kicad_clipboard.h index 0d4f0e870c..90bc37978e 100644 --- a/pcbnew/kicad_clipboard.h +++ b/pcbnew/kicad_clipboard.h @@ -32,7 +32,7 @@ #include #include -#include +#include #include #include #include diff --git a/pcbnew/load_select_footprint.cpp b/pcbnew/load_select_footprint.cpp index 92069f16f8..1c24b95c59 100644 --- a/pcbnew/load_select_footprint.cpp +++ b/pcbnew/load_select_footprint.cpp @@ -26,8 +26,8 @@ #include using namespace std::placeholders; -#include -#include +#include +#include #include #include #include diff --git a/pcbnew/menubar_footprint_editor.cpp b/pcbnew/menubar_footprint_editor.cpp index 5e8677810b..4ef9c65ce8 100644 --- a/pcbnew/menubar_footprint_editor.cpp +++ b/pcbnew/menubar_footprint_editor.cpp @@ -31,7 +31,7 @@ #include #include #include -#include +#include #include #include diff --git a/pcbnew/microwave/microwave_footprint.cpp b/pcbnew/microwave/microwave_footprint.cpp index b314c2e438..2222e7ea62 100644 --- a/pcbnew/microwave/microwave_footprint.cpp +++ b/pcbnew/microwave/microwave_footprint.cpp @@ -22,7 +22,7 @@ */ -#include +#include #include #include #include diff --git a/pcbnew/microwave/microwave_inductor.cpp b/pcbnew/microwave/microwave_inductor.cpp index 0fc5175213..38c3d4ee47 100644 --- a/pcbnew/microwave/microwave_inductor.cpp +++ b/pcbnew/microwave/microwave_inductor.cpp @@ -25,9 +25,9 @@ #include #include -#include +#include #include -#include +#include #include #include #include diff --git a/pcbnew/microwave/microwave_polygon.cpp b/pcbnew/microwave/microwave_polygon.cpp index 987222f2d5..f7ee2b63f4 100644 --- a/pcbnew/microwave/microwave_polygon.cpp +++ b/pcbnew/microwave/microwave_polygon.cpp @@ -36,8 +36,8 @@ #include #include #include -#include -#include +#include +#include #include #include #include diff --git a/pcbnew/microwave/microwave_tool.cpp b/pcbnew/microwave/microwave_tool.cpp index 0414411f1d..d06d020bb4 100644 --- a/pcbnew/microwave/microwave_tool.cpp +++ b/pcbnew/microwave/microwave_tool.cpp @@ -25,7 +25,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/pcbnew/netinfo_item.cpp b/pcbnew/netinfo_item.cpp index def4859013..60dd67276f 100644 --- a/pcbnew/netinfo_item.cpp +++ b/pcbnew/netinfo_item.cpp @@ -31,8 +31,8 @@ #include #include #include -#include -#include +#include +#include /*********************************************************/ diff --git a/pcbnew/netinfo_list.cpp b/pcbnew/netinfo_list.cpp index f3aa96afaf..ea440c8c39 100644 --- a/pcbnew/netinfo_list.cpp +++ b/pcbnew/netinfo_list.cpp @@ -21,10 +21,10 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA */ -#include -#include -#include -#include +#include +#include +#include +#include #include #include diff --git a/pcbnew/netlist_reader/board_netlist_updater.cpp b/pcbnew/netlist_reader/board_netlist_updater.cpp index ed084be428..da8f6bb93c 100644 --- a/pcbnew/netlist_reader/board_netlist_updater.cpp +++ b/pcbnew/netlist_reader/board_netlist_updater.cpp @@ -34,11 +34,11 @@ #include // for PAGE_INFO -#include +#include #include -#include -#include -#include +#include +#include +#include #include #include diff --git a/pcbnew/netlist_reader/netlist.cpp b/pcbnew/netlist_reader/netlist.cpp index ee34566e0f..0a67208272 100644 --- a/pcbnew/netlist_reader/netlist.cpp +++ b/pcbnew/netlist_reader/netlist.cpp @@ -37,8 +37,8 @@ using namespace std::placeholders; #include #include #include -#include -#include +#include +#include #include #include #include "board_netlist_updater.h" diff --git a/pcbnew/netlist_reader/netlist_reader.cpp b/pcbnew/netlist_reader/netlist_reader.cpp index d3a485e6f6..0afa2fd1af 100644 --- a/pcbnew/netlist_reader/netlist_reader.cpp +++ b/pcbnew/netlist_reader/netlist_reader.cpp @@ -33,7 +33,7 @@ #include "pcb_netlist.h" #include "netlist_reader.h" -#include +#include #include diff --git a/pcbnew/netlist_reader/pcb_netlist.cpp b/pcbnew/netlist_reader/pcb_netlist.cpp index 0fccea2d6c..3e8b8872fc 100644 --- a/pcbnew/netlist_reader/pcb_netlist.cpp +++ b/pcbnew/netlist_reader/pcb_netlist.cpp @@ -26,7 +26,7 @@ #include #include "pcb_netlist.h" -#include +#include int COMPONENT_NET::Format( OUTPUTFORMATTER* aOut, int aNestLevel, int aCtl ) diff --git a/pcbnew/netlist_reader/pcb_netlist.h b/pcbnew/netlist_reader/pcb_netlist.h index 1de5c463b0..99c5207d1d 100644 --- a/pcbnew/netlist_reader/pcb_netlist.h +++ b/pcbnew/netlist_reader/pcb_netlist.h @@ -30,7 +30,7 @@ #include #include -#include +#include class REPORTER; diff --git a/pcbnew/class_pad.cpp b/pcbnew/pad.cpp similarity index 99% rename from pcbnew/class_pad.cpp rename to pcbnew/pad.cpp index f79300a707..5d75320724 100644 --- a/pcbnew/class_pad.cpp +++ b/pcbnew/pad.cpp @@ -40,8 +40,8 @@ #include #include #include -#include -#include +#include +#include #include #include #include diff --git a/pcbnew/class_pad.h b/pcbnew/pad.h similarity index 100% rename from pcbnew/class_pad.h rename to pcbnew/pad.h diff --git a/pcbnew/pad_custom_shape_functions.cpp b/pcbnew/pad_custom_shape_functions.cpp index 000ee212dd..69cf9b2d27 100644 --- a/pcbnew/pad_custom_shape_functions.cpp +++ b/pcbnew/pad_custom_shape_functions.cpp @@ -27,10 +27,10 @@ * D_PAD functions specific to custom shaped pads. */ -#include +#include #include #include -#include +#include #include #include diff --git a/pcbnew/pad_naming.h b/pcbnew/pad_naming.h index de704aa1b8..cea0e18435 100644 --- a/pcbnew/pad_naming.h +++ b/pcbnew/pad_naming.h @@ -25,7 +25,7 @@ #ifndef PAD_NAMING_H #define PAD_NAMING_H -#include +#include /** * The PAD_NAMING namespace contains helper functions for common operations diff --git a/pcbnew/pcb_base_edit_frame.cpp b/pcbnew/pcb_base_edit_frame.cpp index ad886ac378..85b15baf44 100644 --- a/pcbnew/pcb_base_edit_frame.cpp +++ b/pcbnew/pcb_base_edit_frame.cpp @@ -28,7 +28,7 @@ #include #include #include -#include +#include #include "footprint_info_impl.h" #include #include diff --git a/pcbnew/pcb_base_frame.cpp b/pcbnew/pcb_base_frame.cpp index ed782805f3..6cd21b5719 100644 --- a/pcbnew/pcb_base_frame.cpp +++ b/pcbnew/pcb_base_frame.cpp @@ -35,8 +35,8 @@ #include #include #include -#include -#include +#include +#include #include #include #include diff --git a/pcbnew/pcb_draw_panel_gal.cpp b/pcbnew/pcb_draw_panel_gal.cpp index a16b6ab0f6..abc703893a 100644 --- a/pcbnew/pcb_draw_panel_gal.cpp +++ b/pcbnew/pcb_draw_panel_gal.cpp @@ -29,9 +29,9 @@ #include #include -#include -#include -#include +#include +#include +#include #include #include #include diff --git a/pcbnew/pcb_edit_frame.cpp b/pcbnew/pcb_edit_frame.cpp index d1be533aa7..042556ce43 100644 --- a/pcbnew/pcb_edit_frame.cpp +++ b/pcbnew/pcb_edit_frame.cpp @@ -38,8 +38,8 @@ #include #include #include -#include -#include +#include +#include #include #include #include diff --git a/pcbnew/pcb_expr_evaluator.cpp b/pcbnew/pcb_expr_evaluator.cpp index 4184d5204f..30343092e1 100644 --- a/pcbnew/pcb_expr_evaluator.cpp +++ b/pcbnew/pcb_expr_evaluator.cpp @@ -24,8 +24,8 @@ #include #include -#include -#include +#include +#include #include #include diff --git a/pcbnew/class_pcb_group.cpp b/pcbnew/pcb_group.cpp similarity index 99% rename from pcbnew/class_pcb_group.cpp rename to pcbnew/pcb_group.cpp index 4f39e3a6eb..f26949e8c8 100644 --- a/pcbnew/class_pcb_group.cpp +++ b/pcbnew/pcb_group.cpp @@ -22,9 +22,9 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA */ #include -#include +#include #include -#include +#include #include #include #include diff --git a/pcbnew/pcb_layer_box_selector.cpp b/pcbnew/pcb_layer_box_selector.cpp index 5474c38436..255d881d78 100644 --- a/pcbnew/pcb_layer_box_selector.cpp +++ b/pcbnew/pcb_layer_box_selector.cpp @@ -32,7 +32,7 @@ #include #include -#include +#include #include #include diff --git a/pcbnew/pcb_painter.cpp b/pcbnew/pcb_painter.cpp index 2380bf23e6..853f597e6c 100644 --- a/pcbnew/pcb_painter.cpp +++ b/pcbnew/pcb_painter.cpp @@ -23,11 +23,11 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA */ -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include #include #include #include diff --git a/pcbnew/pcb_shape.cpp b/pcbnew/pcb_shape.cpp index c96d65323f..80ab07930f 100644 --- a/pcbnew/pcb_shape.cpp +++ b/pcbnew/pcb_shape.cpp @@ -28,8 +28,8 @@ #include #include #include -#include -#include +#include +#include #include #include #include diff --git a/pcbnew/pcb_target.cpp b/pcbnew/pcb_target.cpp index 3d4290aaa9..65e4d6ce6b 100644 --- a/pcbnew/pcb_target.cpp +++ b/pcbnew/pcb_target.cpp @@ -25,7 +25,7 @@ */ #include -#include +#include #include #include #include diff --git a/pcbnew/pcb_text.cpp b/pcbnew/pcb_text.cpp index 252f3a5d22..f0fc4bf419 100644 --- a/pcbnew/pcb_text.cpp +++ b/pcbnew/pcb_text.cpp @@ -27,7 +27,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/pcbnew/pcb_view.cpp b/pcbnew/pcb_view.cpp index d2cbef7f43..67da0cbbb5 100644 --- a/pcbnew/pcb_view.cpp +++ b/pcbnew/pcb_view.cpp @@ -31,8 +31,8 @@ using namespace std::placeholders; #include #include -#include -#include +#include +#include namespace KIGFX { PCB_VIEW::PCB_VIEW( bool aIsDynamic ) : diff --git a/pcbnew/pcbnew.cpp b/pcbnew/pcbnew.cpp index ca49414c30..1a270688f5 100644 --- a/pcbnew/pcbnew.cpp +++ b/pcbnew/pcbnew.cpp @@ -45,7 +45,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/pcbnew/pcbnew_printout.cpp b/pcbnew/pcbnew_printout.cpp index 51259c2005..7a9b3e1df1 100644 --- a/pcbnew/pcbnew_printout.cpp +++ b/pcbnew/pcbnew_printout.cpp @@ -26,7 +26,7 @@ */ #include "pcbnew_printout.h" -#include +#include #include // for KiROUND #include #include diff --git a/pcbnew/pcbplot.cpp b/pcbnew/pcbplot.cpp index 95bb55e54c..da9f47f279 100644 --- a/pcbnew/pcbplot.cpp +++ b/pcbnew/pcbplot.cpp @@ -32,7 +32,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/pcbnew/plot_board_layers.cpp b/pcbnew/plot_board_layers.cpp index 6189f4195b..fba9008f66 100644 --- a/pcbnew/plot_board_layers.cpp +++ b/pcbnew/plot_board_layers.cpp @@ -35,9 +35,9 @@ #include #include // for KiROUND -#include -#include -#include +#include +#include +#include #include #include #include diff --git a/pcbnew/plot_brditems_plotter.cpp b/pcbnew/plot_brditems_plotter.cpp index 5d6f27d396..50abd3f727 100644 --- a/pcbnew/plot_brditems_plotter.cpp +++ b/pcbnew/plot_brditems_plotter.cpp @@ -51,15 +51,15 @@ #include #include // for PCB_PLOT_PARAMS, PCB_PL... -#include +#include #include // for BOARD_ITEM, S_CIRCLE #include #include #include -#include +#include #include // for FP_TEXT -#include -#include // for D_PAD +#include +#include // for D_PAD #include #include #include diff --git a/pcbnew/plugins/altium/altium_circuit_maker_plugin.cpp b/pcbnew/plugins/altium/altium_circuit_maker_plugin.cpp index 768399bf63..db70e4a8a5 100644 --- a/pcbnew/plugins/altium/altium_circuit_maker_plugin.cpp +++ b/pcbnew/plugins/altium/altium_circuit_maker_plugin.cpp @@ -33,7 +33,7 @@ #include #include -#include +#include #include #include diff --git a/pcbnew/plugins/altium/altium_circuit_studio_plugin.cpp b/pcbnew/plugins/altium/altium_circuit_studio_plugin.cpp index c504f6d67e..40fd2d3b61 100644 --- a/pcbnew/plugins/altium/altium_circuit_studio_plugin.cpp +++ b/pcbnew/plugins/altium/altium_circuit_studio_plugin.cpp @@ -33,7 +33,7 @@ #include #include -#include +#include #include #include diff --git a/pcbnew/plugins/altium/altium_designer_plugin.cpp b/pcbnew/plugins/altium/altium_designer_plugin.cpp index 88e8d82b2b..ce8ac66ba2 100644 --- a/pcbnew/plugins/altium/altium_designer_plugin.cpp +++ b/pcbnew/plugins/altium/altium_designer_plugin.cpp @@ -33,7 +33,7 @@ #include #include -#include +#include #include #include diff --git a/pcbnew/plugins/altium/altium_parser_pcb.h b/pcbnew/plugins/altium/altium_parser_pcb.h index 67b7e2ee03..9bca48a23b 100644 --- a/pcbnew/plugins/altium/altium_parser_pcb.h +++ b/pcbnew/plugins/altium/altium_parser_pcb.h @@ -29,7 +29,7 @@ #include #include -#include +#include #include // tthis constant specifies an unconnected net diff --git a/pcbnew/plugins/altium/altium_pcb.cpp b/pcbnew/plugins/altium/altium_pcb.cpp index eee5514f60..8f2de6f3b9 100644 --- a/pcbnew/plugins/altium/altium_pcb.cpp +++ b/pcbnew/plugins/altium/altium_pcb.cpp @@ -26,11 +26,11 @@ #include "plugins/altium/altium_parser.h" #include -#include +#include #include #include #include -#include +#include #include #include diff --git a/pcbnew/plugins/cadstar/cadstar_pcb_archive_loader.cpp b/pcbnew/plugins/cadstar/cadstar_pcb_archive_loader.cpp index bb3a43ddfd..9742f2a887 100644 --- a/pcbnew/plugins/cadstar/cadstar_pcb_archive_loader.cpp +++ b/pcbnew/plugins/cadstar/cadstar_pcb_archive_loader.cpp @@ -26,13 +26,13 @@ #include #include // KEY_COPPER, KEY_CORE, KEY_PREPREG -#include +#include #include #include #include -#include +#include #include -#include +#include #include #include #include diff --git a/pcbnew/plugins/cadstar/cadstar_pcb_archive_loader.h b/pcbnew/plugins/cadstar/cadstar_pcb_archive_loader.h index 5f8769c74d..47b29effb4 100644 --- a/pcbnew/plugins/cadstar/cadstar_pcb_archive_loader.h +++ b/pcbnew/plugins/cadstar/cadstar_pcb_archive_loader.h @@ -28,7 +28,7 @@ #include #include -#include +#include #include class BOARD; diff --git a/pcbnew/plugins/cadstar/cadstar_pcb_archive_plugin.cpp b/pcbnew/plugins/cadstar/cadstar_pcb_archive_plugin.cpp index 43b966b814..520d6c3fc0 100644 --- a/pcbnew/plugins/cadstar/cadstar_pcb_archive_plugin.cpp +++ b/pcbnew/plugins/cadstar/cadstar_pcb_archive_plugin.cpp @@ -26,7 +26,7 @@ #include #include -#include +#include #include diff --git a/pcbnew/plugins/eagle/eagle_plugin.cpp b/pcbnew/plugins/eagle/eagle_plugin.cpp index 6607c8aa7b..70b941f8ac 100644 --- a/pcbnew/plugins/eagle/eagle_plugin.cpp +++ b/pcbnew/plugins/eagle/eagle_plugin.cpp @@ -64,9 +64,9 @@ Load() TODO's #include #include // for KiROUND -#include -#include -#include +#include +#include +#include #include #include #include diff --git a/pcbnew/plugins/geda/gpcb_plugin.cpp b/pcbnew/plugins/geda/gpcb_plugin.cpp index ef49d07b02..b8bb59e5b4 100644 --- a/pcbnew/plugins/geda/gpcb_plugin.cpp +++ b/pcbnew/plugins/geda/gpcb_plugin.cpp @@ -32,8 +32,8 @@ #include #include // for KiROUND -#include -#include +#include +#include #include #include #include diff --git a/pcbnew/plugins/kicad/kicad_plugin.cpp b/pcbnew/plugins/kicad/kicad_plugin.cpp index 326facdf09..3b4a372c78 100644 --- a/pcbnew/plugins/kicad/kicad_plugin.cpp +++ b/pcbnew/plugins/kicad/kicad_plugin.cpp @@ -27,11 +27,11 @@ #include #include #include -#include -#include +#include +#include #include #include -#include +#include #include #include #include diff --git a/pcbnew/plugins/kicad/pcb_parser.cpp b/pcbnew/plugins/kicad/pcb_parser.cpp index e83dcd7afb..51cce6b03e 100644 --- a/pcbnew/plugins/kicad/pcb_parser.cpp +++ b/pcbnew/plugins/kicad/pcb_parser.cpp @@ -35,16 +35,16 @@ #include #include -#include +#include #include #include #include -#include +#include #include -#include +#include #include -#include -#include +#include +#include #include #include #include diff --git a/pcbnew/plugins/legacy/legacy_plugin.cpp b/pcbnew/plugins/legacy/legacy_plugin.cpp index 030cf09ea6..4d27b93ebf 100644 --- a/pcbnew/plugins/legacy/legacy_plugin.cpp +++ b/pcbnew/plugins/legacy/legacy_plugin.cpp @@ -72,9 +72,9 @@ #include #include -#include -#include -#include +#include +#include +#include #include #include #include diff --git a/pcbnew/plugins/pcad/pcb_component.h b/pcbnew/plugins/pcad/pcb_component.h index 02c3d65dc9..c02da76eff 100644 --- a/pcbnew/plugins/pcad/pcb_component.h +++ b/pcbnew/plugins/pcad/pcb_component.h @@ -35,9 +35,9 @@ #include #include -#include -#include -#include +#include +#include +#include namespace PCAD2KICAD { diff --git a/pcbnew/ratsnest/ratsnest.cpp b/pcbnew/ratsnest/ratsnest.cpp index d91ed2f35e..d85a1386f8 100644 --- a/pcbnew/ratsnest/ratsnest.cpp +++ b/pcbnew/ratsnest/ratsnest.cpp @@ -24,9 +24,9 @@ #include #include -#include -#include -#include +#include +#include +#include #include #include diff --git a/pcbnew/router/length_tuner_tool.cpp b/pcbnew/router/length_tuner_tool.cpp index 403ad2e506..1dfcead993 100644 --- a/pcbnew/router/length_tuner_tool.cpp +++ b/pcbnew/router/length_tuner_tool.cpp @@ -22,7 +22,7 @@ #include #include "class_draw_panel_gal.h" -#include "class_board.h" +#include "board.h" #include #include diff --git a/pcbnew/router/pns_diff_pair_placer.cpp b/pcbnew/router/pns_diff_pair_placer.cpp index 62db640b29..fccffabeed 100644 --- a/pcbnew/router/pns_diff_pair_placer.cpp +++ b/pcbnew/router/pns_diff_pair_placer.cpp @@ -19,7 +19,7 @@ * with this program. If not, see . */ -#include +#include #include #include diff --git a/pcbnew/router/pns_kicad_iface.cpp b/pcbnew/router/pns_kicad_iface.cpp index 289d7a2d92..2ad5f1e210 100644 --- a/pcbnew/router/pns_kicad_iface.cpp +++ b/pcbnew/router/pns_kicad_iface.cpp @@ -20,11 +20,11 @@ */ #include -#include +#include #include #include -#include -#include +#include +#include #include #include #include diff --git a/pcbnew/router/pns_sizes_settings.cpp b/pcbnew/router/pns_sizes_settings.cpp index 7c2cd87287..16cade33b7 100644 --- a/pcbnew/router/pns_sizes_settings.cpp +++ b/pcbnew/router/pns_sizes_settings.cpp @@ -19,7 +19,7 @@ * with this program. If not, see . */ -#include +#include #include "pns_item.h" #include "pns_via.h" diff --git a/pcbnew/router/pns_sizes_settings.h b/pcbnew/router/pns_sizes_settings.h index d2c36af0a1..6c33c0ae86 100644 --- a/pcbnew/router/pns_sizes_settings.h +++ b/pcbnew/router/pns_sizes_settings.h @@ -25,7 +25,7 @@ #include #include -#include "../class_track.h" // for VIATYPE_T +#include "track.h" // for VIATYPE_T class BOARD; class BOARD_DESIGN_SETTINGS; diff --git a/pcbnew/router/pns_topology.cpp b/pcbnew/router/pns_topology.cpp index 6bdbeabdc8..ea680f1317 100644 --- a/pcbnew/router/pns_topology.cpp +++ b/pcbnew/router/pns_topology.cpp @@ -30,7 +30,7 @@ #include "pns_diff_pair.h" #include "pns_topology.h" -#include +#include namespace PNS { diff --git a/pcbnew/router/pns_via.h b/pcbnew/router/pns_via.h index 58d5e2f562..5946747a0e 100644 --- a/pcbnew/router/pns_via.h +++ b/pcbnew/router/pns_via.h @@ -26,7 +26,7 @@ #include #include -#include "../class_track.h" +#include "track.h" #include "pns_item.h" diff --git a/pcbnew/router/router_preview_item.cpp b/pcbnew/router/router_preview_item.cpp index ea4326bc64..7aeb7af584 100644 --- a/pcbnew/router/router_preview_item.cpp +++ b/pcbnew/router/router_preview_item.cpp @@ -25,7 +25,7 @@ #include #include -#include "class_track.h" +#include "track.h" #include #include "router_preview_item.h" diff --git a/pcbnew/router/router_tool.cpp b/pcbnew/router/router_tool.cpp index f219b0acbd..5f29d8fcc3 100644 --- a/pcbnew/router/router_tool.cpp +++ b/pcbnew/router/router_tool.cpp @@ -22,11 +22,11 @@ #include #include using namespace std::placeholders; -#include +#include #include -#include +#include #include -#include +#include #include #include #include diff --git a/pcbnew/sel_layer.cpp b/pcbnew/sel_layer.cpp index 0a9edf20ba..ceee259eee 100644 --- a/pcbnew/sel_layer.cpp +++ b/pcbnew/sel_layer.cpp @@ -26,7 +26,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/pcbnew/specctra_import_export/specctra.cpp b/pcbnew/specctra_import_export/specctra.cpp index 9e619dde5e..9cf8acea10 100644 --- a/pcbnew/specctra_import_export/specctra.cpp +++ b/pcbnew/specctra_import_export/specctra.cpp @@ -52,8 +52,8 @@ #include -#include -#include +#include +#include #include "specctra.h" #include diff --git a/pcbnew/specctra_import_export/specctra_export.cpp b/pcbnew/specctra_import_export/specctra_export.cpp index f824721306..6ba658cce1 100644 --- a/pcbnew/specctra_import_export/specctra_export.cpp +++ b/pcbnew/specctra_import_export/specctra_export.cpp @@ -42,10 +42,10 @@ #include // std::set #include // std::map -#include -#include +#include +#include #include -#include +#include #include #include #include diff --git a/pcbnew/specctra_import_export/specctra_import.cpp b/pcbnew/specctra_import_export/specctra_import.cpp index a9417df910..2fd6b96f0d 100644 --- a/pcbnew/specctra_import_export/specctra_import.cpp +++ b/pcbnew/specctra_import_export/specctra_import.cpp @@ -37,9 +37,9 @@ #include #include #include -#include -#include -#include +#include +#include +#include #include #include #include "specctra.h" diff --git a/pcbnew/swig/board.i b/pcbnew/swig/board.i index fab94abc37..a7decb4139 100644 --- a/pcbnew/swig/board.i +++ b/pcbnew/swig/board.i @@ -69,9 +69,9 @@ HANDLE_EXCEPTIONS(BOARD::TracksInNetBetweenPoints) // Do not permit default BOARD ctor since it won't initialize the project %ignore BOARD::BOARD(); -%include class_board.h +%include board.h %{ -#include +#include %} %extend std::deque diff --git a/pcbnew/swig/footprint.i b/pcbnew/swig/footprint.i index dee8ddd06e..0fa7b74ada 100644 --- a/pcbnew/swig/footprint.i +++ b/pcbnew/swig/footprint.i @@ -31,12 +31,12 @@ %rename(MODULE_3D_SETTINGS_VECTOR3D) MODULE_3D_SETTINGS::VECTOR3D; %feature("flatnested"); -%include class_module.h +%include footprint.h %feature("flatnested", ""); %rename(Get) operator MODULE*; %{ -#include +#include %} %template(MODULE_3D_SETTINGS_List) std::list; diff --git a/pcbnew/swig/pad.i b/pcbnew/swig/pad.i index 9ef82d9ca9..eb49ff24a5 100644 --- a/pcbnew/swig/pad.i +++ b/pcbnew/swig/pad.i @@ -1,11 +1,11 @@ %include pad_shapes.h -%include class_pad.h +%include pad.h %rename(Get) operator D_PAD*; %{ -#include +#include %} %extend D_PAD diff --git a/pcbnew/swig/pcbnew_action_plugins.cpp b/pcbnew/swig/pcbnew_action_plugins.cpp index 43f328737a..06c1dacc76 100644 --- a/pcbnew/swig/pcbnew_action_plugins.cpp +++ b/pcbnew/swig/pcbnew_action_plugins.cpp @@ -22,9 +22,9 @@ */ #include "pcbnew_action_plugins.h" -#include -#include -#include +#include +#include +#include #include #include #include diff --git a/pcbnew/swig/pcbnew_scripting_helpers.cpp b/pcbnew/swig/pcbnew_scripting_helpers.cpp index d6c9f83914..17ba304696 100644 --- a/pcbnew/swig/pcbnew_scripting_helpers.cpp +++ b/pcbnew/swig/pcbnew_scripting_helpers.cpp @@ -31,7 +31,7 @@ #undef HAVE_CLOCK_GETTIME // macro is defined in Python.h and causes redefine warning #include -#include +#include #include #include #include diff --git a/pcbnew/swig/track.i b/pcbnew/swig/track.i index 0899586ba5..42d7c23e6b 100644 --- a/pcbnew/swig/track.i +++ b/pcbnew/swig/track.i @@ -1,8 +1,8 @@ -%include class_track.h +%include track.h %rename(Get) operator TRACK*; %{ -#include +#include %} diff --git a/pcbnew/toolbars_footprint_editor.cpp b/pcbnew/toolbars_footprint_editor.cpp index c1ae45d502..17fa64a912 100644 --- a/pcbnew/toolbars_footprint_editor.cpp +++ b/pcbnew/toolbars_footprint_editor.cpp @@ -21,7 +21,7 @@ */ #include -#include +#include #include #include #include diff --git a/pcbnew/toolbars_pcb_editor.cpp b/pcbnew/toolbars_pcb_editor.cpp index 948e6a37c2..ffe086bda8 100644 --- a/pcbnew/toolbars_pcb_editor.cpp +++ b/pcbnew/toolbars_pcb_editor.cpp @@ -27,7 +27,7 @@ #include #include -#include +#include #include #include #include diff --git a/pcbnew/tools/convert_tool.cpp b/pcbnew/tools/convert_tool.cpp index e886bbd6b4..64e0c0f8ab 100644 --- a/pcbnew/tools/convert_tool.cpp +++ b/pcbnew/tools/convert_tool.cpp @@ -24,10 +24,10 @@ #include #include -#include +#include #include #include -#include +#include #include #include #include diff --git a/pcbnew/tools/drawing_tool.cpp b/pcbnew/tools/drawing_tool.cpp index ceb841d1be..5cd5e29137 100644 --- a/pcbnew/tools/drawing_tool.cpp +++ b/pcbnew/tools/drawing_tool.cpp @@ -40,12 +40,12 @@ #include #include -#include +#include #include #include #include #include -#include +#include #include #include diff --git a/pcbnew/tools/drc_tool.h b/pcbnew/tools/drc_tool.h index 82280347aa..6ce4533ddd 100644 --- a/pcbnew/tools/drc_tool.h +++ b/pcbnew/tools/drc_tool.h @@ -25,8 +25,8 @@ #define DRC_TOOL_H #include -#include -#include +#include +#include #include #include #include diff --git a/pcbnew/tools/edit_tool.cpp b/pcbnew/tools/edit_tool.cpp index d2b18eea0d..a7ab2f9177 100644 --- a/pcbnew/tools/edit_tool.cpp +++ b/pcbnew/tools/edit_tool.cpp @@ -25,8 +25,8 @@ */ #include -#include -#include +#include +#include #include #include #include diff --git a/pcbnew/tools/footprint_editor_tools.cpp b/pcbnew/tools/footprint_editor_tools.cpp index 021568ed35..a5a5f151df 100644 --- a/pcbnew/tools/footprint_editor_tools.cpp +++ b/pcbnew/tools/footprint_editor_tools.cpp @@ -32,7 +32,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/pcbnew/tools/global_edit_tool.cpp b/pcbnew/tools/global_edit_tool.cpp index 93d36e68d1..d37cddc139 100644 --- a/pcbnew/tools/global_edit_tool.cpp +++ b/pcbnew/tools/global_edit_tool.cpp @@ -21,7 +21,7 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA */ -#include +#include #include #include #include diff --git a/pcbnew/tools/grid_helper.cpp b/pcbnew/tools/grid_helper.cpp index 0b7b38ad71..0b0d50165f 100644 --- a/pcbnew/tools/grid_helper.cpp +++ b/pcbnew/tools/grid_helper.cpp @@ -26,11 +26,11 @@ #include using namespace std::placeholders; -#include +#include #include #include -#include -#include +#include +#include #include #include #include diff --git a/pcbnew/tools/pad_tool.cpp b/pcbnew/tools/pad_tool.cpp index 573015316c..0be37138b4 100644 --- a/pcbnew/tools/pad_tool.cpp +++ b/pcbnew/tools/pad_tool.cpp @@ -29,7 +29,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/pcbnew/tools/pcb_bright_box.cpp b/pcbnew/tools/pcb_bright_box.cpp index aee6462cbc..5c62faf78e 100644 --- a/pcbnew/tools/pcb_bright_box.cpp +++ b/pcbnew/tools/pcb_bright_box.cpp @@ -23,7 +23,7 @@ #include "pcb_bright_box.h" #include -#include +#include using namespace KIGFX; diff --git a/pcbnew/tools/pcb_editor_conditions.cpp b/pcbnew/tools/pcb_editor_conditions.cpp index 5ac299b0ee..326d83cf15 100644 --- a/pcbnew/tools/pcb_editor_conditions.cpp +++ b/pcbnew/tools/pcb_editor_conditions.cpp @@ -23,7 +23,7 @@ */ -#include +#include #include #include #include diff --git a/pcbnew/tools/pcb_editor_control.cpp b/pcbnew/tools/pcb_editor_control.cpp index 31a09aa7f3..5d34add8e8 100644 --- a/pcbnew/tools/pcb_editor_control.cpp +++ b/pcbnew/tools/pcb_editor_control.cpp @@ -31,11 +31,11 @@ #include "tool/tool_event.h" #include #include -#include -#include -#include +#include +#include +#include #include -#include +#include #include #include #include diff --git a/pcbnew/tools/pcb_inspection_tool.cpp b/pcbnew/tools/pcb_inspection_tool.cpp index 2daa36ac9b..8dd0ff1642 100644 --- a/pcbnew/tools/pcb_inspection_tool.cpp +++ b/pcbnew/tools/pcb_inspection_tool.cpp @@ -22,7 +22,7 @@ */ #include -#include +#include #include #include #include diff --git a/pcbnew/tools/pcb_tool_base.cpp b/pcbnew/tools/pcb_tool_base.cpp index 7b3a4949d8..7bb3ba43e2 100644 --- a/pcbnew/tools/pcb_tool_base.cpp +++ b/pcbnew/tools/pcb_tool_base.cpp @@ -26,7 +26,7 @@ #include #include #include -#include +#include #include #include #include "selection_tool.h" diff --git a/pcbnew/tools/pcb_tool_base.h b/pcbnew/tools/pcb_tool_base.h index 402f6c5504..ca969ca0e8 100644 --- a/pcbnew/tools/pcb_tool_base.h +++ b/pcbnew/tools/pcb_tool_base.h @@ -31,7 +31,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/pcbnew/tools/pcb_viewer_tools.h b/pcbnew/tools/pcb_viewer_tools.h index 60108f89a4..b443c7d3d8 100644 --- a/pcbnew/tools/pcb_viewer_tools.h +++ b/pcbnew/tools/pcb_viewer_tools.h @@ -24,7 +24,7 @@ #ifndef PCB_VIEWER_TOOLS_H_ #define PCB_VIEWER_TOOLS_H_ -#include +#include #include class PCB_BASE_FRAME; diff --git a/pcbnew/tools/pcbnew_control.cpp b/pcbnew/tools/pcbnew_control.cpp index 0a6a92357e..88601e2c89 100644 --- a/pcbnew/tools/pcbnew_control.cpp +++ b/pcbnew/tools/pcbnew_control.cpp @@ -31,11 +31,11 @@ #include <3d_viewer/eda_3d_viewer.h> #include #include -#include +#include #include #include -#include -#include +#include +#include #include #include #include diff --git a/pcbnew/tools/pcbnew_selection.cpp b/pcbnew/tools/pcbnew_selection.cpp index c4a9c82638..6afc95af56 100644 --- a/pcbnew/tools/pcbnew_selection.cpp +++ b/pcbnew/tools/pcbnew_selection.cpp @@ -29,10 +29,10 @@ #include using namespace std::placeholders; -#include +#include #include -#include -#include +#include +#include #include #include #include diff --git a/pcbnew/tools/placement_tool.cpp b/pcbnew/tools/placement_tool.cpp index 1df6c384bc..be3839e32a 100644 --- a/pcbnew/tools/placement_tool.cpp +++ b/pcbnew/tools/placement_tool.cpp @@ -31,7 +31,7 @@ #include #include -#include +#include #include #include diff --git a/pcbnew/tools/selection_tool.cpp b/pcbnew/tools/selection_tool.cpp index ee53647d2c..bbe8a7d8ab 100644 --- a/pcbnew/tools/selection_tool.cpp +++ b/pcbnew/tools/selection_tool.cpp @@ -28,10 +28,10 @@ #include using namespace std::placeholders; #include -#include +#include #include -#include -#include +#include +#include #include #include #include diff --git a/pcbnew/class_track.cpp b/pcbnew/track.cpp similarity index 99% rename from pcbnew/class_track.cpp rename to pcbnew/track.cpp index d41d36aa23..58f8cecb92 100644 --- a/pcbnew/class_track.cpp +++ b/pcbnew/track.cpp @@ -26,8 +26,8 @@ #include #include -#include -#include +#include +#include #include #include #include diff --git a/pcbnew/class_track.h b/pcbnew/track.h similarity index 100% rename from pcbnew/class_track.h rename to pcbnew/track.h diff --git a/pcbnew/tracks_cleaner.h b/pcbnew/tracks_cleaner.h index 2bfef2f075..bb1c4b034d 100644 --- a/pcbnew/tracks_cleaner.h +++ b/pcbnew/tracks_cleaner.h @@ -24,8 +24,8 @@ #ifndef KICAD_TRACKS_CLEANER_H #define KICAD_TRACKS_CLEANER_H -#include -#include +#include +#include class BOARD_COMMIT; class CLEANUP_ITEM; diff --git a/pcbnew/undo_redo.cpp b/pcbnew/undo_redo.cpp index 70a8924e17..83e47a8c8c 100644 --- a/pcbnew/undo_redo.cpp +++ b/pcbnew/undo_redo.cpp @@ -29,10 +29,10 @@ using namespace std::placeholders; #include #include -#include -#include +#include +#include #include -#include +#include #include #include #include diff --git a/pcbnew/widgets/appearance_controls.cpp b/pcbnew/widgets/appearance_controls.cpp index 231fcc4dc6..32f96f63e4 100644 --- a/pcbnew/widgets/appearance_controls.cpp +++ b/pcbnew/widgets/appearance_controls.cpp @@ -21,7 +21,7 @@ #include #include -#include +#include #include #include #include diff --git a/pcbnew/widgets/appearance_controls.h b/pcbnew/widgets/appearance_controls.h index 05e1135718..bb8561cd6e 100644 --- a/pcbnew/widgets/appearance_controls.h +++ b/pcbnew/widgets/appearance_controls.h @@ -23,7 +23,7 @@ #include -#include +#include #include #include #include diff --git a/pcbnew/zone.cpp b/pcbnew/zone.cpp index ee67727eb4..ba4b620cea 100644 --- a/pcbnew/zone.cpp +++ b/pcbnew/zone.cpp @@ -29,7 +29,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/pcbnew/zone_filler.cpp b/pcbnew/zone_filler.cpp index c23807507f..75a72aab9a 100644 --- a/pcbnew/zone_filler.cpp +++ b/pcbnew/zone_filler.cpp @@ -28,14 +28,14 @@ #include #include -#include +#include #include -#include +#include #include #include #include #include -#include +#include #include #include #include diff --git a/pcbnew/zone_settings.cpp b/pcbnew/zone_settings.cpp index 50f4201b76..6dff0a79eb 100644 --- a/pcbnew/zone_settings.cpp +++ b/pcbnew/zone_settings.cpp @@ -32,7 +32,7 @@ #include #include #include -#include +#include #include #include diff --git a/pcbnew/zones_by_polygon.cpp b/pcbnew/zones_by_polygon.cpp index 5fa72f79c0..8f45582ac1 100644 --- a/pcbnew/zones_by_polygon.cpp +++ b/pcbnew/zones_by_polygon.cpp @@ -29,7 +29,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/pcbnew/zones_functions_for_undo_redo.cpp b/pcbnew/zones_functions_for_undo_redo.cpp index 4cc4396025..b16b1b5c14 100644 --- a/pcbnew/zones_functions_for_undo_redo.cpp +++ b/pcbnew/zones_functions_for_undo_redo.cpp @@ -44,7 +44,7 @@ #include #include -#include +#include #include #include diff --git a/pcbnew/zones_test_and_combine_areas.cpp b/pcbnew/zones_test_and_combine_areas.cpp index b5e080fe99..27bb687df7 100644 --- a/pcbnew/zones_test_and_combine_areas.cpp +++ b/pcbnew/zones_test_and_combine_areas.cpp @@ -24,7 +24,7 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA */ -#include +#include #include diff --git a/qa/drc_proto/drc_proto.cpp b/qa/drc_proto/drc_proto.cpp index b0947b6715..29ba3db00e 100644 --- a/qa/drc_proto/drc_proto.cpp +++ b/qa/drc_proto/drc_proto.cpp @@ -32,7 +32,7 @@ #include #include -#include +#include #include #include #include diff --git a/qa/libeval_compiler/libeval_compiler_test.cpp b/qa/libeval_compiler/libeval_compiler_test.cpp index bfc4c8f28f..1af54972fc 100644 --- a/qa/libeval_compiler/libeval_compiler_test.cpp +++ b/qa/libeval_compiler/libeval_compiler_test.cpp @@ -1,8 +1,8 @@ #include #include -#include "class_board.h" -#include "class_track.h" +#include "board.h" +#include "track.h" #include diff --git a/qa/pcbnew/drc/test_drc_courtyard_invalid.cpp b/qa/pcbnew/drc/test_drc_courtyard_invalid.cpp index aa8383b3fc..1148cd176b 100644 --- a/qa/pcbnew/drc/test_drc_courtyard_invalid.cpp +++ b/qa/pcbnew/drc/test_drc_courtyard_invalid.cpp @@ -25,8 +25,8 @@ #include #include -#include -#include +#include +#include #include #include #include diff --git a/qa/pcbnew/drc/test_drc_courtyard_overlap.cpp b/qa/pcbnew/drc/test_drc_courtyard_overlap.cpp index 3decde67c5..de19ab8110 100644 --- a/qa/pcbnew/drc/test_drc_courtyard_overlap.cpp +++ b/qa/pcbnew/drc/test_drc_courtyard_overlap.cpp @@ -25,8 +25,8 @@ #include #include -#include -#include +#include +#include #include #include #include diff --git a/qa/pcbnew/group_saveload.cpp b/qa/pcbnew/group_saveload.cpp index b0a3b4ba44..87b752ffd5 100644 --- a/qa/pcbnew/group_saveload.cpp +++ b/qa/pcbnew/group_saveload.cpp @@ -26,8 +26,8 @@ #include #include -#include -#include +#include +#include #include #include #include diff --git a/qa/pcbnew/test_array_pad_name_provider.cpp b/qa/pcbnew/test_array_pad_name_provider.cpp index 0edee396ab..18a521fa13 100644 --- a/qa/pcbnew/test_array_pad_name_provider.cpp +++ b/qa/pcbnew/test_array_pad_name_provider.cpp @@ -32,8 +32,8 @@ #include // make_unique -#include -#include +#include +#include /** * Make a module with a given list of named pads diff --git a/qa/pcbnew/test_libeval_compiler.cpp b/qa/pcbnew/test_libeval_compiler.cpp index 9f62d912ee..5057894283 100644 --- a/qa/pcbnew/test_libeval_compiler.cpp +++ b/qa/pcbnew/test_libeval_compiler.cpp @@ -28,8 +28,8 @@ #include #include -#include -#include +#include +#include BOOST_AUTO_TEST_SUITE( Libeval_Compiler ) diff --git a/qa/pcbnew/test_pad_naming.cpp b/qa/pcbnew/test_pad_naming.cpp index eb1c907438..5646b6ef16 100644 --- a/qa/pcbnew/test_pad_naming.cpp +++ b/qa/pcbnew/test_pad_naming.cpp @@ -23,8 +23,8 @@ #include -#include -#include +#include +#include #include struct PAD_FIXTURE diff --git a/qa/pcbnew_tools/tools/polygon_generator/polygon_generator.cpp b/qa/pcbnew_tools/tools/polygon_generator/polygon_generator.cpp index bd99d0fbc1..1c8ba152e7 100644 --- a/qa/pcbnew_tools/tools/polygon_generator/polygon_generator.cpp +++ b/qa/pcbnew_tools/tools/polygon_generator/polygon_generator.cpp @@ -31,10 +31,10 @@ #include -#include -#include -#include -#include +#include +#include +#include +#include void process( const BOARD_CONNECTED_ITEM* item, int net ) diff --git a/qa/pcbnew_tools/tools/polygon_triangulation/polygon_triangulation.cpp b/qa/pcbnew_tools/tools/polygon_triangulation/polygon_triangulation.cpp index 305baefe63..9c5a790408 100644 --- a/qa/pcbnew_tools/tools/polygon_triangulation/polygon_triangulation.cpp +++ b/qa/pcbnew_tools/tools/polygon_triangulation/polygon_triangulation.cpp @@ -31,7 +31,7 @@ #include -#include +#include #include #include diff --git a/qa/pcbnew_utils/board_construction_utils.cpp b/qa/pcbnew_utils/board_construction_utils.cpp index dcc9c3309c..45cfeb2a94 100644 --- a/qa/pcbnew_utils/board_construction_utils.cpp +++ b/qa/pcbnew_utils/board_construction_utils.cpp @@ -24,7 +24,7 @@ #include #include -#include +#include #include #include diff --git a/qa/pcbnew_utils/board_file_utils.cpp b/qa/pcbnew_utils/board_file_utils.cpp index e35a2cb593..a93495bc07 100644 --- a/qa/pcbnew_utils/board_file_utils.cpp +++ b/qa/pcbnew_utils/board_file_utils.cpp @@ -28,7 +28,7 @@ #include #include -#include +#include #include diff --git a/qa/qa_utils/mocks.cpp b/qa/qa_utils/mocks.cpp index 54f4349aeb..8a2050febb 100644 --- a/qa/qa_utils/mocks.cpp +++ b/qa/qa_utils/mocks.cpp @@ -29,11 +29,11 @@ #include #include #include -#include +#include #include #include #include -#include +#include #include #include #include diff --git a/qa/qa_utils/pcb_test_frame.cpp b/qa/qa_utils/pcb_test_frame.cpp index e4d14f50a2..a589caa46b 100644 --- a/qa/qa_utils/pcb_test_frame.cpp +++ b/qa/qa_utils/pcb_test_frame.cpp @@ -43,10 +43,10 @@ #include #include -#include -#include -#include -#include +#include +#include +#include +#include #include #include