diff --git a/common/swig/kicad.i b/common/swig/kicad.i index 5c4890238f..4eba948915 100644 --- a/common/swig/kicad.i +++ b/common/swig/kicad.i @@ -129,10 +129,6 @@ typedef long time_t; // KiCad plugin handling %include "kicadplugins.i" -// map CPolyLine and classes used in CPolyLine: -#include <../polygon/PolyLine.h> -%include <../polygon/PolyLine.h> - #include %include diff --git a/pcbnew/class_board.h b/pcbnew/class_board.h index 0761556399..9e5edddb8e 100644 --- a/pcbnew/class_board.h +++ b/pcbnew/class_board.h @@ -44,6 +44,7 @@ #include #include #include +#include #include diff --git a/pcbnew/class_drawsegment.h b/pcbnew/class_drawsegment.h index 5a90e0bf7e..ede4e269b0 100644 --- a/pcbnew/class_drawsegment.h +++ b/pcbnew/class_drawsegment.h @@ -31,7 +31,6 @@ #define CLASS_DRAWSEGMENT_H_ #include -#include #include #include #include diff --git a/pcbnew/class_module.h b/pcbnew/class_module.h index be6d497fb1..4774cecc9c 100644 --- a/pcbnew/class_module.h +++ b/pcbnew/class_module.h @@ -41,7 +41,6 @@ #include #include -#include #include "zones.h" #include diff --git a/pcbnew/class_pad.cpp b/pcbnew/class_pad.cpp index 0a67a618a7..7957be3b8a 100644 --- a/pcbnew/class_pad.cpp +++ b/pcbnew/class_pad.cpp @@ -29,7 +29,6 @@ */ #include -#include #include #include #include diff --git a/pcbnew/class_pad.h b/pcbnew/class_pad.h index f3dce2ef0b..ca533ce015 100644 --- a/pcbnew/class_pad.h +++ b/pcbnew/class_pad.h @@ -34,7 +34,7 @@ #include #include #include -#include +#include #include // PARAM_CFG_ARRAY #include "zones.h" diff --git a/pcbnew/class_pcb_text.h b/pcbnew/class_pcb_text.h index 2cab7c0fe0..afe81c8ba0 100644 --- a/pcbnew/class_pcb_text.h +++ b/pcbnew/class_pcb_text.h @@ -32,7 +32,6 @@ #include #include -#include class LINE_READER; diff --git a/pcbnew/class_zone.h b/pcbnew/class_zone.h index f116648132..7a3fa96984 100644 --- a/pcbnew/class_zone.h +++ b/pcbnew/class_zone.h @@ -36,7 +36,6 @@ #include #include #include -#include #include #include diff --git a/pcbnew/pad_custom_shape_functions.cpp b/pcbnew/pad_custom_shape_functions.cpp index 53d01287ef..c0fa4f0a0b 100644 --- a/pcbnew/pad_custom_shape_functions.cpp +++ b/pcbnew/pad_custom_shape_functions.cpp @@ -28,7 +28,6 @@ */ #include -#include #include #include diff --git a/polygon/polygon_test_point_inside.cpp b/polygon/polygon_test_point_inside.cpp index df2a34b2ad..f62b1a4c86 100644 --- a/polygon/polygon_test_point_inside.cpp +++ b/polygon/polygon_test_point_inside.cpp @@ -28,7 +28,8 @@ #include #include -#include + +#include "polygon_test_point_inside.h" /* this algo uses the the Jordan curve theorem to find if a point is inside or outside a polygon: * It run a semi-infinite line horizontally (increasing x, fixed y) @@ -49,7 +50,7 @@ #define OUTSIDE false #define INSIDE true - +#if 0 bool TestPointInsidePolygon( const CPOLYGONS_LIST& aPolysList, int aIdxstart, int aIdxend, @@ -115,7 +116,7 @@ bool TestPointInsidePolygon( const CPOLYGONS_LIST& aPolysList, return count & 1 ? INSIDE : OUTSIDE; } - +#endif /* Function TestPointInsidePolygon (overlaid) * same as previous, but use wxPoint and aCount corners diff --git a/polygon/polygon_test_point_inside.h b/polygon/polygon_test_point_inside.h index 833eba8e2a..e3834110f3 100644 --- a/polygon/polygon_test_point_inside.h +++ b/polygon/polygon_test_point_inside.h @@ -29,7 +29,12 @@ class wxPoint public: int x, y; }; +#else +#include // for wxPoint definition #endif + + +#if 0 class CPOLYGONS_LIST; /** @@ -54,6 +59,7 @@ bool TestPointInsidePolygon( const CPOLYGONS_LIST& aPolysList, * @param aRefPoint: the point coordinate to test * @return true if the point is inside, false for outside */ +#endif bool TestPointInsidePolygon( const wxPoint* aPolysList, int aCount, const wxPoint &aRefPoint );