Rename a few files

3d-viewer/3d_canvas/create_3Dgraphic_brd_items.cpp

@@ -50,7 +50,7 @@
 #include <class_text_mod.h>
 #include <convert_basic_shapes_to_polygon.h>
 #include <trigo.h>
-#include <drawtxt.h>
+#include <draw_graphic_text.h>
 #include <utility>
 #include <vector>
 

3d-viewer/3d_canvas/create_layer_items.cpp

@@ -50,7 +50,6 @@
 #include <class_text_mod.h>
 #include <convert_basic_shapes_to_polygon.h>
 #include <trigo.h>
-#include <drawtxt.h>
 #include <utility>
 #include <vector>
 

common/class_marker_base.cpp

@@ -1,8 +1,8 @@
 /*
  * 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) 2014 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
@@ -38,7 +38,7 @@
 #include "common.h"
 #include "macros.h"
 #include "class_drawpanel.h"
-#include "class_marker_base.h"
+#include "marker_base.h"
 #include "dialog_display_info_HTML_base.h"
 
 

common/eda_text.cpp

@@ -28,7 +28,7 @@
  */
 
 #include <eda_text.h>
-#include <drawtxt.h>
+#include <draw_graphic_text.h>
 #include <class_eda_rect.h>
 #include <macros.h>
 #include <trigo.h>               // RotatePoint

common/page_layout/class_worksheet_dataitem.cpp

@@ -55,7 +55,7 @@
  */
 
 #include <fctsys.h>
-#include <drawtxt.h>
+#include <draw_graphic_text.h>
 #include <class_eda_rect.h>
 #include <worksheet.h>
 #include <class_title_block.h>

common/page_layout/class_worksheet_layout.cpp

@@ -51,7 +51,7 @@
 
 #include <fctsys.h>
 #include <kiface_i.h>
-#include <drawtxt.h>
+#include <draw_graphic_text.h>
 #include <worksheet.h>
 #include <class_title_block.h>
 #include <worksheet_shape_builder.h>

common/page_layout/page_layout_graphic_items.cpp

@@ -54,7 +54,7 @@
 
 #include <fctsys.h>
 #include <class_eda_rect.h>
-#include <drawtxt.h>
+#include <draw_graphic_text.h>
 #include <worksheet.h>
 #include <class_title_block.h>
 #include <worksheet_shape_builder.h>

common/page_layout/title_block_shapes.cpp

@@ -55,7 +55,7 @@
  */
 
 #include <fctsys.h>
-#include <drawtxt.h>
+#include <draw_graphic_text.h>
 #include <class_page_info.h>
 #include <worksheet.h>
 #include <class_title_block.h>

common/plotters/common_plot_functions.cpp

@@ -32,7 +32,7 @@
 #include <plotter.h>
 #include <worksheet.h>
 #include <class_base_screen.h>
-#include <drawtxt.h>
+#include <draw_graphic_text.h>
 #include <class_title_block.h>
 #include "worksheet_shape_builder.h"
 #include "class_worksheet_dataitem.h"

common/plotters/plotter.cpp

@@ -46,7 +46,7 @@
 #include <plotter.h>
 #include <macros.h>
 #include <class_base_screen.h>
-#include <drawtxt.h>
+#include <draw_graphic_text.h>
 #include <geometry/shape_line_chain.h>
 
 

common/worksheet.cpp

@@ -36,7 +36,6 @@
 #include <common.h>
 #include <class_drawpanel.h>
 #include <class_base_screen.h>
-#include <drawtxt.h>
 #include <draw_frame.h>
 #include <worksheet.h>
 #include <class_title_block.h>

eeschema/class_drc_erc_item.cpp

@@ -28,7 +28,7 @@
 #include <fctsys.h>
 #include <common.h>
 
-#include <class_drc_item.h>
+#include <drc_item.h>
 #include <erc.h>
 #include <base_units.h>
 

eeschema/dialogs/dialog_edit_label.cpp

@@ -3,7 +3,7 @@
  *
  * Copyright (C) 2013 Jean-Pierre Charras, jp.charras at wanadoo.fr
  * Copyright (C) 2013 Wayne Stambaugh <stambaughw@verizon.net>
- * Copyright (C) 1992-2013 KiCad Developers, see AUTHORS.txt for contributors.
+ * 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
@@ -36,7 +36,7 @@
 
 #include <class_drawpanel.h>
 #include <general.h>
-#include <drawtxt.h>
+#include <draw_graphic_text.h>
 #include <confirm.h>
 #include <sch_text.h>
 #include <typeinfo>

eeschema/edit_label.cpp

@@ -1,8 +1,8 @@
 /*
  * This program source code file is part of KiCad, a free EDA CAD application.
  *
- * Copyright (C) 2013 Jean-Pierre Charras, jp.charras at wanadoo.fr
+ * Copyright (C) 2018 Jean-Pierre Charras, jp.charras at wanadoo.fr
- * Copyright (C) 2004-2013 KiCad Developers, see change_log.txt for contributors.
+ * Copyright (C) 2004-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
@@ -30,7 +30,7 @@
 #include <fctsys.h>
 #include <gr_basic.h>
 #include <base_struct.h>
-#include <drawtxt.h>
+#include <draw_graphic_text.h>
 #include <class_drawpanel.h>
 #include <confirm.h>
 #include <schframe.h>

eeschema/lib_field.cpp

@@ -31,7 +31,7 @@
 #include <gr_basic.h>
 #include <macros.h>
 #include <base_struct.h>
-#include <drawtxt.h>
+#include <draw_graphic_text.h>
 #include <kicad_string.h>
 #include <class_drawpanel.h>
 #include <plotter.h>

eeschema/lib_pin.cpp

@@ -35,7 +35,7 @@
 #include <macros.h>
 #include <trigo.h>
 #include <class_drawpanel.h>
-#include <drawtxt.h>
+#include <draw_graphic_text.h>
 #include <plotter.h>
 #include <schframe.h>
 #include <base_units.h>

eeschema/lib_text.cpp

@@ -30,7 +30,7 @@
 #include <macros.h>
 #include <class_drawpanel.h>
 #include <plotter.h>
-#include <drawtxt.h>
+#include <draw_graphic_text.h>
 #include <trigo.h>
 #include <wxstruct.h>
 #include <base_units.h>

eeschema/sch_eagle_plugin.cpp

@@ -45,7 +45,7 @@
 #include <lib_pin.h>
 #include <lib_text.h>
 #include <sch_text.h>
-#include <drawtxt.h>
+#include <draw_graphic_text.h>
 #include <sch_marker.h>
 #include <sch_bus_entry.h>
 #include <eagle_parser.h>

eeschema/sch_field.cpp

@@ -39,7 +39,7 @@
 #include <class_drawpanel.h>
 #include <base_struct.h>
 #include <gr_basic.h>
-#include <drawtxt.h>
+#include <draw_graphic_text.h>
 #include <macros.h>
 #include <schframe.h>
 #include <plotter.h>

eeschema/sch_legacy_plugin.cpp

@@ -27,7 +27,7 @@
 #include <wx/filename.h>
 #include <wx/tokenzr.h>
 
-#include <drawtxt.h>
+#include <draw_graphic_text.h>
 #include <kiway.h>
 #include <kicad_string.h>
 #include <richio.h>

eeschema/sch_marker.h

@@ -31,7 +31,7 @@
 #define TYPE_SCH_MARKER_H_
 
 #include <sch_item_struct.h>
-#include <class_marker_base.h>
+#include <marker_base.h>
 
 
 /* Names for corresponding types of markers: */

eeschema/sch_sheet.cpp

@@ -29,7 +29,7 @@
 
 #include <fctsys.h>
 #include <class_drawpanel.h>
-#include <drawtxt.h>
+#include <draw_graphic_text.h>
 #include <trigo.h>
 #include <richio.h>
 #include <schframe.h>

eeschema/sch_sheet_pin.cpp

@@ -30,7 +30,7 @@
 #include <fctsys.h>
 #include <gr_basic.h>
 #include <class_drawpanel.h>
-#include <drawtxt.h>
+#include <draw_graphic_text.h>
 #include <plotter.h>
 #include <trigo.h>
 #include <richio.h>

eeschema/sch_text.cpp

@@ -33,7 +33,7 @@
 #include <macros.h>
 #include <trigo.h>
 #include <class_drawpanel.h>
-#include <drawtxt.h>
+#include <draw_graphic_text.h>
 #include <schframe.h>
 #include <plotter.h>
 #include <msgpanel.h>

gerbview/class_gbr_layout.cpp

@@ -29,7 +29,7 @@
 
 #include <fctsys.h>
 #include <gr_basic.h>
-#include <drawtxt.h>
+#include <draw_graphic_text.h>
 #include <gerbview_frame.h>
 #include <class_drawpanel.h>
 #include <class_gbr_layout.h>

gerbview/draw_gerber_screen.cpp

@@ -32,7 +32,7 @@
 #include <gr_basic.h>
 #include <common.h>
 #include <class_drawpanel.h>
-#include <drawtxt.h>
+#include <draw_graphic_text.h>
 #include <base_units.h>
 
 #include <gerbview.h>

include/drc_item.h

@@ -2,7 +2,7 @@
  * This program source code file is part of KiCad, a free EDA CAD application.
  *
  * Copyright (C) 2007 Dick Hollenbeck, dick@softplc.com
- * Copyright (C) 2007 KiCad Developers, see change_log.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
@@ -22,8 +22,8 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
  */
 
-#ifndef _CLASS_DRC_ITEM_H
+#ifndef DRC_ITEM_H
-#define _CLASS_DRC_ITEM_H
+#define DRC_ITEM_H
 
 #include <macros.h>
 
@@ -271,4 +271,4 @@ public:
 };
 
 
-#endif      // _CLASS_DRC_ITEM_H
+#endif      // DRC_ITEM_H

include/marker_base.h

@@ -23,10 +23,10 @@
  */
 
 
-#ifndef _CLASS_MARKER_BASE_H
+#ifndef MARKER_BASE_H
-#define _CLASS_MARKER_BASE_H
+#define MARKER_BASE_H
 
-#include <class_drc_item.h>
+#include <drc_item.h>
 #include <gr_basic.h>
 
 
@@ -230,4 +230,4 @@ public:
 };
 
 
-#endif      //  _CLASS_MARKER_BASE_H
+#endif      //  MARKER_BASE_H

include/plotter.h

@@ -34,7 +34,7 @@
 
 #include <vector>
 #include <math/box2.h>
-#include <drawtxt.h>
+#include <draw_graphic_text.h>
 #include <class_page_info.h>
 #include <eda_text.h>       // FILL_T
 

pcbnew/board_items_to_polygon_shape_transform.cpp

@@ -33,7 +33,7 @@
 #include <vector>
 
 #include <fctsys.h>
-#include <drawtxt.h>
+#include <draw_graphic_text.h>
 #include <pcbnew.h>
 #include <wxPcbStruct.h>
 #include <trigo.h>

pcbnew/class_drc_item.cpp

@@ -30,8 +30,8 @@
 #include <common.h>
 
 #include <pcbnew.h>
-#include <drc_stuff.h>
+#include <drc.h>
-#include <class_drc_item.h>
+#include <drc_item.h>
 #include <base_units.h>
 
 

pcbnew/class_marker_pcb.h

@@ -32,7 +32,7 @@
 
 
 #include <class_board_item.h>
-#include <class_marker_base.h>
+#include <marker_base.h>
 
 
 class MSG_PANEL_ITEM;

pcbnew/class_pad_draw_functions.cpp

@@ -34,7 +34,7 @@
 #include <trigo.h>
 #include <class_pcb_screen.h>
 #include <class_drawpanel.h>
-#include <drawtxt.h>
+#include <draw_graphic_text.h>
 #include <layers_id_colors_and_visibility.h>
 #include <wxBasePcbFrame.h>
 #include <wxPcbStruct.h>

pcbnew/class_pcb_text.cpp

@@ -32,7 +32,7 @@
 #include <wxstruct.h>
 #include <gr_basic.h>
 #include <base_struct.h>
-#include <drawtxt.h>
+#include <draw_graphic_text.h>
 #include <kicad_string.h>
 #include <trigo.h>
 #include <richio.h>

pcbnew/class_text_mod.cpp

@@ -33,7 +33,7 @@
 #include <wxstruct.h>
 #include <trigo.h>
 #include <class_drawpanel.h>
-#include <drawtxt.h>
+#include <draw_graphic_text.h>
 #include <kicad_string.h>
 #include <richio.h>
 #include <macros.h>

pcbnew/class_track.cpp

@@ -37,7 +37,7 @@
 #include <macros.h>
 #include <class_drawpanel.h>
 #include <class_pcb_screen.h>
-#include <drawtxt.h>
+#include <draw_graphic_text.h>
 #include <wxstruct.h>
 #include <wxBasePcbFrame.h>
 #include <class_board.h>

pcbnew/dialogs/dialog_drc.h

@@ -33,7 +33,7 @@
 #include <pcbnew.h>
 #include <class_drawpanel.h>
 #include <wxstruct.h>
-#include <drc_stuff.h>
+#include <drc.h>
 #include <class_marker_pcb.h>
 #include <class_board.h>
 

pcbnew/dialogs/dialog_drclistbox.h

@@ -2,7 +2,7 @@
  * This program source code file is part of KiCad, a free EDA CAD application.
  *
  * Copyright (C) 2009-2016 Dick Hollenbeck, dick@softplc.com
- * Copyright (C) 2004-2012 KiCad Developers, see change_log.txt for contributors.
+ * Copyright (C) 2004-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
@@ -32,7 +32,7 @@
 #include <pcbnew.h>
 #include <class_drawpanel.h>
 #include <wxstruct.h>
-#include <drc_stuff.h>
+#include <drc.h>
 #include <class_marker_pcb.h>
 #include <class_board.h>
 

pcbnew/dialogs/dialog_edit_module_text.cpp

@@ -36,7 +36,7 @@
 #include <common.h>
 #include <class_drawpanel.h>
 #include <pcbnew.h>
-#include <drawtxt.h>
+#include <draw_graphic_text.h>
 #include <confirm.h>
 #include <wxBasePcbFrame.h>
 #include <base_units.h>

pcbnew/dialogs/dialog_pcb_text_properties.cpp

@@ -1,8 +1,8 @@
 /*
  * This program source code file is part of KiCad, a free EDA CAD application.
  *
- * Copyright (C) 2004-2010 Jean-Pierre Charras <jean-pierre.charras@gpisa-lab.inpg.fr>
+ * Copyright (C) 2004-2018 Jean-Pierre Charras jp.charras at wanadoo.fr
- * Copyright (C) 2010-2016 KiCad Developers, see change_log.txt for contributors.
+ * Copyright (C) 2010-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
@@ -31,7 +31,7 @@
 #include <class_drawpanel.h>
 #include <pcbnew.h>
 #include <wxPcbStruct.h>
-#include <drawtxt.h>
+#include <draw_graphic_text.h>
 #include <confirm.h>
 #include <base_units.h>
 #include <wx/valnum.h>

pcbnew/dialogs/dialog_plot.cpp

@@ -41,6 +41,8 @@
 #include <wx/ffile.h>
 #include <dialog_plot.h>
 #include <wx_html_report_panel.h>
+#include <drc.h>
+
 
 DIALOG_PLOT::DIALOG_PLOT( PCB_EDIT_FRAME* aParent ) :
     DIALOG_PLOT_BASE( aParent ), m_parent( aParent ),
@@ -888,7 +890,7 @@ void DIALOG_PLOT::Plot( wxCommandEvent& event )
     }
 }
 
-#include <drc_stuff.h>
+
 void DIALOG_PLOT::onRunDRC( wxCommandEvent& event )
 {
     PCB_EDIT_FRAME* parent = dynamic_cast<PCB_EDIT_FRAME*>( GetParent() );

pcbnew/dialogs/dialog_plot.h

@@ -25,7 +25,6 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
  */
 
-//#include <fctsys.h>
 #include <class_board.h>
 #include <dialog_plot_base.h>
 #include <pcb_plot_params.h>

pcbnew/dimension.cpp

@@ -33,7 +33,7 @@
 #include <gr_basic.h>
 #include <class_drawpanel.h>
 #include <wxPcbStruct.h>
-#include <drawtxt.h>
+#include <draw_graphic_text.h>
 #include <dialog_helpers.h>
 #include <macros.h>
 #include <base_units.h>

pcbnew/drc.cpp

@@ -50,7 +50,7 @@
 #include <tools/pcb_actions.h>
 
 #include <pcbnew.h>
-#include <drc_stuff.h>
+#include <drc.h>
 
 #include <dialog_drc.h>
 #include <wx/progdlg.h>

pcbnew/drc.h

@@ -26,8 +26,8 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
  */
 
-#ifndef _DRC_STUFF_H
+#ifndef DRC_H
-#define _DRC_STUFF_H
+#define DRC_H
 
 #include <vector>
 #include <memory>
@@ -554,6 +554,6 @@ public:
 };
 
 
-#endif  // _DRC_STUFF_H
+#endif  // DRC_H
 
 //EOF

pcbnew/drc_clearance_test_functions.cpp

@@ -36,7 +36,7 @@
 #include <trigo.h>
 
 #include <pcbnew.h>
-#include <drc_stuff.h>
+#include <drc.h>
 
 #include <class_board.h>
 #include <class_module.h>

pcbnew/drc_marker_functions.cpp

@@ -7,7 +7,7 @@
  *
  * Copyright (C) 2010 Dick Hollenbeck, dick@softplc.com
  * Copyright (C) 2004-2017 Jean-Pierre Charras, jp.charras at wanadoo.fr
- * Copyright (C) 2017 KiCad Developers, see change_log.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
@@ -37,7 +37,7 @@
 #include <pcbnew.h>
 #include <class_board_design_settings.h>
 
-#include <drc_stuff.h>
+#include <drc.h>
 #include <class_pad.h>
 #include <class_track.h>
 #include <class_zone.h>

pcbnew/edit_track_width.cpp

@@ -36,7 +36,7 @@
 #include <class_track.h>
 
 #include <pcbnew.h>
-#include <drc_stuff.h>
+#include <drc.h>
 
 
 bool PCB_EDIT_FRAME::SetTrackSegmentWidth( TRACK*             aTrackItem,

pcbnew/editrack-part2.cpp

@@ -41,7 +41,7 @@
 #include <class_marker_pcb.h>
 
 #include <pcbnew.h>
-#include <drc_stuff.h>
+#include <drc.h>
 
 
 bool PCB_EDIT_FRAME::Other_Layer_Route( TRACK* aTrack, wxDC* DC )

pcbnew/editrack.cpp

@@ -34,7 +34,7 @@
 #include <wxPcbStruct.h>
 
 #include <pcbnew.h>
-#include <drc_stuff.h>
+#include <drc.h>
 #include <protos.h>
 
 #include <class_board.h>

pcbnew/edtxtmod.cpp

@@ -24,14 +24,14 @@
 
 /**
  * @file edtxtmod.cpp
- * @brief Edit module text.
+ * @brief Edit texts in footprints.
  */
 
 #include <fctsys.h>
 #include <gr_basic.h>
 #include <common.h>
 #include <class_drawpanel.h>
-#include <drawtxt.h>
+#include <draw_graphic_text.h>
 #include <trigo.h>
 #include <wxBasePcbFrame.h>
 #include <macros.h>

pcbnew/exporters/export_vrml.cpp

@@ -40,7 +40,7 @@
 #include "class_track.h"
 #include "class_zone.h"
 #include "convert_to_biu.h"
-#include "drawtxt.h"
+#include "draw_graphic_text.h"
 #include "macros.h"
 #include "pgm_base.h"
 #include "plugins/3dapi/ifsg_all.h"

pcbnew/exporters/gen_drill_report_files.cpp

@@ -31,7 +31,7 @@
 #include <common.h>
 #include <plotter.h>
 #include <base_struct.h>
-#include <drawtxt.h>
+#include <draw_graphic_text.h>
 #include <confirm.h>
 #include <kicad_string.h>
 #include <macros.h>

pcbnew/legacy_plugin.cpp

@@ -83,7 +83,6 @@
 #include <3d_cache/3d_info.h>
 #include <pcb_plot_params.h>
 #include <pcb_plot_params_parser.h>
-#include <drawtxt.h>
 #include <convert_to_biu.h>
 #include <trigo.h>
 #include <build_version.h>

pcbnew/move_or_drag_track.cpp

@@ -40,7 +40,7 @@
 #include <class_board.h>
 
 #include <pcbnew.h>
-#include <drc_stuff.h>
+#include <drc.h>
 #include <drag.h>
 #include <pcbnew_id.h>
 

pcbnew/pcbframe.cpp

@@ -41,7 +41,7 @@
 
 #include <pcbnew.h>
 #include <pcbnew_id.h>
-#include <drc_stuff.h>
+#include <drc.h>
 #include <layer_widget.h>
 #include <dialog_design_rules.h>
 #include <class_pcb_layer_widget.h>

pcbnew/plot_board_layers.cpp

@@ -33,7 +33,7 @@
 #include <common.h>
 #include <plotter.h>
 #include <base_struct.h>
-#include <drawtxt.h>
+#include <draw_graphic_text.h>
 #include <trigo.h>
 #include <wxBasePcbFrame.h>
 #include <macros.h>

pcbnew/plot_brditems_plotter.cpp

@@ -31,7 +31,7 @@
 #include <common.h>
 #include <plotter.h>
 #include <base_struct.h>
-#include <drawtxt.h>
+#include <draw_graphic_text.h>
 #include <trigo.h>
 #include <macros.h>
 #include <wxBasePcbFrame.h>

pcbnew/toolbars_update_user_interface.cpp

@@ -37,7 +37,7 @@
 #include <class_board.h>
 #include <pcbnew.h>
 #include <pcbnew_id.h>
-#include <drc_stuff.h>
+#include <drc.h>
 #include <class_pcb_layer_box_selector.h>
 
 

pcbnew/zones_by_polygon.cpp

@@ -44,7 +44,7 @@
 #include <pcbnew_id.h>
 #include <protos.h>
 #include <zones_functions_for_undo_redo.h>
-#include <drc_stuff.h>
+#include <drc.h>
 #include <connectivity_data.h>
 
 #include <widgets/progress_reporter.h>

pcbnew/zones_test_and_combine_areas.cpp

@@ -40,7 +40,7 @@
 #include <class_marker_pcb.h>
 
 #include <pcbnew.h>
-#include <drc_stuff.h>
+#include <drc.h>
 #include <math_for_graphics.h>
 
 #define STRAIGHT 0      // To be remove after math_for_graphics code cleanup