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>
 

common/tool/zoom_menu.cpp

@@ -25,7 +25,7 @@
 #include <tool/zoom_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>
 

common/worksheet.cpp

@@ -35,10 +35,10 @@
 #include <gr_basic.h>
 #include <common.h>
 #include <class_drawpanel.h>
-#include <class_base_screen.h>
+#include <base_screen.h>
 #include <draw_frame.h>
 #include <worksheet.h>
-#include <class_title_block.h>
+#include <title_block.h>
 #include <build_version.h>
 
 #include <worksheet_shape_builder.h>

common/worksheet_viewitem.cpp

@@ -32,7 +32,7 @@
 #include <gal/graphics_abstraction_layer.h>
 #include <painter.h>
 #include <layers_id_colors_and_visibility.h>
-#include <class_page_info.h>
+#include <page_info.h>
 #include <view/view.h>
 
 using namespace KIGFX;

common/zoom.cpp

@@ -34,7 +34,7 @@
 #include <id.h>
 #include <class_drawpanel.h>
 #include <view/view.h>
-#include <class_base_screen.h>
+#include <base_screen.h>
 #include <draw_frame.h>
 #include <kicad_device_context.h>
 #include <hotkeys_basic.h>

eeschema/CMakeLists.txt

@@ -220,8 +220,8 @@ set( EESCHEMA_COMMON_SRCS
     ../common/dialogs/dialog_page_settings.cpp
     ../common/base_screen.cpp
     ../common/base_units.cpp
-    ../common/class_page_info.cpp
     ../common/eda_text.cpp
+    ../common/page_info.cpp
     )
 
 

eeschema/class_sch_screen.h

@@ -34,9 +34,9 @@
 #include <dlist.h>
 #include <sch_item_struct.h>
 #include <lib_draw_item.h>
-#include <class_base_screen.h>
-#include <class_title_block.h>
-#include <class_page_info.h>
+#include <base_screen.h>
+#include <title_block.h>
+#include <page_info.h>
 #include <kiway_player.h>
 #include <sch_marker.h>
 

eeschema/dialogs/dialog_eeschema_options.cpp

@@ -27,7 +27,7 @@
  */
 
 #include <fctsys.h>
-#include <class_base_screen.h>
+#include <base_screen.h>
 
 #include <dialog_eeschema_options.h>
 #include <widgets/widget_hotkey_list.h>

eeschema/dialogs/dialog_libedit_options.cpp

@@ -28,7 +28,7 @@
  */
 
 #include <fctsys.h>
-#include <class_base_screen.h>
+#include <base_screen.h>
 
 #include <dialog_libedit_options.h>
 #include <libeditframe.h>

eeschema/lib_draw_item.h

@@ -3,7 +3,7 @@
  *
  * Copyright (C) 2015 Jean-Pierre Charras, jaen-pierre.charras at wanadoo.fr
  * Copyright (C) 2015 Wayne Stambaugh <stambaughw@gmail.com>
- * Copyright (C) 2004-2017 KiCad Developers, see change_log.txt for contributors.
+ * Copyright (C) 2004-2017 KiCad Developers, see AUTHORS.txt for contributors.
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
@@ -32,7 +32,7 @@
 #define _LIB_ITEM_H_
 
 #include <base_struct.h>
-#include <class_eda_rect.h>
+#include <eda_rect.h>
 #include <transform.h>
 #include <gr_basic.h>
 

eeschema/lib_pin.h

@@ -32,7 +32,7 @@
 
 class SCH_COMPONENT;
 
-#include <class_eda_rect.h>
+#include <eda_rect.h>
 #include <lib_draw_item.h>
 
 #include "pin_shape.h"

eeschema/libeditframe.cpp

@@ -32,7 +32,7 @@
 #include <pgm_base.h>
 #include <kiface_i.h>
 #include <class_drawpanel.h>
-#include <class_base_screen.h>
+#include <base_screen.h>
 #include <confirm.h>
 #include <eda_doc.h>
 #include <gr_basic.h>

eeschema/libeditframe.h

@@ -34,7 +34,7 @@
 #define LIBEDITFRM_H_
 
 #include <sch_base_frame.h>
-#include <class_base_screen.h>
+#include <base_screen.h>
 #include <class_sch_screen.h>
 
 #include <lib_draw_item.h>

eeschema/sch_item_struct.h

@@ -31,7 +31,7 @@
 #define SCH_ITEM_STRUCT_H
 
 #include <vector>
-#include <class_base_screen.h>
+#include <base_screen.h>
 #include <general.h>
 
 class SCH_ITEM;

eeschema/transform.cpp

@@ -26,7 +26,7 @@
 #include <trigo.h>
 #include <transform.h>
 #include <common.h>
-#include <class_eda_rect.h>
+#include <eda_rect.h>
 
 
 bool TRANSFORM::operator==( const TRANSFORM& aTransform ) const

gerbview/CMakeLists.txt

@@ -78,10 +78,10 @@ set( GERBVIEW_EXTRA_SRCS
     ../common/base_units.cpp
     ../common/eda_text.cpp
     ../common/class_layer_box_selector.cpp
-    ../common/class_page_info.cpp
     ../common/lset.cpp
     ../common/settings.cpp
     ../pcbnew/layer_widget.cpp
+    ../common/page_info.cpp
 )
 
 if( MINGW )

gerbview/class_aperture_macro.h

@@ -35,7 +35,7 @@
 
 #include <base_struct.h>
 #include <class_am_param.h>
-#include <class_eda_rect.h>
+#include <eda_rect.h>
 
 class SHAPE_POLY_SET;
 

gerbview/class_gbr_layout.h

@@ -37,12 +37,12 @@
 #include <class_colors_design_settings.h>
 #include <common.h>                         // PAGE_INFO
 #include <gerbview.h>                       // GERBER_DRAWLAYERS_COUNT
-#include <class_title_block.h>
+#include <title_block.h>
 #include <class_gerber_draw_item.h>
 #include <class_gbr_display_options.h>
 
 #include <gr_basic.h>
-#include <class_eda_rect.h>
+#include <eda_rect.h>
 
 class GERBER_FILE_IMAGE_LIST;
 

gerbview/class_gbr_screen.h

@@ -31,7 +31,7 @@
 
 #include <base_units.h>
 
-#include <class_base_screen.h>
+#include <base_screen.h>
 #include <layers_id_colors_and_visibility.h>
 
 #define ZOOM_FACTOR( x )       ( x * IU_PER_MILS )

gerbview/gerbview_frame.h

@@ -35,7 +35,7 @@
 #include <convert_to_biu.h>
 #include <class_gbr_layout.h>
 #include <class_gbr_screen.h>
-#include <class_page_info.h>
+#include <page_info.h>
 #include <class_gbr_display_options.h>
 #include <class_colors_design_settings.h>
 

gerbview/printout_control.cpp

@@ -34,7 +34,7 @@
 #include <class_drawpanel.h>
 #include <base_units.h>
 #include <wxstruct.h>
-#include <class_base_screen.h>
+#include <base_screen.h>
 
 #include <gerbview_frame.h>
 #include <class_gerber_file_image.h>

include/base_screen.h

@@ -24,12 +24,12 @@
  */
 
 /**
- * @file class_base_screen.h
+ * @file base_screen.h
  * @brief BASE_SCREEN class implementation.
  */
 
-#ifndef  CLASS_BASE_SCREEN_H_
-#define  CLASS_BASE_SCREEN_H_
+#ifndef  BASE_SCREEN_H
+#define  BASE_SCREEN_H
 
 #include <draw_frame.h>
 #include <base_struct.h>
@@ -505,4 +505,4 @@ public:
 #endif
 };
 
-#endif  // CLASS_BASE_SCREEN_H_
+#endif  // BASE_SCREEN_H

include/basic_gal.h

@@ -25,7 +25,7 @@
 #ifndef BASIC_GAL_H
 #define BASIC_GAL_H
 
-#include <class_eda_rect.h>
+#include <eda_rect.h>
 
 #include <gal/stroke_font.h>
 #include <gal/graphics_abstraction_layer.h>

include/block_commande.h

@@ -35,7 +35,7 @@
 #include <base_struct.h>
 #include <class_undoredo_container.h>
 #include <gr_basic.h>
-#include <class_eda_rect.h>
+#include <eda_rect.h>
 
 /* Block state codes. */
 typedef enum {

include/class_collector.h

@@ -35,7 +35,7 @@
 #include <fctsys.h>
 #include <base_struct.h>    // SEARCH_RESULT
 #include <common.h>         // GetNewTimeStamp()
-#include <class_eda_rect.h>
+#include <eda_rect.h>
 
 
 class EDA_ITEM;

include/class_drawpanel.h

@@ -33,7 +33,7 @@
 
 #include <base_struct.h>
 #include <gr_basic.h>
-#include <class_eda_rect.h>
+#include <eda_rect.h>
 
 
 class BASE_SCREEN;

include/eda_rect.h

@@ -1,9 +1,9 @@
 /*
  * This program source code file is part of KiCad, a free EDA CAD application.
  *
- * Copyright (C) 2014 Jean-Pierre Charras, jp.charras at wanadoo.fr
+ * Copyright (C) 2018 Jean-Pierre Charras, jp.charras at wanadoo.fr
  * Copyright (C) 2004-2014 KiCad Developers, see change_log.txt for contributors.
- * Copyright (C) 2017 KiCad Developers, see CHANGELOG.TXT for contributors.
+ * Copyright (C) 2018 KiCad Developers, see AUTHORS.txt for contributors.
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
@@ -24,11 +24,11 @@
  */
 
 /**
- * @file class_eda_rect.h
+ * @file eda_rect.h
  */
 
-#ifndef CLASS_EDA_RECT_H
-#define CLASS_EDA_RECT_H
+#ifndef EDA_RECT_H
+#define EDA_RECT_H
 
 #include <wx/gdicmn.h>
 #include <math/box2.h>
@@ -288,4 +288,4 @@ public:
 };
 
 
-#endif // CLASS_EDA_RECT_H
+#endif // EDA_RECT_H

include/page_info.h

@@ -24,11 +24,11 @@
  */
 
 /**
- * @file class_page_info.h
+ * @file page_info.h
  */
 
-#ifndef CLASS_PAGE_INFO_H_
-#define CLASS_PAGE_INFO_H_
+#ifndef PAGE_INFO_H
+#define PAGE_INFO_H
 
 #include <wx/wx.h>
 
@@ -234,4 +234,4 @@ private:
     void    setMargins();
 };
 
-#endif  // CLASS_PAGE_INFO_H_
+#endif  // PAGE_INFO_H

include/pcb_screen.h

@@ -1,8 +1,8 @@
 /*
  * This program source code file is part of KiCad, a free EDA CAD application.
  *
- * Copyright (C) 2009-2014 Jean-Pierre Charras, jp.charras at wanadoo.fr
- * Copyright (C) 1992-2014 KiCad Developers, see CHANGELOG.TXT for contributors.
+ * Copyright (C) 2009-2018 Jean-Pierre Charras, jp.charras at wanadoo.fr
+ * Copyright (C) 1992-2018 KiCad Developers, see AUTHORS.txt for contributors.
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
@@ -23,14 +23,14 @@
  */
 
 /**
- * @file class_pcb_screen.h
+ * @file pcb_screen.h
  */
 
-#ifndef CLASS_PCB_SCREEN_H_
-#define CLASS_PCB_SCREEN_H_
+#ifndef PCB_SCREEN_H
+#define PCB_SCREEN_H
 
 
-#include <class_base_screen.h>
+#include <base_screen.h>
 #include <class_board_item.h>
 
 
@@ -102,4 +102,4 @@ public:
     void ClearUndoORRedoList( UNDO_REDO_CONTAINER& aList, int aItemCount = -1 ) override;
 };
 
-#endif  // CLASS_PCB_SCREEN_H_
+#endif  // PCB_SCREEN_H

include/plotter.h

@@ -35,7 +35,7 @@
 #include <vector>
 #include <math/box2.h>
 #include <draw_graphic_text.h>
-#include <class_page_info.h>
+#include <page_info.h>
 #include <eda_text.h>       // FILL_T
 
 class SHAPE_POLY_SET;

include/title_block.h

@@ -21,8 +21,8 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
  */
 
-#ifndef CLASS_TITLE_BLOCK_H_
-#define CLASS_TITLE_BLOCK_H_
+#ifndef TITLE_BLOCK_H
+#define TITLE_BLOCK_H
 
 #include <wx/string.h>
 #include <ki_exception.h>
@@ -160,4 +160,4 @@ private:
     }
 };
 
-#endif // CLASS_TITLE_BLOCK_H_
+#endif // TITLE_BLOCK_H

include/worksheet.h

@@ -27,7 +27,7 @@
 #define WORKSHEET_H_
 
 #include <gal/color4d.h>
-#include <class_page_info.h>
+#include <page_info.h>
 
 // Forward declarations:
 class EDA_DRAW_PANEL;

include/wxBasePcbFrame.h

@@ -39,7 +39,7 @@
 #include <base_struct.h>
 #include <eda_text.h>                // EDA_DRAW_MODE_T
 #include <richio.h>
-#include <class_pcb_screen.h>
+#include <pcb_screen.h>
 #include <pcb_display_options.h>
 #include <pcb_general_settings.h>
 

pagelayout_editor/CMakeLists.txt

@@ -40,8 +40,8 @@ set( PL_EDITOR_EXTRA_SRCS
     ../common/base_screen.cpp
     ../common/base_units.cpp
     ../common/eda_text.cpp
-    ../common/class_page_info.cpp
     ../common/dialogs/dialog_page_settings.cpp
+    ../common/page_info.cpp
 )
 
 

pagelayout_editor/pl_editor_layout.cpp

@@ -31,7 +31,7 @@
 
 #include <fctsys.h>
 #include <common.h>
-#include <class_eda_rect.h>
+#include <eda_rect.h>
 #include <pl_editor_layout.h>
 
 PL_EDITOR_LAYOUT::PL_EDITOR_LAYOUT()

pagelayout_editor/pl_editor_layout.h

@@ -29,8 +29,8 @@
 #define CLASS_PL_EDITOR_LAYOUT_H
 
 #include <base_struct.h>
-#include <class_page_info.h>
-#include <class_title_block.h>
+#include <page_info.h>
+#include <title_block.h>
 
 class EDA_DRAW_PANEL;
 

pagelayout_editor/pl_editor_screen.h

@@ -31,7 +31,7 @@
 
 
 #include <base_units.h>
-#include <class_base_screen.h>
+#include <base_screen.h>
 
 class WORKSHEET_DATAITEM;
 

pcbnew/class_board.h

@@ -40,7 +40,7 @@
 #include <class_pad.h>
 #include <class_colors_design_settings.h>
 #include <class_board_design_settings.h>
-#include <class_title_block.h>
+#include <title_block.h>
 #include <class_zone_settings.h>
 #include <pcb_plot_params.h>
 #include <board_item_container.h>

pcbnew/class_drawsegment.cpp

@@ -35,7 +35,7 @@
 #include <gr_basic.h>
 #include <bezier_curves.h>
 #include <class_drawpanel.h>
-#include <class_pcb_screen.h>
+#include <pcb_screen.h>
 #include <trigo.h>
 #include <msgpanel.h>
 #include <bitmaps.h>

pcbnew/class_edge_mod.cpp

@@ -34,7 +34,7 @@
 #include <wxstruct.h>
 #include <trigo.h>
 #include <class_drawpanel.h>
-#include <class_pcb_screen.h>
+#include <pcb_screen.h>
 #include <confirm.h>
 #include <kicad_string.h>
 #include <richio.h>

pcbnew/class_pad_draw_functions.cpp

@@ -32,7 +32,7 @@
 #include <gr_basic.h>
 #include <common.h>
 #include <trigo.h>
-#include <class_pcb_screen.h>
+#include <pcb_screen.h>
 #include <class_drawpanel.h>
 #include <draw_graphic_text.h>
 #include <layers_id_colors_and_visibility.h>

pcbnew/class_track.cpp

@@ -36,7 +36,7 @@
 #include <trigo.h>
 #include <macros.h>
 #include <class_drawpanel.h>
-#include <class_pcb_screen.h>
+#include <pcb_screen.h>
 #include <draw_graphic_text.h>
 #include <wxstruct.h>
 #include <wxBasePcbFrame.h>

pcbnew/class_zone.cpp

@@ -31,7 +31,7 @@
 #include <fctsys.h>
 #include <wxstruct.h>
 #include <trigo.h>
-#include <class_pcb_screen.h>
+#include <pcb_screen.h>
 #include <class_drawpanel.h>
 #include <kicad_string.h>
 #include <richio.h>

pcbnew/classpcb.cpp

@@ -28,7 +28,7 @@
 #include <common.h>
 #include <macros.h>
 #include <trigo.h>
-#include <class_pcb_screen.h>
+#include <pcb_screen.h>
 #include <eda_text.h>                // FILLED
 #include <base_units.h>
 

pcbnew/dialogs/dialog_SVG_print.cpp

@@ -32,7 +32,7 @@
 #include <common.h>
 #include <class_drawpanel.h>
 #include <wxBasePcbFrame.h>
-#include <class_pcb_screen.h>
+#include <pcb_screen.h>
 #include <base_units.h>
 #include <convert_to_biu.h>
 #include <wildcards_and_files_ext.h>

pcbnew/pcb_parser.cpp

@@ -32,7 +32,7 @@
 #include <confirm.h>
 #include <macros.h>
 #include <trigo.h>
-#include <class_title_block.h>
+#include <title_block.h>
 
 #include <class_board.h>
 #include <class_dimension.h>

pcbnew/tools/pcbnew_control.cpp

@@ -36,7 +36,7 @@
 #include <class_module.h>
 #include <class_track.h>
 #include <class_zone.h>
-#include <class_pcb_screen.h>
+#include <pcb_screen.h>
 
 #include <confirm.h>
 #include <hotkeys.h>

polygon/PolyLine.h

@@ -52,7 +52,7 @@
 
 #include <wx/gdicmn.h>                          // for wxPoint definition
 #include <layers_id_colors_and_visibility.h>    // for LAYER_NUM definition
-#include <class_eda_rect.h>                     // for EDA_RECT definition
+#include <eda_rect.h>                     // for EDA_RECT definition
 
 #include <geometry/shape_poly_set.h> // fixme