From b43dc7954ce1a76ff19581db02ca7c8d2cf5b4d2 Mon Sep 17 00:00:00 2001 From: jean-pierre charras Date: Tue, 30 Jan 2018 15:34:09 +0100 Subject: [PATCH] fix code after renaming files --- common/CMakeLists.txt | 10 +++++----- common/widgets/widget_net_selector.cpp | 2 +- include/class_board_design_settings.h | 2 +- pcbnew/CMakeLists.txt | 2 +- pcbnew/action_plugin.cpp | 4 ++-- pcbnew/action_plugin.h | 2 +- pcbnew/board_netlist_updater.cpp | 2 +- pcbnew/class_board.h | 4 ++-- pcbnew/class_board_connected_item.h | 2 +- pcbnew/class_zone.h | 2 +- pcbnew/dialogs/dialog_keepout_area_properties.cpp | 2 +- pcbnew/kicad_clipboard.cpp | 2 +- pcbnew/netclass.cpp | 2 +- pcbnew/netinfo.h | 2 +- pcbnew/netinfo_list.cpp | 2 +- pcbnew/pcb_parser.cpp | 2 +- pcbnew/router/pns_diff_pair_placer.cpp | 2 +- pcbnew/swig/netclass.i | 4 ++-- pcbnew/swig/netinfo.i | 4 ++-- pcbnew/swig/pcbnew_action_plugins.h | 2 +- pcbnew/swig/zone_settings.i | 4 ++-- 21 files changed, 30 insertions(+), 30 deletions(-) diff --git a/common/CMakeLists.txt b/common/CMakeLists.txt index 2d13f9ba7a..42ddaac28a 100644 --- a/common/CMakeLists.txt +++ b/common/CMakeLists.txt @@ -390,9 +390,9 @@ set( PCB_COMMON_SRCS ../pcbnew/class_edge_mod.cpp ../pcbnew/class_marker_pcb.cpp ../pcbnew/class_module.cpp - ../pcbnew/class_netclass.cpp - ../pcbnew/class_netinfo_item.cpp - ../pcbnew/class_netinfolist.cpp + ../pcbnew/netclass.cpp + ../pcbnew/netinfo_item.cpp + ../pcbnew/netinfo_list.cpp ../pcbnew/class_pad.cpp ../pcbnew/class_pad_custom_shape_functions.cpp ../pcbnew/class_pad_draw_functions.cpp @@ -401,8 +401,6 @@ set( PCB_COMMON_SRCS ../pcbnew/class_text_mod.cpp ../pcbnew/class_track.cpp ../pcbnew/class_zone.cpp - ../pcbnew/class_zone_settings.cpp - ../pcbnew/classpcb.cpp ../pcbnew/collectors.cpp ../pcbnew/connectivity_algo.cpp ../pcbnew/connectivity_data.cpp @@ -423,11 +421,13 @@ set( PCB_COMMON_SRCS ../pcbnew/pcb_painter.cpp ../pcbnew/pcb_parser.cpp ../pcbnew/pcb_plot_params.cpp + ../pcbnew/pcb_screen.cpp ../pcbnew/pcb_view.cpp ../pcbnew/plugin.cpp ../pcbnew/ratsnest_data.cpp ../pcbnew/ratsnest_viewitem.cpp ../pcbnew/sel_layer.cpp + ../pcbnew/zone_settings.cpp widgets/widget_net_selector.cpp ) diff --git a/common/widgets/widget_net_selector.cpp b/common/widgets/widget_net_selector.cpp index 44a7c90ef4..97a1ec8652 100644 --- a/common/widgets/widget_net_selector.cpp +++ b/common/widgets/widget_net_selector.cpp @@ -26,7 +26,7 @@ #include #include -#include +#include #include WIDGET_NET_SELECTOR::WIDGET_NET_SELECTOR( wxWindow *parent, wxWindowID id, diff --git a/include/class_board_design_settings.h b/include/class_board_design_settings.h index f71c4faade..8057e286b0 100644 --- a/include/class_board_design_settings.h +++ b/include/class_board_design_settings.h @@ -27,7 +27,7 @@ #include #include -#include +#include #include // Some default values for the board editor and the fp editor (given in mm) diff --git a/pcbnew/CMakeLists.txt b/pcbnew/CMakeLists.txt index db5870ab2d..73a3d22c34 100644 --- a/pcbnew/CMakeLists.txt +++ b/pcbnew/CMakeLists.txt @@ -200,6 +200,7 @@ set( PCBNEW_CLASS_SRCS autorouter/rect_placement/rect_placement.cpp autorouter/spread_footprints.cpp + action_plugin.cpp append_board_to_current.cpp array_creator.cpp attribut.cpp @@ -207,7 +208,6 @@ set( PCBNEW_CLASS_SRCS block_module_editor.cpp board_netlist_updater.cpp build_BOM_from_board.cpp - class_action_plugin.cpp class_footprint_wizard.cpp class_pcb_layer_box_selector.cpp class_pcb_layer_widget.cpp diff --git a/pcbnew/action_plugin.cpp b/pcbnew/action_plugin.cpp index 50a05885fc..799674510e 100644 --- a/pcbnew/action_plugin.cpp +++ b/pcbnew/action_plugin.cpp @@ -23,11 +23,11 @@ /** - * @file class_action_plugin.cpp + * @file action_plugin.cpp * @brief Class ACTION_PLUGIN and ACTION_PLUGINS */ -#include "class_action_plugin.h" +#include "action_plugin.h" ACTION_PLUGIN::~ACTION_PLUGIN() diff --git a/pcbnew/action_plugin.h b/pcbnew/action_plugin.h index 53380a7a58..9552e1ac0b 100644 --- a/pcbnew/action_plugin.h +++ b/pcbnew/action_plugin.h @@ -23,7 +23,7 @@ /** - * @file class_action_plugin.h + * @file action_plugin.h * @brief Class PCBNEW_ACTION_PLUGINS */ diff --git a/pcbnew/board_netlist_updater.cpp b/pcbnew/board_netlist_updater.cpp index 3aa670b9dd..008d7d8509 100644 --- a/pcbnew/board_netlist_updater.cpp +++ b/pcbnew/board_netlist_updater.cpp @@ -35,7 +35,7 @@ #include // for PAGE_INFO #include -#include +#include #include #include #include diff --git a/pcbnew/class_board.h b/pcbnew/class_board.h index ed1d9f481f..4c3a448df0 100644 --- a/pcbnew/class_board.h +++ b/pcbnew/class_board.h @@ -36,12 +36,12 @@ #include // PAGE_INFO #include -#include +#include #include #include #include #include -#include +#include #include #include diff --git a/pcbnew/class_board_connected_item.h b/pcbnew/class_board_connected_item.h index dcfbd382f1..faab394395 100644 --- a/pcbnew/class_board_connected_item.h +++ b/pcbnew/class_board_connected_item.h @@ -32,7 +32,7 @@ #define BOARD_CONNECTED_ITEM_H #include -#include +#include class NETCLASS; class TRACK; diff --git a/pcbnew/class_zone.h b/pcbnew/class_zone.h index 5d6b162cc6..02a11033f2 100644 --- a/pcbnew/class_zone.h +++ b/pcbnew/class_zone.h @@ -38,7 +38,7 @@ #include #include #include -#include +#include class EDA_RECT; diff --git a/pcbnew/dialogs/dialog_keepout_area_properties.cpp b/pcbnew/dialogs/dialog_keepout_area_properties.cpp index 0d042c45a9..1b07c923ce 100644 --- a/pcbnew/dialogs/dialog_keepout_area_properties.cpp +++ b/pcbnew/dialogs/dialog_keepout_area_properties.cpp @@ -37,7 +37,7 @@ #include #include -#include +#include #include #include diff --git a/pcbnew/kicad_clipboard.cpp b/pcbnew/kicad_clipboard.cpp index 1bcfc32887..a5680c4ef9 100644 --- a/pcbnew/kicad_clipboard.cpp +++ b/pcbnew/kicad_clipboard.cpp @@ -25,7 +25,7 @@ #include #include #include -#include +#include #include #include diff --git a/pcbnew/netclass.cpp b/pcbnew/netclass.cpp index c94987cea5..02e3aeb67e 100644 --- a/pcbnew/netclass.cpp +++ b/pcbnew/netclass.cpp @@ -31,7 +31,7 @@ #include #include -#include +#include /// Abbrevation for fomatting internal units to a string. #define FMT_IU BOARD_ITEM::FormatInternalUnits diff --git a/pcbnew/netinfo.h b/pcbnew/netinfo.h index cf69dba94b..e379c7ea88 100644 --- a/pcbnew/netinfo.h +++ b/pcbnew/netinfo.h @@ -35,7 +35,7 @@ #include #include -#include +#include #include diff --git a/pcbnew/netinfo_list.cpp b/pcbnew/netinfo_list.cpp index c03f7dbc88..8ae93adb94 100644 --- a/pcbnew/netinfo_list.cpp +++ b/pcbnew/netinfo_list.cpp @@ -37,7 +37,7 @@ #include #include #include -#include +#include // Constructor and destructor diff --git a/pcbnew/pcb_parser.cpp b/pcbnew/pcb_parser.cpp index b48ff43c8f..f6049dd528 100644 --- a/pcbnew/pcb_parser.cpp +++ b/pcbnew/pcb_parser.cpp @@ -40,7 +40,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/pcbnew/router/pns_diff_pair_placer.cpp b/pcbnew/router/pns_diff_pair_placer.cpp index 92fd19f8b0..3d4f74b5b0 100644 --- a/pcbnew/router/pns_diff_pair_placer.cpp +++ b/pcbnew/router/pns_diff_pair_placer.cpp @@ -21,7 +21,7 @@ #include #include -#include +#include #include "pns_node.h" #include "pns_walkaround.h" diff --git a/pcbnew/swig/netclass.i b/pcbnew/swig/netclass.i index 28a31cf575..9bb23ab3df 100644 --- a/pcbnew/swig/netclass.i +++ b/pcbnew/swig/netclass.i @@ -32,7 +32,7 @@ the pointing. */ %ignore NETCLASS; // no code generation for it -%include class_netclass.h +%include netclass.h /* @@ -86,5 +86,5 @@ public: %{ -#include +#include %} diff --git a/pcbnew/swig/netinfo.i b/pcbnew/swig/netinfo.i index 149b16e030..2a7ee41c34 100644 --- a/pcbnew/swig/netinfo.i +++ b/pcbnew/swig/netinfo.i @@ -2,10 +2,10 @@ %warnfilter(325) NETINFO_MAPPING::iterator; %ignore NETINFO_MAPPING; // no code generation for this class -%include class_netinfo.h +%include netinfo.h %{ -#include +#include %} %feature("notabstract") NETINFO_ITEM; diff --git a/pcbnew/swig/pcbnew_action_plugins.h b/pcbnew/swig/pcbnew_action_plugins.h index 89484c9aee..08dfa14e61 100644 --- a/pcbnew/swig/pcbnew_action_plugins.h +++ b/pcbnew/swig/pcbnew_action_plugins.h @@ -30,7 +30,7 @@ #define PCBNEW_ACTION_PLUGINS_H #include #include -#include +#include class PYTHON_ACTION_PLUGIN : public ACTION_PLUGIN diff --git a/pcbnew/swig/zone_settings.i b/pcbnew/swig/zone_settings.i index 6565013c78..2c87348ce5 100644 --- a/pcbnew/swig/zone_settings.i +++ b/pcbnew/swig/zone_settings.i @@ -1,4 +1,4 @@ -%include class_zone_settings.h +%include zone_settings.h %{ -#include +#include %}