Trim includes (and use consistent terminology in error messages).

2021-03-21 11:24:55 +00:00 · 2021-03-21 11:24:55 +00:00 · 8be213e36f
parent a9eb83201e
commit 8be213e36f
24 changed files with 6 additions and 94 deletions
--- a/pcbnew/router/length_tuner_tool.cpp
+++ b/pcbnew/router/length_tuner_tool.cpp
@ -19,21 +19,10 @@
 * with this program.  If not, see <http://www.gnu.org/licenses/>.
 */

-#include <core/optional.h>
-
 #include "class_draw_panel_gal.h"
-#include "board.h"
-
-#include <pcb_edit_frame.h>
-#include <pcbnew_id.h>
-#include <view/view_controls.h>
-#include <pcb_painter.h>
-#include <dialogs/dialog_pns_settings.h>
 #include <dialogs/dialog_pns_length_tuning_settings.h>
-#include <tool/action_menu.h>
 #include <tool/tool_manager.h>
 #include <tools/pcb_actions.h>
-#include "pns_segment.h"
 #include "pns_router.h"
 #include "pns_meander_placer.h" // fixme: move settings to separate header
 #include "pns_tune_status_popup.h"
--- a/pcbnew/router/pns_arc.cpp
+++ b/pcbnew/router/pns_arc.cpp
@ -20,11 +20,7 @@

 #include "pns_arc.h"
 #include "pns_node.h"
-#include "pns_router.h"
 #include "pns_utils.h"
-#include "pns_via.h"
-
-#include <geometry/shape_rect.h>

 namespace PNS {

--- a/pcbnew/router/pns_arc.h
+++ b/pcbnew/router/pns_arc.h
@ -24,7 +24,6 @@
 #include <math/vector2d.h>

 #include <geometry/shape_arc.h>
-#include <geometry/shape_segment.h>
 #include <geometry/shape_line_chain.h>

 #include "pns_line.h"
--- a/pcbnew/router/pns_component_dragger.cpp
+++ b/pcbnew/router/pns_component_dragger.cpp
@ -22,7 +22,6 @@

 #include "pns_line.h"
 #include "pns_solid.h"
-#include "pns_via.h"
 #include "pns_router.h"

 #include "pns_component_dragger.h"
--- a/pcbnew/router/pns_component_dragger.h
+++ b/pcbnew/router/pns_component_dragger.h
@ -24,10 +24,6 @@
 #include <math/vector2d.h>

 #include "pns_drag_algo.h"
-#include "pns_itemset.h"
-#include "pns_line.h"
-#include "pns_node.h"
-#include "pns_via.h"

 namespace PNS
 {
--- a/pcbnew/router/pns_diff_pair.cpp
+++ b/pcbnew/router/pns_diff_pair.cpp
@ -24,18 +24,10 @@
 #include <cmath>
 #include <limits>

-#include <geometry/direction45.h>
-#include <geometry/shape.h>
 #include <geometry/shape_rect.h>
-#include <geometry/shape_circle.h>
-#include <geometry/shape_segment.h>
-

 #include "pns_diff_pair.h"
 #include "pns_router.h"
-#include "pns_solid.h"
-#include "pns_utils.h"
-#include "pns_debug_decorator.h"

 namespace PNS {

--- a/pcbnew/router/pns_diff_pair.h
+++ b/pcbnew/router/pns_diff_pair.h
@ -25,9 +25,6 @@

 #include <vector>

-#include <geometry/shape.h>
-#include <geometry/shape_line_chain.h>
-
 #include "pns_line.h"
 #include "pns_via.h"
 #include "pns_link_holder.h"
--- a/pcbnew/router/pns_diff_pair_placer.cpp
+++ b/pcbnew/router/pns_diff_pair_placer.cpp
@ -19,14 +19,8 @@
 * with this program.  If not, see <http://www.gnu.org/licenses/>.
 */

-#include <board.h>
-#include <board_item.h>
-#include <netinfo.h>
-
-#include "pns_node.h"
 #include "pns_walkaround.h"
 #include "pns_shove.h"
-#include "pns_utils.h"
 #include "pns_router.h"
 #include "pns_diff_pair_placer.h"
 #include "pns_solid.h"
--- a/pcbnew/router/pns_diff_pair_placer.h
+++ b/pcbnew/router/pns_diff_pair_placer.h
@ -25,9 +25,6 @@

 #include <math/vector2d.h>

-#include <geometry/shape.h>
-#include <geometry/shape_line_chain.h>
-
 #include "pns_sizes_settings.h"
 #include "pns_node.h"
 #include "pns_via.h"
--- a/pcbnew/router/pns_dp_meander_placer.cpp
+++ b/pcbnew/router/pns_dp_meander_placer.cpp
@ -29,7 +29,6 @@
 #include "pns_dp_meander_placer.h"
 #include "pns_diff_pair.h"
 #include "pns_router.h"
-#include "pns_utils.h"

 namespace PNS {

--- a/pcbnew/router/pns_kicad_iface.cpp
+++ b/pcbnew/router/pns_kicad_iface.cpp
@ -32,10 +32,6 @@
 #include <geometry/convex_hull.h>
 #include <confirm.h>

-#include <view/view.h>
-#include <view/view_item.h>
-#include <view/view_group.h>
-
 #include <pcb_painter.h>

 #include <geometry/shape.h>
@ -50,8 +46,6 @@

 #include <advanced_config.h>

-#include "tools/pcb_tool_base.h"
-
 #include "pns_kicad_iface.h"

 #include "pns_arc.h"
@ -1007,10 +1001,9 @@ bool PNS_KICAD_IFACE_BASE::syncZone( PNS::NODE* aWorld, ZONE* aZone, SHAPE_POLY_
        KIDIALOG dlg( nullptr, wxString::Format( _( "%s is malformed." ),
                                                 aZone->GetSelectMenuText( units ) ),
                      KIDIALOG::KD_WARNING );
-        dlg.ShowDetailedText( wxString::Format( _( "This zone cannot be handled by the track "
-                                                   "layout tool.\n"
-                                                   "Please verify it is not a "
-                                                   "self-intersecting polygon." ) ) );
+        dlg.ShowDetailedText( wxString::Format( _( "This zone cannot be handled by the router.\n"
+                                                   "Please verify it is not a self-intersecting "
+                                                   "polygon." ) ) );
        dlg.DoNotShowCheckbox( __FILE__, __LINE__ );
        dlg.ShowModal();

--- a/pcbnew/router/pns_line.cpp
+++ b/pcbnew/router/pns_line.cpp
@ -28,7 +28,6 @@
 #include "pns_node.h"
 #include "pns_via.h"
 #include "pns_utils.h"
-#include "pns_router.h"

 #include <geometry/shape_rect.h>

--- a/pcbnew/router/pns_logger.cpp
+++ b/pcbnew/router/pns_logger.cpp
@ -22,15 +22,6 @@
 #include "pns_logger.h"
 #include "pns_item.h"
 #include "pns_via.h"
-#include "pns_line.h"
-#include "pns_segment.h"
-#include "pns_solid.h"
-
-#include <geometry/shape.h>
-#include <geometry/shape_line_chain.h>
-#include <geometry/shape_rect.h>
-#include <geometry/shape_circle.h>
-#include <geometry/shape_simple.h>

 namespace PNS {

--- a/pcbnew/router/pns_meander.cpp
+++ b/pcbnew/router/pns_meander.cpp
@ -23,7 +23,6 @@

 #include "pns_node.h"
 #include "pns_itemset.h"
-#include "pns_topology.h"
 #include "pns_meander.h"
 #include "pns_meander_placer_base.h"
 #include "pns_router.h"
--- a/pcbnew/router/pns_meander_placer.h
+++ b/pcbnew/router/pns_meander_placer.h
@ -25,11 +25,9 @@

 #include <math/vector2d.h>

-#include <geometry/shape.h>
 #include <geometry/shape_line_chain.h>

 #include "pns_node.h"
-#include "pns_via.h"
 #include "pns_line.h"
 #include "pns_placement_algo.h"
 #include "pns_meander.h"
--- a/pcbnew/router/pns_meander_placer_base.h
+++ b/pcbnew/router/pns_meander_placer_base.h
@ -25,11 +25,9 @@

 #include <math/vector2d.h>

-#include <geometry/shape.h>
 #include <geometry/shape_line_chain.h>

 #include "pns_node.h"
-#include "pns_via.h"
 #include "pns_line.h"
 #include "pns_placement_algo.h"
 #include "pns_meander.h"
--- a/pcbnew/router/pns_mouse_trail_tracer.h
+++ b/pcbnew/router/pns_mouse_trail_tracer.h
@ -24,7 +24,6 @@
 #include <math/vector2d.h>

 #include <geometry/direction45.h>
-#include <geometry/shape.h>
 #include <geometry/shape_line_chain.h>

 namespace PNS {
--- a/pcbnew/router/pns_node.h
+++ b/pcbnew/router/pns_node.h
@ -26,12 +26,8 @@
 #include <vector>
 #include <list>
 #include <unordered_set>
-#include <unordered_map>
-
-#include <core/optional.h>
 #include <core/minoptmax.h>

-#include <geometry/shape.h>
 #include <geometry/shape_line_chain.h>
 #include <geometry/shape_index.h>

--- a/pcbnew/router/pns_optimizer.cpp
+++ b/pcbnew/router/pns_optimizer.cpp
@ -22,7 +22,6 @@
 #include <geometry/shape_line_chain.h>
 #include <geometry/shape_rect.h>
 #include <geometry/shape_simple.h>
-#include <geometry/shape_file_io.h>

 #include <cmath>

--- a/pcbnew/router/pns_router.h
+++ b/pcbnew/router/pns_router.h
@ -23,18 +23,12 @@
 #define __PNS_ROUTER_H

 #include <list>
-
 #include <memory>
 #include <core/optional.h>
-
-#include <layers_id_colors_and_visibility.h>
-#include <geometry/shape_line_chain.h>
 #include <math/box2.h>

 #include "pns_routing_settings.h"
 #include "pns_sizes_settings.h"
-#include "pns_item.h"
-#include "pns_itemset.h"
 #include "pns_node.h"

 namespace KIGFX
--- a/pcbnew/router/pns_tool_base.cpp
+++ b/pcbnew/router/pns_tool_base.cpp
@ -23,24 +23,15 @@
 #include <functional>
 using namespace std::placeholders;

-#include <id.h>
-#include <view/view.h>
 #include <pcb_painter.h>
 #include <pcbnew_settings.h>

 #include <tools/pcb_grid_helper.h>
-#include <tools/pcb_actions.h>
-#include <tool/tool_manager.h>

-#include "pns_arc.h"
 #include "pns_kicad_iface.h"
 #include "pns_tool_base.h"
-#include "pns_segment.h"
+#include "pns_arc.h"
 #include "pns_solid.h"
-#include "pns_via.h"
-#include "pns_router.h"
-#include "pns_meander_placer.h" // fixme: move settings to separate header
-#include "pns_topology.h"


 using namespace KIGFX;
--- a/pcbnew/router/pns_tune_status_popup.h
+++ b/pcbnew/router/pns_tune_status_popup.h
@ -37,7 +37,7 @@ class ROUTER;
 class PNS_TUNE_STATUS_POPUP : public STATUS_TEXT_POPUP
 {
 public:
-    PNS_TUNE_STATUS_POPUP( EDA_DRAW_FRAME* aParent ) :
+    PNS_TUNE_STATUS_POPUP( wxWindow* aParent ) :
        STATUS_TEXT_POPUP( aParent )
    { }
    
--- a/pcbnew/router/router_preview_item.cpp
+++ b/pcbnew/router/router_preview_item.cpp
@ -21,11 +21,9 @@

 #include <deque>
 #include <gal/color4d.h>
-#include <view/view.h>

 #include <geometry/shape_rect.h>
 #include <geometry/shape_simple.h>
-#include "track.h"
 #include <pcb_painter.h>

 #include "router_preview_item.h"
--- a/pcbnew/router/router_preview_item.h
+++ b/pcbnew/router/router_preview_item.h
@ -35,9 +35,8 @@
 #include <geometry/shape_circle.h>

 #include <gal/color4d.h>
-#include <gal/graphics_abstraction_layer.h>

-#include <layers_id_colors_and_visibility.h>
+#include <eda_item.h>

 namespace PNS {