Fix code after renaming files

common/CMakeLists.txt

@@ -237,7 +237,6 @@ set( COMMON_SRCS
     build_version.cpp
     class_colors_design_settings.cpp
     class_layer_box_selector.cpp
-    class_marker_base.cpp
     class_undoredo_container.cpp
     colors.cpp
     commit.cpp
@@ -281,6 +280,7 @@ set( COMMON_SRCS
     lib_table_base.cpp
     lib_table_keywords.cpp
     lockfile.cpp
+    marker_base.cpp
     md5_hash.cpp
     msgpanel.cpp
     netlist_keywords.cpp
@@ -371,10 +371,10 @@ target_link_libraries( common
 
 set( PCB_COMMON_SRCS
     base_screen.cpp
-    class_page_info.cpp
     eda_text.cpp
     fp_lib_table.cpp
     lset.cpp
+    page_info.cpp
     pcb_keywords.cpp
     pcb_plot_params_keywords.cpp
     ../pcbnew/basepcbframe.cpp

common/base_screen.cpp

@@ -33,7 +33,7 @@
 #include <macros.h>
 #include <common.h>
 #include <base_struct.h>
-#include <class_base_screen.h>
+#include <base_screen.h>
 #include <id.h>
 #include <base_units.h>
 

common/base_struct.cpp

@@ -34,7 +34,7 @@
 #include <kicad_string.h>
 #include <wxstruct.h>
 #include <class_drawpanel.h>
-#include <class_base_screen.h>
+#include <base_screen.h>
 #include <bitmaps.h>
 
 #include "../eeschema/dialogs/dialog_schematic_find.h"

common/base_units.cpp

@@ -36,7 +36,7 @@
 
 #include <macros.h>
 #include <base_struct.h>
-#include <class_title_block.h>
+#include <title_block.h>
 #include <common.h>
 #include <base_units.h>
 #include "libeval/numeric_evaluator.h"

common/block_commande.cpp

@@ -33,7 +33,7 @@
 #include <common.h>
 #include <macros.h>
 #include <base_struct.h>
-#include <class_base_screen.h>
+#include <base_screen.h>
 #include <class_drawpanel.h>
 #include <confirm.h>
 #include <block_commande.h>

common/copy_to_clipboard.cpp

@@ -27,13 +27,12 @@
  */
 
 #include <wx/clipbrd.h>
-//#include <wx/metafile.h>
 #include <fctsys.h>
 #include <gr_basic.h>
 #include <common.h>
 #include <id.h>
 #include <class_drawpanel.h>
-#include <class_base_screen.h>
+#include <base_screen.h>
 #include <confirm.h>
 #include <draw_frame.h>
 

common/dialog_shim.cpp

@@ -26,7 +26,7 @@
 #include <kiway_player.h>
 #include <wx/evtloop.h>
 #include <pgm_base.h>
-#include <class_eda_rect.h>
+#include <eda_rect.h>
 
 
 /// Toggle a window's "enable" status to disabled, then enabled on destruction.

common/dialogs/dialog_page_settings.cpp

@@ -33,10 +33,10 @@
 #include <gr_basic.h>
 #include <base_struct.h>
 #include <class_drawpanel.h>
-#include <class_title_block.h>
+#include <title_block.h>
 #include <draw_frame.h>
 #include <worksheet_shape_builder.h>
-#include <class_base_screen.h>
+#include <base_screen.h>
 #include <wildcards_and_files_ext.h>
 
 #include <wx/valgen.h>

common/draw_frame.cpp

@@ -36,7 +36,7 @@
 #include <macros.h>
 #include <id.h>
 #include <class_drawpanel.h>
-#include <class_base_screen.h>
+#include <base_screen.h>
 #include <msgpanel.h>
 #include <draw_frame.h>
 #include <confirm.h>

common/draw_graphic_text.cpp

@@ -37,7 +37,7 @@
 #include <trigo.h>
 #include <macros.h>
 #include <class_drawpanel.h>
-#include <class_base_screen.h>
+#include <base_screen.h>
 
 #include <basic_gal.h>
 

common/draw_panel.cpp

@@ -37,7 +37,7 @@
 #include <id.h>
 #include <class_drawpanel.h>
 #include <class_draw_panel_gal.h>
-#include <class_base_screen.h>
+#include <base_screen.h>
 #include <draw_frame.h>
 #include <view/view_controls.h>
 #include <gal/gal_display_options.h>

common/eda_text.cpp

@@ -29,7 +29,7 @@
 
 #include <eda_text.h>
 #include <draw_graphic_text.h>
-#include <class_eda_rect.h>
+#include <eda_rect.h>
 #include <macros.h>
 #include <trigo.h>               // RotatePoint
 #include <class_drawpanel.h>     // EDA_DRAW_PANEL

common/gr_basic.cpp

@@ -30,7 +30,7 @@
 #include <trigo.h>
 #include <macros.h>
 #include <base_struct.h>
-#include <class_base_screen.h>
+#include <base_screen.h>
 #include <bezier_curves.h>
 #include <math_for_graphics.h>
 #include <wx/graphics.h>

common/marker_base.cpp

@@ -23,18 +23,16 @@
  */
 
 /**
- * @file class_marker_base.cpp
+ * @file marker_base.cpp
  * @brief Implementation of MARKER_BASE class.
  * Markers are used to show something (usually a drc/erc problem).
  * Markers in Pcbnew and Eeschema are derived from this base class.
  */
 
-/* file class_marker_base.cpp
- */
 
 #include "fctsys.h"
 #include "gr_basic.h"
-#include "class_base_screen.h"
+#include "base_screen.h"
 #include "common.h"
 #include "macros.h"
 #include "class_drawpanel.h"

common/page_info.cpp

@@ -24,7 +24,7 @@
 
 
 #include <common.h>
-#include <class_page_info.h>
+#include <page_info.h>
 #include <macros.h>
 
 

common/page_layout/page_layout_graphic_items.cpp

@@ -53,10 +53,10 @@
  */
 
 #include <fctsys.h>
-#include <class_eda_rect.h>
+#include <eda_rect.h>
 #include <draw_graphic_text.h>
 #include <worksheet.h>
-#include <class_title_block.h>
+#include <title_block.h>
 #include <worksheet_shape_builder.h>
 #include <worksheet_dataitem.h>
 #include <polygon_test_point_inside.h>

common/page_layout/title_block_shapes.cpp

@@ -56,9 +56,9 @@
 
 #include <fctsys.h>
 #include <draw_graphic_text.h>
-#include <class_page_info.h>
+#include <page_info.h>
 #include <worksheet.h>
-#include <class_title_block.h>
+#include <title_block.h>
 #include <worksheet_shape_builder.h>
 #include <worksheet_dataitem.h>
 

common/page_layout/worksheet_dataitem.cpp

@@ -56,9 +56,9 @@
 
 #include <fctsys.h>
 #include <draw_graphic_text.h>
-#include <class_eda_rect.h>
+#include <eda_rect.h>
 #include <worksheet.h>
-#include <class_title_block.h>
+#include <title_block.h>
 #include <worksheet_shape_builder.h>
 #include <worksheet_dataitem.h>
 

common/page_layout/worksheet_layout.cpp

@@ -53,7 +53,7 @@
 #include <kiface_i.h>
 #include <draw_graphic_text.h>
 #include <worksheet.h>
-#include <class_title_block.h>
+#include <title_block.h>
 #include <worksheet_shape_builder.h>
 #include <worksheet_dataitem.h>
 

common/plotters/SVG_plotter.cpp

@@ -93,7 +93,7 @@
 #include <fctsys.h>
 #include <trigo.h>
 #include <wxstruct.h>
-#include <class_eda_rect.h>
+#include <eda_rect.h>
 #include <base_struct.h>
 #include <common.h>
 #include <plotter.h>

common/plotters/common_plot_functions.cpp

@@ -31,9 +31,9 @@
 #include <base_struct.h>
 #include <plotter.h>
 #include <worksheet.h>
-#include <class_base_screen.h>
+#include <base_screen.h>
 #include <draw_graphic_text.h>
-#include <class_title_block.h>
+#include <title_block.h>
 #include "worksheet_shape_builder.h"
 #include "worksheet_dataitem.h"
 #include <wx/filename.h>

common/plotters/plotter.cpp

@@ -45,7 +45,7 @@
 #include <common.h>
 #include <plotter.h>
 #include <macros.h>
-#include <class_base_screen.h>
+#include <base_screen.h>
 #include <draw_graphic_text.h>
 #include <geometry/shape_line_chain.h>
 

common/swig/kicad.i

@@ -82,14 +82,14 @@ principle should be easily implemented by adapting the current STL containers.
     #include <macros.h>
     #include <cstddef>
     #include <base_struct.h>
-    #include <class_eda_rect.h>
+    #include <eda_rect.h>
     #include <common.h>
     #include <wx_python_helpers.h>
     #include <cstddef>
     #include <vector>
     #include <bitset>
 
-    #include <class_title_block.h>
+    #include <title_block.h>
     #include <class_colors_design_settings.h>
     #include <marker_base.h>
     #include <eda_text.h>
@@ -104,9 +104,9 @@ principle should be easily implemented by adapting the current STL containers.
 %include macros.h
 %include core/typeinfo.h
 %include base_struct.h
-%include class_eda_rect.h
+%include eda_rect.h
 %include common.h
-%include class_title_block.h
+%include title_block.h
 %include gal/color4d.h
 %include class_colors_design_settings.h
 %include marker_base.h

common/tool/common_tools.cpp

@@ -28,7 +28,7 @@
 #include <view/view.h>
 #include <view/view_controls.h>
 #include <gal/graphics_abstraction_layer.h>
-#include <class_base_screen.h>
+#include <base_screen.h>
 
 #include <tool/common_tools.h>
 

common/tool/grid_menu.cpp

@@ -26,7 +26,7 @@
 #include <tool/grid_menu.h>
 #include <id.h>
 #include <draw_frame.h>
-#include <class_base_screen.h>
+#include <base_screen.h>
 #include <tool/actions.h>
 #include <bitmaps.h>