fix code after renaming files

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
 )
 

common/widgets/widget_net_selector.cpp

@@ -26,7 +26,7 @@
 #include <widgets/widget_net_selector.h>
 
 #include <class_board.h>
-#include <class_netinfo.h>
+#include <netinfo.h>
 #include <wx/arrstr.h>
 
 WIDGET_NET_SELECTOR::WIDGET_NET_SELECTOR( wxWindow *parent, wxWindowID id,

include/class_board_design_settings.h

@@ -27,7 +27,7 @@
 
 #include <class_pad.h>
 #include <class_track.h>
-#include <class_netclass.h>
+#include <netclass.h>
 #include <config_params.h>
 
 // Some default values for the board editor and the fp editor (given in mm)

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

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()

pcbnew/action_plugin.h

@@ -23,7 +23,7 @@
 
 
 /**
- * @file  class_action_plugin.h
+ * @file  action_plugin.h
  * @brief Class PCBNEW_ACTION_PLUGINS
  */
 

pcbnew/board_netlist_updater.cpp

@@ -35,7 +35,7 @@
 #include <common.h>                         // for PAGE_INFO
 
 #include <class_board.h>
-#include <class_netinfo.h>
+#include <netinfo.h>
 #include <class_module.h>
 #include <class_pad.h>
 #include <class_zone.h>

pcbnew/class_board.h

@@ -36,12 +36,12 @@
 
 #include <common.h>                         // PAGE_INFO
 #include <layers_id_colors_and_visibility.h>
-#include <class_netinfo.h>
+#include <netinfo.h>
 #include <class_pad.h>
 #include <class_colors_design_settings.h>
 #include <class_board_design_settings.h>
 #include <title_block.h>
-#include <class_zone_settings.h>
+#include <zone_settings.h>
 #include <pcb_plot_params.h>
 #include <board_item_container.h>
 

pcbnew/class_board_connected_item.h

@@ -32,7 +32,7 @@
 #define BOARD_CONNECTED_ITEM_H
 
 #include <class_board_item.h>
-#include <class_netinfo.h>
+#include <netinfo.h>
 
 class NETCLASS;
 class TRACK;

pcbnew/class_zone.h

@@ -38,7 +38,7 @@
 #include <layers_id_colors_and_visibility.h>
 #include <PolyLine.h>
 #include <geometry/shape_poly_set.h>
-#include <class_zone_settings.h>
+#include <zone_settings.h>
 
 
 class EDA_RECT;

pcbnew/dialogs/dialog_keepout_area_properties.cpp

@@ -37,7 +37,7 @@
 #include <zones.h>
 #include <base_units.h>
 
-#include <class_zone_settings.h>
+#include <zone_settings.h>
 #include <class_board.h>
 #include <dialog_keepout_area_properties_base.h>
 

pcbnew/kicad_clipboard.cpp

@@ -25,7 +25,7 @@
 #include <wx/clipbrd.h>
 #include <common.h>
 #include <pcb_parser.h>
-#include <class_netinfo.h>
+#include <netinfo.h>
 #include <class_board.h>
 #include <build_version.h>
 

pcbnew/netclass.cpp

@@ -31,7 +31,7 @@
 #include <macros.h>
 
 #include <class_board.h>
-#include <class_netclass.h>
+#include <netclass.h>
 
 /// Abbrevation for fomatting internal units to a string.
 #define FMT_IU     BOARD_ITEM::FormatInternalUnits

pcbnew/netinfo.h

@@ -35,7 +35,7 @@
 
 #include <macros.h>
 #include <gr_basic.h>
-#include <class_netclass.h>
+#include <netclass.h>
 #include <class_board_item.h>
 
 

pcbnew/netinfo_list.cpp

@@ -37,7 +37,7 @@
 #include <class_pad.h>
 #include <class_track.h>
 #include <class_zone.h>
-#include <class_netinfo.h>
+#include <netinfo.h>
 
 
 // Constructor and destructor

pcbnew/pcb_parser.cpp

@@ -40,7 +40,7 @@
 #include <class_edge_mod.h>
 #include <class_pcb_target.h>
 #include <class_module.h>
-#include <class_netclass.h>
+#include <netclass.h>
 #include <class_pad.h>
 #include <class_track.h>
 #include <class_zone.h>

pcbnew/router/pns_diff_pair_placer.cpp

@@ -21,7 +21,7 @@
 
 #include <class_board.h>
 #include <class_board_item.h>
-#include <class_netinfo.h>
+#include <netinfo.h>
 
 #include "pns_node.h"
 #include "pns_walkaround.h"

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 <class_netclass.h>
+#include <netclass.h>
 %}

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 <class_netinfo.h>
+#include <netinfo.h>
 %}
 
 %feature("notabstract")     NETINFO_ITEM;

pcbnew/swig/pcbnew_action_plugins.h

@@ -30,7 +30,7 @@
 #define PCBNEW_ACTION_PLUGINS_H
 #include <Python.h>
 #include <vector>
-#include <class_action_plugin.h>
+#include <action_plugin.h>
 
 
 class PYTHON_ACTION_PLUGIN : public ACTION_PLUGIN

pcbnew/swig/zone_settings.i

@@ -1,4 +1,4 @@
-%include class_zone_settings.h
+%include zone_settings.h
 %{
-#include <class_zone_settings.h>
+#include <zone_settings.h>
 %}