Index: trunk/src/action_helper.c =================================================================== --- trunk/src/action_helper.c (revision 4763) +++ trunk/src/action_helper.c (revision 4764) @@ -70,8 +70,8 @@ *y = ((PinTypePtr) ptr2)->Y; break; case PCB_TYPE_LINE: - *x = ((LineTypePtr) ptr2)->Point1.X; - *y = ((LineTypePtr) ptr2)->Point1.Y; + *x = ((pcb_line_t *) ptr2)->Point1.X; + *y = ((pcb_line_t *) ptr2)->Point1.Y; break; case PCB_TYPE_TEXT: case PCB_TYPE_ELEMENT_NAME: @@ -227,7 +227,7 @@ pcb_layer_t *lastLayer; static struct { PolygonTypePtr poly; - LineType line; + pcb_line_t line; } fake; action_note_t Note; @@ -793,7 +793,7 @@ else /* create line if both ends are determined && length != 0 */ { - LineTypePtr line; + pcb_line_t *line; int maybe_found_flag; if (conf_core.editor.line_refraction @@ -1125,7 +1125,7 @@ case PCB_MODE_REMOVE: if ((type = SearchScreen(Note.X, Note.Y, REMOVE_TYPES, &ptr1, &ptr2, &ptr3)) != PCB_TYPE_NONE) { - if (TEST_FLAG(PCB_FLAG_LOCK, (LineTypePtr) ptr2)) { + if (TEST_FLAG(PCB_FLAG_LOCK, (pcb_line_t *) ptr2)) { Message(PCB_MSG_DEFAULT, _("Sorry, the object is locked\n")); break; } Index: trunk/src/change.c =================================================================== --- trunk/src/change.c (revision 4763) +++ trunk/src/change.c (revision 4764) @@ -1199,7 +1199,7 @@ } switch (Type) { case PCB_TYPE_LINE: - name = gui->prompt_for(_("Linename:"), EMPTY(((LineTypePtr) Ptr2)->Number)); + name = gui->prompt_for(_("Linename:"), EMPTY(((pcb_line_t *) Ptr2)->Number)); break; case PCB_TYPE_VIA: Index: trunk/src/crosshair.c =================================================================== --- trunk/src/crosshair.c (revision 4763) +++ trunk/src/crosshair.c (revision 4764) @@ -342,7 +342,7 @@ */ static void XORDrawInsertPointObject(void) { - LineTypePtr line = (LineTypePtr) Crosshair.AttachedObject.Ptr2; + pcb_line_t *line = (pcb_line_t *) Crosshair.AttachedObject.Ptr2; PointTypePtr point = (PointTypePtr) Crosshair.AttachedObject.Ptr3; if (Crosshair.AttachedObject.Type != PCB_TYPE_NONE) { @@ -370,7 +370,7 @@ case PCB_TYPE_LINE: { - LineTypePtr line = (LineTypePtr) Crosshair.AttachedObject.Ptr2; + pcb_line_t *line = (pcb_line_t *) Crosshair.AttachedObject.Ptr2; XORDrawAttachedLine(line->Point1.X + dx, line->Point1.Y + dy, line->Point2.X + dx, line->Point2.Y + dy, line->Thickness); break; @@ -397,10 +397,10 @@ case PCB_TYPE_LINE_POINT: { - LineTypePtr line; + pcb_line_t *line; PointTypePtr point; - line = (LineTypePtr) Crosshair.AttachedObject.Ptr2; + line = (pcb_line_t *) Crosshair.AttachedObject.Ptr2; point = (PointTypePtr) Crosshair.AttachedObject.Ptr3; if (point == &line->Point1) XORDrawAttachedLine(point->X + dx, point->Y + dy, line->Point2.X, line->Point2.Y, line->Thickness); @@ -715,7 +715,7 @@ { struct onpoint_search_info *info = (struct onpoint_search_info *) cl; CrosshairType *crosshair = info->crosshair; - LineType *line = (LineType *) box; + pcb_line_t *line = (pcb_line_t *) box; #ifdef DEBUG_ONPOINT printf("X=%ld Y=%ld X1=%ld Y1=%ld X2=%ld Y2=%ld\n", info->X, info->Y, @@ -774,7 +774,7 @@ * ATM DrawLine() only calls AddPart() internally, which invalidates * the area specified by the line's bounding box. */ - DrawLine(NULL, (LineType *) obj); + DrawLine(NULL, (pcb_line_t *) obj); break; #if 0 case ARCPOINT_TYPE: @@ -909,7 +909,7 @@ { void *ptr1, *ptr2, *ptr3; int ans; - LineType *line; + pcb_line_t *line; Coord try_x, try_y; double dx, dy; double dist; @@ -926,7 +926,7 @@ if (ans == PCB_TYPE_NONE) return; - line = (LineType *) ptr2; + line = (pcb_line_t *) ptr2; /* Allow snapping to off-grid lines when drawing new lines (on * the same layer), and when moving a line end-point @@ -1140,7 +1140,7 @@ ans = SearchScreenGridSlop(Crosshair.X, Crosshair.Y, PCB_TYPE_LINE_POINT, &ptr1, &ptr2, &ptr3); if (ans == PCB_TYPE_NONE) hid_action("PointCursor"); - else if (!TEST_FLAG(PCB_FLAG_SELECTED, (LineType *) ptr2)) + else if (!TEST_FLAG(PCB_FLAG_SELECTED, (pcb_line_t *) ptr2)) hid_actionl("PointCursor", "True", NULL); } Index: trunk/src/data.c =================================================================== --- trunk/src/data.c (revision 4763) +++ trunk/src/data.c (revision 4764) @@ -216,7 +216,7 @@ } END_LOOP; - list_map0(&layer->Line, LineType, RemoveFreeLine); + list_map0(&layer->Line, pcb_line_t, RemoveFreeLine); list_map0(&layer->Arc, ArcType, RemoveFreeArc); list_map0(&layer->Text, TextType, RemoveFreeText); POLYGON_LOOP(layer); Index: trunk/src/data.h =================================================================== --- trunk/src/data.h (revision 4763) +++ trunk/src/data.h (revision 4764) @@ -89,7 +89,7 @@ /* layer object callbacks */ typedef int (*pcb_layer_cb_t)(void *ctx, pcb_board_t *pcb, pcb_layer_t *layer, int enter); -typedef void (*pcb_line_cb_t)(void *ctx, pcb_board_t *pcb, pcb_layer_t *layer, LineType *line); +typedef void (*pcb_line_cb_t)(void *ctx, pcb_board_t *pcb, pcb_layer_t *layer, pcb_line_t *line); typedef void (*pcb_arc_cb_t)(void *ctx, pcb_board_t *pcb, pcb_layer_t *layer, ArcType *arc); typedef void (*pcb_text_cb_t)(void *ctx, pcb_board_t *pcb, pcb_layer_t *layer, TextType *text); typedef void (*pcb_poly_cb_t)(void *ctx, pcb_board_t *pcb, pcb_layer_t *layer, PolygonType *poly); @@ -96,7 +96,7 @@ /* element callbacks */ typedef int (*pcb_element_cb_t)(void *ctx, pcb_board_t *pcb, ElementType *element, int enter); -typedef void (*pcb_eline_cb_t)(void *ctx, pcb_board_t *pcb, ElementType *element, LineType *line); +typedef void (*pcb_eline_cb_t)(void *ctx, pcb_board_t *pcb, ElementType *element, pcb_line_t *line); typedef void (*pcb_earc_cb_t)(void *ctx, pcb_board_t *pcb, ElementType *element, ArcType *arc); typedef void (*pcb_etext_cb_t)(void *ctx, pcb_board_t *pcb, ElementType *element, TextType *text); typedef void (*pcb_epin_cb_t)(void *ctx, pcb_board_t *pcb, ElementType *element, PinType *pin); Index: trunk/src/draw.c =================================================================== --- trunk/src/draw.c (revision 4763) +++ trunk/src/draw.c (revision 4764) @@ -511,7 +511,7 @@ case PCB_TYPE_LINE: case PCB_TYPE_ELEMENT_LINE: case PCB_TYPE_RATLINE: - EraseLine((LineTypePtr) ptr); + EraseLine((pcb_line_t *) ptr); break; case PCB_TYPE_PAD: ErasePad((PadTypePtr) ptr); @@ -535,7 +535,7 @@ break; case PCB_TYPE_LINE: if (((pcb_layer_t *) ptr1)->On) - DrawLine((pcb_layer_t *) ptr1, (LineTypePtr) ptr2); + DrawLine((pcb_layer_t *) ptr1, (pcb_line_t *) ptr2); break; case PCB_TYPE_ARC: if (((pcb_layer_t *) ptr1)->On) Index: trunk/src/find.c =================================================================== --- trunk/src/find.c (revision 4763) +++ trunk/src/find.c (revision 4764) @@ -98,7 +98,7 @@ (((PadTypePtr *)PadList[(L)].Data)[(I)]) #define LINELIST_ENTRY(L,I) \ - (((LineTypePtr *)LineList[(L)].Data)[(I)]) + (((pcb_line_t **)LineList[(L)].Data)[(I)]) #define ARCLIST_ENTRY(L,I) \ (((ArcTypePtr *)ArcList[(L)].Data)[(I)]) @@ -155,12 +155,12 @@ static pcb_bool LookupLOConnectionsToLOList(pcb_bool); static pcb_bool LookupPVConnectionsToLOList(pcb_bool); static pcb_bool LookupPVConnectionsToPVList(void); -static pcb_bool LookupLOConnectionsToLine(LineTypePtr, pcb_cardinal_t, pcb_bool); +static pcb_bool LookupLOConnectionsToLine(pcb_line_t *, pcb_cardinal_t, pcb_bool); static pcb_bool LookupLOConnectionsToPad(PadTypePtr, pcb_cardinal_t); static pcb_bool LookupLOConnectionsToPolygon(PolygonTypePtr, pcb_cardinal_t); static pcb_bool LookupLOConnectionsToArc(ArcTypePtr, pcb_cardinal_t); static pcb_bool LookupLOConnectionsToRatEnd(PointTypePtr, pcb_cardinal_t); -static pcb_bool IsRatPointOnLineEnd(PointTypePtr, LineTypePtr); +static pcb_bool IsRatPointOnLineEnd(PointTypePtr, pcb_line_t *); static pcb_bool ArcArcIntersect(ArcTypePtr, ArcTypePtr); static pcb_bool PrintElementConnections(ElementTypePtr, FILE *, pcb_bool); static pcb_bool ListsEmpty(pcb_bool); Index: trunk/src/find.h =================================================================== --- trunk/src/find.h (revision 4763) +++ trunk/src/find.h (revision 4764) @@ -60,10 +60,10 @@ #define SILK_TYPE \ (PCB_TYPE_LINE | PCB_TYPE_ARC | PCB_TYPE_POLYGON) -pcb_bool LineLineIntersect(LineTypePtr, LineTypePtr); -pcb_bool LineArcIntersect(LineTypePtr, ArcTypePtr); -pcb_bool PinLineIntersect(PinTypePtr, LineTypePtr); -pcb_bool LinePadIntersect(LineTypePtr, PadTypePtr); +pcb_bool LineLineIntersect(pcb_line_t *, pcb_line_t *); +pcb_bool LineArcIntersect(pcb_line_t *, ArcTypePtr); +pcb_bool PinLineIntersect(PinTypePtr, pcb_line_t *); +pcb_bool LinePadIntersect(pcb_line_t *, PadTypePtr); pcb_bool ArcPadIntersect(ArcTypePtr, PadTypePtr); pcb_bool IsPolygonInPolygon(PolygonTypePtr, PolygonTypePtr); void LookupElementConnections(ElementTypePtr, FILE *); @@ -84,7 +84,7 @@ void SaveFindFlag(int); void RestoreFindFlag(void); int DRCAll(void); -pcb_bool IsLineInPolygon(LineTypePtr, PolygonTypePtr); +pcb_bool IsLineInPolygon(pcb_line_t *, PolygonTypePtr); pcb_bool IsArcInPolygon(ArcTypePtr, PolygonTypePtr); pcb_bool IsPadInPolygon(PadTypePtr, PolygonTypePtr); Index: trunk/src/find_deadcode.c =================================================================== --- trunk/src/find_deadcode.c (revision 4763) +++ trunk/src/find_deadcode.c (revision 4764) @@ -31,7 +31,7 @@ static int LOT_Linecallback(const pcb_box_t * b, void *cl) { - LineTypePtr line = (LineTypePtr) b; + pcb_line_t *line = (pcb_line_t *) b; struct lo_info *i = (struct lo_info *) cl; if (!TEST_FLAG(TheFlag, line) && LineLineIntersect(&i->line, line)) @@ -62,7 +62,7 @@ return 0; } -static pcb_bool PVTouchesLine(LineTypePtr line) +static pcb_bool PVTouchesLine(pcb_line_t *line) { struct lo_info info; @@ -80,7 +80,7 @@ return (pcb_false); } -static pcb_bool LOTouchesLine(LineTypePtr Line, pcb_cardinal_t LayerGroup) +static pcb_bool LOTouchesLine(pcb_line_t *Line, pcb_cardinal_t LayerGroup) { pcb_cardinal_t entry; struct lo_info info; @@ -135,7 +135,7 @@ * doesn't include rat-lines in the search */ -pcb_bool lineClear(LineTypePtr line, pcb_cardinal_t group) +pcb_bool lineClear(pcb_line_t *line, pcb_cardinal_t group) { if (LOTouchesLine(line, group)) return (pcb_false); Index: trunk/src/find_drc.c =================================================================== --- trunk/src/find_drc.c (revision 4763) +++ trunk/src/find_drc.c (revision 4764) @@ -132,7 +132,7 @@ switch (thing_type) { case PCB_TYPE_LINE: { - LineTypePtr line = (LineTypePtr) thing_ptr3; + pcb_line_t *line = (pcb_line_t *) thing_ptr3; *x = (line->Point1.X + line->Point2.X) / 2; *y = (line->Point1.Y + line->Point2.Y) / 2; break; @@ -232,7 +232,7 @@ int *object_type_list; DrcViolationType *violation; - LineTypePtr line = (LineTypePtr) ptr2; + pcb_line_t *line = (pcb_line_t *) ptr2; ArcTypePtr arc = (ArcTypePtr) ptr2; PinTypePtr pin = (PinTypePtr) ptr2; PadTypePtr pad = (PadTypePtr) ptr2; Index: trunk/src/find_geo.c =================================================================== --- trunk/src/find_geo.c (revision 4763) +++ trunk/src/find_geo.c (revision 4764) @@ -231,7 +231,7 @@ /* --------------------------------------------------------------------------- * Tests if point is same as line end point */ -static pcb_bool IsRatPointOnLineEnd(PointTypePtr Point, LineTypePtr Line) +static pcb_bool IsRatPointOnLineEnd(PointTypePtr Point, pcb_line_t *Line) { if ((Point->X == Line->Point1.X && Point->Y == Line->Point1.Y) || (Point->X == Line->Point2.X && Point->Y == Line->Point2.Y)) @@ -239,7 +239,7 @@ return (pcb_false); } -static void form_slanted_rectangle(PointType p[4], LineTypePtr l) +static void form_slanted_rectangle(PointType p[4], pcb_line_t *l) /* writes vertices of a squared line */ { double dwx = 0, dwy = 0; @@ -319,7 +319,7 @@ * Also note that the denominators of eqn 1 & 2 are identical. * */ -pcb_bool LineLineIntersect(LineTypePtr Line1, LineTypePtr Line2) +pcb_bool LineLineIntersect(pcb_line_t *Line1, pcb_line_t *Line2) { double s, r; double line1_dx, line1_dy, line2_dx, line2_dy, point1_dx, point1_dy; @@ -416,7 +416,7 @@ * * The end points are hell so they are checked individually */ -pcb_bool LineArcIntersect(LineTypePtr Line, ArcTypePtr Arc) +pcb_bool LineArcIntersect(pcb_line_t *Line, ArcTypePtr Arc) { double dx, dy, dx1, dy1, l, d, r, r2, Radius; pcb_box_t *box; @@ -500,7 +500,7 @@ * - check the two end points of the line. If none of them matches * - check all segments of the polygon against the line. */ -pcb_bool IsLineInPolygon(LineTypePtr Line, PolygonTypePtr Polygon) +pcb_bool IsLineInPolygon(pcb_line_t *Line, PolygonTypePtr Polygon) { pcb_box_t *Box = (pcb_box_t *) Line; POLYAREA *lp; @@ -537,7 +537,7 @@ */ pcb_bool IsPadInPolygon(PadTypePtr pad, PolygonTypePtr polygon) { - return IsLineInPolygon((LineTypePtr) pad, polygon); + return IsLineInPolygon((pcb_line_t *) pad, polygon); } /* --------------------------------------------------------------------------- @@ -568,7 +568,7 @@ if (Bloat > 0) { PLINE *c; for (c = P1->Clipped->contours; c; c = c->next) { - LineType line; + pcb_line_t line; VNODE *v = &c->head; if (c->xmin - Bloat <= P2->Clipped->contours->xmax && c->xmax + Bloat >= P2->Clipped->contours->xmin && @@ -599,14 +599,14 @@ * some of the 'pad' routines are the same as for lines because the 'pad' * struct starts with a line struct. See global.h for details */ -pcb_bool LinePadIntersect(LineTypePtr Line, PadTypePtr Pad) +pcb_bool LinePadIntersect(pcb_line_t *Line, PadTypePtr Pad) { - return LineLineIntersect((Line), (LineTypePtr) Pad); + return LineLineIntersect((Line), (pcb_line_t *) Pad); } pcb_bool ArcPadIntersect(ArcTypePtr Arc, PadTypePtr Pad) { - return LineArcIntersect((LineTypePtr) (Pad), (Arc)); + return LineArcIntersect((pcb_line_t *) (Pad), (Arc)); } pcb_bool BoxBoxIntersection(pcb_box_t *b1, pcb_box_t *b2) @@ -620,7 +620,7 @@ static pcb_bool PadPadIntersect(PadTypePtr p1, PadTypePtr p2) { - return LinePadIntersect((LineTypePtr) p1, p2); + return LinePadIntersect((pcb_line_t *) p1, p2); } static inline pcb_bool PV_TOUCH_PV(PinTypePtr PV1, PinTypePtr PV2) @@ -665,7 +665,7 @@ return BoxBoxIntersection(&b1, &b2); } -pcb_bool PinLineIntersect(PinTypePtr PV, LineTypePtr Line) +pcb_bool PinLineIntersect(PinTypePtr PV, pcb_line_t *Line) { if (TEST_FLAG(PCB_FLAG_SQUARE, PV)) { int shape = GET_SQUARE(PV); Index: trunk/src/find_lookup.c =================================================================== --- trunk/src/find_lookup.c (revision 4763) +++ trunk/src/find_lookup.c (revision 4764) @@ -82,7 +82,7 @@ return pcb_false; } -static pcb_bool ADD_LINE_TO_LIST(pcb_cardinal_t L, LineTypePtr Ptr, int from_type, void *from_ptr, found_conn_type_t type) +static pcb_bool ADD_LINE_TO_LIST(pcb_cardinal_t L, pcb_line_t *Ptr, int from_type, void *from_ptr, found_conn_type_t type) { if (User) AddObjectToFlagUndoList(PCB_TYPE_LINE, LAYER_PTR(L), (Ptr), (Ptr)); @@ -241,7 +241,7 @@ if (linelist_length(&layer->Line)) { LineList[i].Size = linelist_length(&layer->Line); - LineList[i].Data = (void **) calloc(LineList[i].Size, sizeof(LineTypePtr)); + LineList[i].Data = (void **) calloc(LineList[i].Size, sizeof(pcb_line_t *)); } if (arclist_length(&layer->Arc)) { ArcList[i].Size = arclist_length(&layer->Arc); @@ -294,7 +294,7 @@ static r_dir_t LOCtoPVline_callback(const pcb_box_t * b, void *cl) { - LineTypePtr line = (LineTypePtr) b; + pcb_line_t *line = (pcb_line_t *) b; struct pv_info *i = (struct pv_info *) cl; if (!TEST_FLAG(TheFlag, line) && PinLineIntersect(&i->pv, line) && !TEST_FLAG(PCB_FLAG_HOLE, &i->pv)) { @@ -600,7 +600,7 @@ struct lo_info { pcb_cardinal_t layer; - LineType line; + pcb_line_t line; PadType pad; ArcType arc; PolygonType polygon; @@ -827,7 +827,7 @@ static r_dir_t LOCtoArcLine_callback(const pcb_box_t * b, void *cl) { - LineTypePtr line = (LineTypePtr) b; + pcb_line_t *line = (pcb_line_t *) b; struct lo_info *i = (struct lo_info *) cl; if (!TEST_FLAG(TheFlag, line) && LineArcIntersect(line, &i->arc)) { @@ -919,7 +919,7 @@ static r_dir_t LOCtoLineLine_callback(const pcb_box_t * b, void *cl) { - LineTypePtr line = (LineTypePtr) b; + pcb_line_t *line = (pcb_line_t *) b; struct lo_info *i = (struct lo_info *) cl; if (!TEST_FLAG(TheFlag, line) && LineLineIntersect(&i->line, line)) { @@ -981,7 +981,7 @@ * the notation that is used is: * Xij means Xj at line i */ -static pcb_bool LookupLOConnectionsToLine(LineTypePtr Line, pcb_cardinal_t LayerGroup, pcb_bool PolysTo) +static pcb_bool LookupLOConnectionsToLine(pcb_line_t *Line, pcb_cardinal_t LayerGroup, pcb_bool PolysTo) { pcb_cardinal_t entry; struct lo_info info; @@ -1047,7 +1047,7 @@ static r_dir_t LOCtoRat_callback(const pcb_box_t * b, void *cl) { - LineTypePtr line = (LineTypePtr) b; + pcb_line_t *line = (pcb_line_t *) b; struct rat_info *i = (struct rat_info *) cl; if (!TEST_FLAG(TheFlag, line) && @@ -1135,7 +1135,7 @@ static r_dir_t LOCtoPadLine_callback(const pcb_box_t * b, void *cl) { - LineTypePtr line = (LineTypePtr) b; + pcb_line_t *line = (pcb_line_t *) b; struct lo_info *i = (struct lo_info *) cl; if (!TEST_FLAG(TheFlag, line) && LinePadIntersect(line, &i->pad)) { @@ -1261,7 +1261,7 @@ if (!TEST_FLAG(PCB_FLAG_SQUARE, Pad)) - return (LookupLOConnectionsToLine((LineTypePtr) Pad, LayerGroup, pcb_false)); + return (LookupLOConnectionsToLine((pcb_line_t *) Pad, LayerGroup, pcb_false)); info.pad = *Pad; EXPAND_BOUNDS(&info.pad); @@ -1311,7 +1311,7 @@ static r_dir_t LOCtoPolyLine_callback(const pcb_box_t * b, void *cl) { - LineTypePtr line = (LineTypePtr) b; + pcb_line_t *line = (pcb_line_t *) b; struct lo_info *i = (struct lo_info *) cl; if (!TEST_FLAG(TheFlag, line) && IsLineInPolygon(line, &i->polygon)) { Index: trunk/src/find_misc.c =================================================================== --- trunk/src/find_misc.c (revision 4763) +++ trunk/src/find_misc.c (revision 4764) @@ -171,7 +171,7 @@ int layer = GetLayerNumber(PCB->Data, (pcb_layer_t *) ptr1); - if (ADD_LINE_TO_LIST(layer, (LineTypePtr) ptr2, 0, NULL, FCT_START)) + if (ADD_LINE_TO_LIST(layer, (pcb_line_t *) ptr2, 0, NULL, FCT_START)) return pcb_true; break; } Index: trunk/src/font.c =================================================================== --- trunk/src/font.c (revision 4763) +++ trunk/src/font.c (revision 4764) @@ -65,7 +65,7 @@ { pcb_cardinal_t i, j; SymbolTypePtr symbol; - LineTypePtr line; + pcb_line_t *line; Coord totalminy = MAX_COORD; /* calculate cell with and height (is at least DEFAULT_CELLSIZE) @@ -123,16 +123,16 @@ } /* creates a new line in a symbol */ -LineTypePtr CreateNewLineInSymbol(SymbolTypePtr Symbol, Coord X1, Coord Y1, Coord X2, Coord Y2, Coord Thickness) +pcb_line_t *CreateNewLineInSymbol(SymbolTypePtr Symbol, Coord X1, Coord Y1, Coord X2, Coord Y2, Coord Thickness) { - LineTypePtr line = Symbol->Line; + pcb_line_t *line = Symbol->Line; /* realloc new memory if necessary and clear it */ if (Symbol->LineN >= Symbol->LineMax) { Symbol->LineMax += STEP_SYMBOLLINE; - line = (LineTypePtr) realloc(line, Symbol->LineMax * sizeof(LineType)); + line = (pcb_line_t *) realloc(line, Symbol->LineMax * sizeof(pcb_line_t)); Symbol->Line = line; - memset(line + Symbol->LineN, 0, STEP_SYMBOLLINE * sizeof(LineType)); + memset(line + Symbol->LineN, 0, STEP_SYMBOLLINE * sizeof(pcb_line_t)); } /* copy values */ Index: trunk/src/font.h =================================================================== --- trunk/src/font.h (revision 4763) +++ trunk/src/font.h (revision 4764) @@ -34,7 +34,7 @@ * symbol and font related stuff */ typedef struct symbol_st { /* a single symbol */ - LineTypePtr Line; + pcb_line_t *Line; pcb_bool Valid; pcb_cardinal_t LineN; /* number of lines */ pcb_cardinal_t LineMax; /* lines allocated */ @@ -51,7 +51,7 @@ void CreateDefaultFont(pcb_board_t *pcb); void SetFontInfo(pcb_font_t *Ptr); -LineTypePtr CreateNewLineInSymbol(SymbolTypePtr Symbol, Coord X1, Coord Y1, Coord X2, Coord Y2, Coord Thickness); +pcb_line_t *CreateNewLineInSymbol(SymbolTypePtr Symbol, Coord X1, Coord Y1, Coord X2, Coord Y2, Coord Thickness); #endif Index: trunk/src/global_typedefs.h =================================================================== --- trunk/src/global_typedefs.h (revision 4763) +++ trunk/src/global_typedefs.h (revision 4764) @@ -34,7 +34,7 @@ typedef struct pcb_box_s pcb_box_t; typedef struct pcb_box_list_s pcb_box_list_t; typedef struct pcb_font_s pcb_font_t; -typedef struct pcb_line_s LineType, *LineTypePtr; +typedef struct pcb_line_s pcb_line_t; typedef struct pcb_arc_s ArcType, *ArcTypePtr; typedef struct pcb_point_s PointType, *PointTypePtr; typedef struct pcb_rat_line_s RatType, *RatTypePtr; Index: trunk/src/gui_act.c =================================================================== --- trunk/src/gui_act.c (revision 4763) +++ trunk/src/gui_act.c (revision 4764) @@ -818,7 +818,7 @@ if (SearchObjectByID(PCB->Data, &ptr1, &ptr2, &ptr3, Crosshair.drags[Crosshair.drags_current], PCB_TYPE_LINE) != PCB_TYPE_NONE) { /* line has two endpoints, check which one is close to the original x;y */ - LineType *l = ptr2; + pcb_line_t *l = ptr2; if (close_enough(Note.X, l->Point1.X) && close_enough(Note.Y, l->Point1.Y)) { Crosshair.AttachedObject.Type = PCB_TYPE_LINE_POINT; Crosshair.AttachedObject.Ptr1 = ptr1; @@ -1140,7 +1140,7 @@ switch (type) { case PCB_TYPE_LINE: notify_crosshair_change(pcb_false); - set_same_(((LineTypePtr) ptr2)->Thickness, 0, 0, ((LineTypePtr) ptr2)->Clearance / 2, NULL); + set_same_(((pcb_line_t *) ptr2)->Thickness, 0, 0, ((pcb_line_t *) ptr2)->Clearance / 2, NULL); layer = (pcb_layer_t *) ptr1; if (conf_core.editor.mode != PCB_MODE_LINE) SetMode(PCB_MODE_LINE); Index: trunk/src/ht_element.c =================================================================== --- trunk/src/ht_element.c (revision 4763) +++ trunk/src/ht_element.c (revision 4764) @@ -75,7 +75,7 @@ } -int pcb_line_eq(const ElementType *e1, const LineType *l1, const ElementType *e2, const LineType *l2) +int pcb_line_eq(const ElementType *e1, const pcb_line_t *l1, const ElementType *e2, const pcb_line_t *l2) { if (neq(l1, l2, Thickness) || neq(l1, l2, Clearance)) return 0; if (neqox(e1, l1, e2, l2, Point1.X) || neqoy(e1, l1, e2, l2, Point1.Y)) return 0; @@ -85,7 +85,7 @@ } -unsigned int pcb_line_hash(const ElementType *e, const LineType *l) +unsigned int pcb_line_hash(const ElementType *e, const pcb_line_t *l) { return h_coord(l->Thickness) ^ h_coord(l->Clearance) ^ @@ -136,7 +136,7 @@ } { - LineType *l; + pcb_line_t *l; linelist_foreach(&e->Line, &it, l) { val ^= pcb_line_hash(e, l); } @@ -185,7 +185,7 @@ } { - LineType *l1, *l2; + pcb_line_t *l1, *l2; l1 = linelist_first((linelist_t *)&e1->Line); l2 = linelist_first((linelist_t *)&e2->Line); for(;;) { Index: trunk/src/insert.c =================================================================== --- trunk/src/insert.c (revision 4763) +++ trunk/src/insert.c (revision 4764) @@ -88,7 +88,7 @@ static PointType InsertedPoint; double m; Coord x, y, m1, m2; - LineTypePtr line = (LineTypePtr) Crosshair.AttachedObject.Ptr2; + pcb_line_t *line = (pcb_line_t *) Crosshair.AttachedObject.Ptr2; if (Crosshair.AttachedObject.State == STATE_FIRST) return NULL; Index: trunk/src/obj_any.h =================================================================== --- trunk/src/obj_any.h (revision 4763) +++ trunk/src/obj_any.h (revision 4764) @@ -79,7 +79,7 @@ void *any; AnyObjectType *anyobj; PointType *point; - LineType *line; + pcb_line_t *line; TextType *text; PolygonType *polygon; ArcType *arc; Index: trunk/src/obj_elem.c =================================================================== --- trunk/src/obj_elem.c (revision 4763) +++ trunk/src/obj_elem.c (revision 4764) @@ -101,7 +101,7 @@ list_map0(&element->Pin, PinType, RemoveFreePin); list_map0(&element->Pad, PadType, RemoveFreePad); - list_map0(&element->Line, LineType, RemoveFreeLine); + list_map0(&element->Line, pcb_line_t, RemoveFreeLine); list_map0(&element->Arc, ArcType, RemoveFreeArc); FreeAttributeListMemory(&element->Attributes); @@ -108,9 +108,9 @@ reset_obj_mem(ElementType, element); } -LineType *GetElementLineMemory(ElementType *Element) +pcb_line_t *GetElementLineMemory(ElementType *Element) { - LineType *line = calloc(sizeof(LineType), 1); + pcb_line_t *line = calloc(sizeof(pcb_line_t), 1); linelist_append(&Element->Line, line); return line; @@ -210,7 +210,7 @@ slayer = &Buffer->Data->Layer[PCB->LayerGroups.Entries[group][0]]; PAD_LOOP(element); { - LineTypePtr line; + pcb_line_t *line; line = CreateNewLineOnLayer(TEST_FLAG(PCB_FLAG_ONSOLDER, pad) ? slayer : clayer, pad->Point1.X, pad->Point1.Y, pad->Point2.X, pad->Point2.Y, pad->Thickness, pad->Clearance, NoFlags()); @@ -432,7 +432,7 @@ RestoreToPolygon(Data, PCB_TYPE_PAD, Element, pad); free_rotate(&pad->Point1.X, &pad->Point1.Y, X, Y, cosa, sina); free_rotate(&pad->Point2.X, &pad->Point2.Y, X, Y, cosa, sina); - SetLineBoundingBox((LineType *) pad); + SetLineBoundingBox((pcb_line_t *) pad); } END_LOOP; ARC_LOOP(Element); @@ -623,9 +623,9 @@ } /* creates a new line for an element */ -LineTypePtr CreateNewLineInElement(ElementTypePtr Element, Coord X1, Coord Y1, Coord X2, Coord Y2, Coord Thickness) +pcb_line_t *CreateNewLineInElement(ElementTypePtr Element, Coord X1, Coord Y1, Coord X2, Coord Y2, Coord Thickness) { - LineType *line; + pcb_line_t *line; if (Thickness == 0) return NULL; Index: trunk/src/obj_elem.h =================================================================== --- trunk/src/obj_elem.h (revision 4763) +++ trunk/src/obj_elem.h (revision 4764) @@ -52,7 +52,7 @@ ElementType *GetElementMemory(pcb_data_t * data); void RemoveFreeElement(ElementType * data); void FreeElementMemory(ElementType * element); -LineType *GetElementLineMemory(ElementType *Element); +pcb_line_t *GetElementLineMemory(ElementType *Element); pcb_bool LoadElementToBuffer(pcb_buffer_t *Buffer, const char *Name); @@ -84,7 +84,7 @@ ArcTypePtr CreateNewArcInElement(ElementTypePtr Element, Coord X, Coord Y, Coord Width, Coord Height, Angle angle, Angle delta, Coord Thickness); -LineTypePtr CreateNewLineInElement(ElementTypePtr Element, Coord X1, Coord Y1, Coord X2, Coord Y2, Coord Thickness); +pcb_line_t *CreateNewLineInElement(ElementTypePtr Element, Coord X1, Coord Y1, Coord X2, Coord Y2, Coord Thickness); void AddTextToElement(TextTypePtr Text, pcb_font_t *PCBFont, Coord X, Coord Y, unsigned Direction, char *TextString, int Scale, FlagType Flags); @@ -136,7 +136,7 @@ textstring = (element)->Name[n].TextString #define ELEMENTLINE_LOOP(element) do { \ - LineType *line; \ + pcb_line_t *line; \ gdl_iterator_t __it__; \ linelist_foreach(&(element)->Line, &__it__, line) { Index: trunk/src/obj_line.c =================================================================== --- trunk/src/obj_line.c (revision 4763) +++ trunk/src/obj_line.c (revision 4764) @@ -52,17 +52,17 @@ /**** allocation ****/ /* get next slot for a line, allocates memory if necessary */ -LineType *GetLineMemory(pcb_layer_t * layer) +pcb_line_t *GetLineMemory(pcb_layer_t * layer) { - LineType *new_obj; + pcb_line_t *new_obj; - new_obj = calloc(sizeof(LineType), 1); + new_obj = calloc(sizeof(pcb_line_t), 1); linelist_append(&layer->Line, new_obj); return new_obj; } -void RemoveFreeLine(LineType * data) +void RemoveFreeLine(pcb_line_t * data) { linelist_remove(data); free(data); @@ -74,26 +74,26 @@ Coord X1, X2, Y1, Y2; Coord Thickness; FlagType Flags; - LineType test, *ans; + pcb_line_t test, *ans; jmp_buf env; }; static r_dir_t line_callback(const pcb_box_t * b, void *cl) { - LineTypePtr line = (LineTypePtr) b; + pcb_line_t *line = (pcb_line_t *) b; struct line_info *i = (struct line_info *) cl; if (line->Point1.X == i->X1 && line->Point2.X == i->X2 && line->Point1.Y == i->Y1 && line->Point2.Y == i->Y2) { - i->ans = (LineTypePtr) (-1); + i->ans = (pcb_line_t *) (-1); longjmp(i->env, 1); } /* check the other point order */ if (line->Point1.X == i->X1 && line->Point2.X == i->X2 && line->Point1.Y == i->Y1 && line->Point2.Y == i->Y2) { - i->ans = (LineTypePtr) (-1); + i->ans = (pcb_line_t *) (-1); longjmp(i->env, 1); } if (line->Point2.X == i->X1 && line->Point1.X == i->X2 && line->Point2.Y == i->Y1 && line->Point1.Y == i->Y2) { - i->ans = (LineTypePtr) - 1; + i->ans = (pcb_line_t *) - 1; longjmp(i->env, 1); } /* remove unnecessary line points */ @@ -146,7 +146,7 @@ /* creates a new line on a layer and checks for overlap and extension */ -LineTypePtr CreateDrawnLineOnLayer(pcb_layer_t *Layer, Coord X1, Coord Y1, Coord X2, Coord Y2, Coord Thickness, Coord Clearance, FlagType Flags) +pcb_line_t *CreateDrawnLineOnLayer(pcb_layer_t *Layer, Coord X1, Coord Y1, Coord X2, Coord Y2, Coord Thickness, Coord Clearance, FlagType Flags) { struct line_info info; pcb_box_t search; @@ -191,9 +191,9 @@ return CreateNewLineOnLayer(Layer, X1, Y1, X2, Y2, Thickness, Clearance, Flags); } -LineTypePtr CreateNewLineOnLayer(pcb_layer_t *Layer, Coord X1, Coord Y1, Coord X2, Coord Y2, Coord Thickness, Coord Clearance, FlagType Flags) +pcb_line_t *CreateNewLineOnLayer(pcb_layer_t *Layer, Coord X1, Coord Y1, Coord X2, Coord Y2, Coord Thickness, Coord Clearance, FlagType Flags) { - LineTypePtr Line; + pcb_line_t *Line; Line = GetLineMemory(Layer); if (!Line) @@ -213,7 +213,7 @@ return (Line); } -void pcb_add_line_on_layer(pcb_layer_t *Layer, LineType *Line) +void pcb_add_line_on_layer(pcb_layer_t *Layer, pcb_line_t *Line) { SetLineBoundingBox(Line); if (!Layer->line_tree) @@ -222,7 +222,7 @@ } /* sets the bounding box of a line */ -void SetLineBoundingBox(LineTypePtr Line) +void SetLineBoundingBox(pcb_line_t *Line) { Coord width = (Line->Thickness + Line->Clearance + 1) / 2; @@ -244,9 +244,9 @@ /*** ops ***/ /* copies a line to buffer */ -void *AddLineToBuffer(pcb_opctx_t *ctx, pcb_layer_t *Layer, LineTypePtr Line) +void *AddLineToBuffer(pcb_opctx_t *ctx, pcb_layer_t *Layer, pcb_line_t *Line) { - LineTypePtr line; + pcb_line_t *line; pcb_layer_t *layer = &ctx->buffer.dst->Layer[GetLayerNumber(ctx->buffer.src, Layer)]; line = CreateNewLineOnLayer(layer, Line->Point1.X, Line->Point1.Y, @@ -258,7 +258,7 @@ } /* moves a line to buffer */ -void *MoveLineToBuffer(pcb_opctx_t *ctx, pcb_layer_t * layer, LineType * line) +void *MoveLineToBuffer(pcb_opctx_t *ctx, pcb_layer_t * layer, pcb_line_t * line) { pcb_layer_t *lay = &ctx->buffer.dst->Layer[GetLayerNumber(ctx->buffer.src, layer)]; @@ -278,7 +278,7 @@ } /* changes the size of a line */ -void *ChangeLineSize(pcb_opctx_t *ctx, pcb_layer_t *Layer, LineTypePtr Line) +void *ChangeLineSize(pcb_opctx_t *ctx, pcb_layer_t *Layer, pcb_line_t *Line) { Coord value = (ctx->chgsize.absolute) ? ctx->chgsize.absolute : Line->Thickness + ctx->chgsize.delta; @@ -300,7 +300,7 @@ } /*changes the clearance size of a line */ -void *ChangeLineClearSize(pcb_opctx_t *ctx, pcb_layer_t *Layer, LineTypePtr Line) +void *ChangeLineClearSize(pcb_opctx_t *ctx, pcb_layer_t *Layer, pcb_line_t *Line) { Coord value = (ctx->chgsize.absolute) ? ctx->chgsize.absolute : Line->Clearance + ctx->chgsize.delta; @@ -327,7 +327,7 @@ } /* changes the name of a line */ -void *ChangeLineName(pcb_opctx_t *ctx, pcb_layer_t *Layer, LineTypePtr Line) +void *ChangeLineName(pcb_opctx_t *ctx, pcb_layer_t *Layer, pcb_line_t *Line) { char *old = Line->Number; @@ -337,7 +337,7 @@ } /* changes the clearance flag of a line */ -void *ChangeLineJoin(pcb_opctx_t *ctx, pcb_layer_t *Layer, LineTypePtr Line) +void *ChangeLineJoin(pcb_opctx_t *ctx, pcb_layer_t *Layer, pcb_line_t *Line) { if (TEST_FLAG(PCB_FLAG_LOCK, Line)) return (NULL); @@ -357,7 +357,7 @@ } /* sets the clearance flag of a line */ -void *SetLineJoin(pcb_opctx_t *ctx, pcb_layer_t *Layer, LineTypePtr Line) +void *SetLineJoin(pcb_opctx_t *ctx, pcb_layer_t *Layer, pcb_line_t *Line) { if (TEST_FLAG(PCB_FLAG_LOCK, Line) || TEST_FLAG(PCB_FLAG_CLEARLINE, Line)) return (NULL); @@ -365,7 +365,7 @@ } /* clears the clearance flag of a line */ -void *ClrLineJoin(pcb_opctx_t *ctx, pcb_layer_t *Layer, LineTypePtr Line) +void *ClrLineJoin(pcb_opctx_t *ctx, pcb_layer_t *Layer, pcb_line_t *Line) { if (TEST_FLAG(PCB_FLAG_LOCK, Line) || !TEST_FLAG(PCB_FLAG_CLEARLINE, Line)) return (NULL); @@ -373,9 +373,9 @@ } /* copies a line */ -void *CopyLine(pcb_opctx_t *ctx, pcb_layer_t *Layer, LineTypePtr Line) +void *CopyLine(pcb_opctx_t *ctx, pcb_layer_t *Layer, pcb_line_t *Line) { - LineTypePtr line; + pcb_line_t *line; line = CreateDrawnLineOnLayer(Layer, Line->Point1.X + ctx->copy.DeltaX, Line->Point1.Y + ctx->copy.DeltaY, @@ -391,7 +391,7 @@ } /* moves a line */ -void *MoveLine(pcb_opctx_t *ctx, pcb_layer_t *Layer, LineTypePtr Line) +void *MoveLine(pcb_opctx_t *ctx, pcb_layer_t *Layer, pcb_line_t *Line) { if (Layer->On) EraseLine(Line); @@ -408,7 +408,7 @@ } /* moves one end of a line */ -void *MoveLinePoint(pcb_opctx_t *ctx, pcb_layer_t *Layer, LineTypePtr Line, PointTypePtr Point) +void *MoveLinePoint(pcb_opctx_t *ctx, pcb_layer_t *Layer, pcb_line_t *Line, PointTypePtr Point) { if (Layer) { if (Layer->On) @@ -442,7 +442,7 @@ } /* moves a line between layers; lowlevel routines */ -void *MoveLineToLayerLowLevel(pcb_opctx_t *ctx, pcb_layer_t * Source, LineType * line, pcb_layer_t * Destination) +void *MoveLineToLayerLowLevel(pcb_opctx_t *ctx, pcb_layer_t * Source, pcb_line_t * line, pcb_layer_t * Destination) { r_delete_entry(Source->line_tree, (pcb_box_t *) line); @@ -477,11 +477,11 @@ longjmp(i->env, 1); } -void *MoveLineToLayer(pcb_opctx_t *ctx, pcb_layer_t * Layer, LineType * Line) +void *MoveLineToLayer(pcb_opctx_t *ctx, pcb_layer_t * Layer, pcb_line_t * Line) { struct via_info info; pcb_box_t sb; - LineTypePtr newone; + pcb_line_t *newone; void *ptr1, *ptr2, *ptr3; if (TEST_FLAG(PCB_FLAG_LOCK, Line)) { @@ -499,7 +499,7 @@ if (Layer->On) EraseLine(Line); RestoreToPolygon(PCB->Data, PCB_TYPE_LINE, Layer, Line); - newone = (LineTypePtr) MoveLineToLayerLowLevel(ctx, Layer, Line, ctx->move.dst_layer); + newone = (pcb_line_t *) MoveLineToLayerLowLevel(ctx, Layer, Line, ctx->move.dst_layer); Line = NULL; ClearFromPolygon(PCB->Data, PCB_TYPE_LINE, ctx->move.dst_layer, newone); if (ctx->move.dst_layer->On) @@ -538,7 +538,7 @@ } /* destroys a line from a layer */ -void *DestroyLine(pcb_opctx_t *ctx, pcb_layer_t *Layer, LineTypePtr Line) +void *DestroyLine(pcb_opctx_t *ctx, pcb_layer_t *Layer, pcb_line_t *Line) { r_delete_entry(Layer->line_tree, (pcb_box_t *) Line); free(Line->Number); @@ -550,12 +550,12 @@ /* remove point... */ struct rlp_info { jmp_buf env; - LineTypePtr line; + pcb_line_t *line; PointTypePtr point; }; static r_dir_t remove_point(const pcb_box_t * b, void *cl) { - LineType *line = (LineType *) b; + pcb_line_t *line = (pcb_line_t *) b; struct rlp_info *info = (struct rlp_info *) cl; if (line == info->line) return R_DIR_NOT_FOUND; @@ -575,7 +575,7 @@ } /* removes a line point, or a line if the selected point is the end */ -void *RemoveLinePoint(pcb_opctx_t *ctx, pcb_layer_t *Layer, LineTypePtr Line, PointTypePtr Point) +void *RemoveLinePoint(pcb_opctx_t *ctx, pcb_layer_t *Layer, pcb_line_t *Line, PointTypePtr Point) { PointType other; struct rlp_info info; @@ -594,7 +594,7 @@ } /* removes a line from a layer */ -void *RemoveLine_op(pcb_opctx_t *ctx, pcb_layer_t *Layer, LineTypePtr Line) +void *RemoveLine_op(pcb_opctx_t *ctx, pcb_layer_t *Layer, pcb_line_t *Line) { /* erase from screen */ if (Layer->On) { @@ -606,7 +606,7 @@ return NULL; } -void *RemoveLine(pcb_layer_t *Layer, LineTypePtr Line) +void *RemoveLine(pcb_layer_t *Layer, pcb_line_t *Line) { pcb_opctx_t ctx; @@ -618,7 +618,7 @@ } /* rotates a line in 90 degree steps */ -void RotateLineLowLevel(LineTypePtr Line, Coord X, Coord Y, unsigned Number) +void RotateLineLowLevel(pcb_line_t *Line, Coord X, Coord Y, unsigned Number) { ROTATE(Line->Point1.X, Line->Point1.Y, X, Y, Number); ROTATE(Line->Point2.X, Line->Point2.Y, X, Y, Number); @@ -645,7 +645,7 @@ /* rotates a line's point */ -void *RotateLinePoint(pcb_opctx_t *ctx, pcb_layer_t *Layer, LineTypePtr Line, PointTypePtr Point) +void *RotateLinePoint(pcb_opctx_t *ctx, pcb_layer_t *Layer, pcb_line_t *Line, PointTypePtr Point) { EraseLine(Line); if (Layer) { @@ -670,9 +670,9 @@ } /* inserts a point into a line */ -void *InsertPointIntoLine(pcb_opctx_t *ctx, pcb_layer_t *Layer, LineTypePtr Line) +void *InsertPointIntoLine(pcb_opctx_t *ctx, pcb_layer_t *Layer, pcb_line_t *Line) { - LineTypePtr line; + pcb_line_t *line; Coord X, Y; if (((Line->Point1.X == ctx->insert.x) && (Line->Point1.Y == ctx->insert.y)) || @@ -704,7 +704,7 @@ } /*** draw ***/ -void _draw_line(LineType * line) +void _draw_line(pcb_line_t * line) { gui->set_line_cap(Output.fgGC, Trace_Cap); if (conf_core.editor.thin_draw) @@ -715,7 +715,7 @@ gui->draw_line(Output.fgGC, line->Point1.X, line->Point1.Y, line->Point2.X, line->Point2.Y); } -void draw_line(pcb_layer_t * layer, LineType * line) +void draw_line(pcb_layer_t * layer, pcb_line_t * line) { const char *color; char buf[sizeof("#XXXXXX")]; @@ -743,18 +743,18 @@ r_dir_t draw_line_callback(const pcb_box_t * b, void *cl) { - draw_line((pcb_layer_t *) cl, (LineType *) b); + draw_line((pcb_layer_t *) cl, (pcb_line_t *) b); return R_DIR_FOUND_CONTINUE; } /* erases a line on a layer */ -void EraseLine(LineTypePtr Line) +void EraseLine(pcb_line_t *Line) { pcb_draw_invalidate(Line); EraseFlags(&Line->Flags); } -void DrawLine(pcb_layer_t *Layer, LineTypePtr Line) +void DrawLine(pcb_layer_t *Layer, pcb_line_t *Line) { pcb_draw_invalidate(Line); } Index: trunk/src/obj_line.h =================================================================== --- trunk/src/obj_line.h (revision 4763) +++ trunk/src/obj_line.h (revision 4764) @@ -46,23 +46,23 @@ } AttachedLineType, *AttachedLineTypePtr; -LineType *GetLineMemory(pcb_layer_t * layer); -void RemoveFreeLine(LineType * data); +pcb_line_t *GetLineMemory(pcb_layer_t * layer); +void RemoveFreeLine(pcb_line_t * data); -LineTypePtr CreateDrawnLineOnLayer(pcb_layer_t *Layer, Coord X1, Coord Y1, Coord X2, Coord Y2, Coord Thickness, Coord Clearance, FlagType Flags); -LineTypePtr CreateNewLineOnLayer(pcb_layer_t *Layer, Coord X1, Coord Y1, Coord X2, Coord Y2, Coord Thickness, Coord Clearance, FlagType Flags); +pcb_line_t *CreateDrawnLineOnLayer(pcb_layer_t *Layer, Coord X1, Coord Y1, Coord X2, Coord Y2, Coord Thickness, Coord Clearance, FlagType Flags); +pcb_line_t *CreateNewLineOnLayer(pcb_layer_t *Layer, Coord X1, Coord Y1, Coord X2, Coord Y2, Coord Thickness, Coord Clearance, FlagType Flags); /* Add objects without creating them or making any "sanity modifications" to them */ -void pcb_add_line_on_layer(pcb_layer_t *Layer, LineType *Line); +void pcb_add_line_on_layer(pcb_layer_t *Layer, pcb_line_t *Line); -void SetLineBoundingBox(LineTypePtr Line); -void *RemoveLine(pcb_layer_t *Layer, LineTypePtr Line); -void RotateLineLowLevel(LineTypePtr Line, Coord X, Coord Y, unsigned Number); +void SetLineBoundingBox(pcb_line_t *Line); +void *RemoveLine(pcb_layer_t *Layer, pcb_line_t *Line); +void RotateLineLowLevel(pcb_line_t *Line, Coord X, Coord Y, unsigned Number); /*** DRC enforcement (obj_line_drcenf.c) ***/ void AdjustAttachedLine(void); void AdjustTwoLine(pcb_bool); -void FortyFiveLine(AttachedLineTypePtr); +void FortyFiveLine(AttachedLineType *); void EnforceLineDRC(void); /* Rather than mode the line bounding box, we set it so the point bounding @@ -77,7 +77,7 @@ #define LINE_LOOP(layer) do { \ - LineType *line; \ + pcb_line_t *line; \ gdl_iterator_t __it__; \ linelist_foreach(&(layer)->Line, &__it__, line) { Index: trunk/src/obj_line_draw.h =================================================================== --- trunk/src/obj_line_draw.h (revision 4763) +++ trunk/src/obj_line_draw.h (revision 4764) @@ -31,7 +31,7 @@ r_dir_t draw_line_callback(const pcb_box_t * b, void *cl); #endif -void _draw_line(LineType * line); -void draw_line(pcb_layer_t * layer, LineType * line); -void EraseLine(LineTypePtr Line); -void DrawLine(pcb_layer_t *Layer, LineTypePtr Line); +void _draw_line(pcb_line_t * line); +void draw_line(pcb_layer_t * layer, pcb_line_t * line); +void EraseLine(pcb_line_t *Line); +void DrawLine(pcb_layer_t *Layer, pcb_line_t *Line); Index: trunk/src/obj_line_drcenf.c =================================================================== --- trunk/src/obj_line_drcenf.c (revision 4763) +++ trunk/src/obj_line_drcenf.c (revision 4764) @@ -44,7 +44,7 @@ */ void AdjustAttachedLine(void) { - AttachedLineTypePtr line = &Crosshair.AttachedLine; + AttachedLineType *line = &Crosshair.AttachedLine; /* I need at least one point */ if (line->State == STATE_FIRST) @@ -76,7 +76,7 @@ * 5 3 * 4 */ -void FortyFiveLine(AttachedLineTypePtr Line) +void FortyFiveLine(AttachedLineType *Line) { Coord dx, dy, min; unsigned direction = 0; @@ -150,7 +150,7 @@ void AdjustTwoLine(pcb_bool way) { Coord dx, dy; - AttachedLineTypePtr line = &Crosshair.AttachedLine; + AttachedLineType *line = &Crosshair.AttachedLine; if (Crosshair.AttachedLine.State == STATE_FIRST) return; @@ -194,7 +194,7 @@ } struct drc_info { - LineTypePtr line; + pcb_line_t *line; pcb_bool solder; jmp_buf env; }; @@ -221,7 +221,7 @@ static r_dir_t drcLine_callback(const pcb_box_t * b, void *cl) { - LineTypePtr line = (LineTypePtr) b; + pcb_line_t *line = (pcb_line_t *) b; struct drc_info *i = (struct drc_info *) cl; if (!TEST_FLAG(PCB_FLAG_FOUND, line) && LineLineIntersect(line, i->line)) @@ -253,7 +253,7 @@ double f, s, f2, s2, len, best; Coord dx, dy, temp, last, length; Coord temp2, last2, length2; - LineType line1, line2; + pcb_line_t line1, line2; pcb_cardinal_t group, comp; struct drc_info info; pcb_bool two_lines, x_is_long, blocker; @@ -413,7 +413,7 @@ { struct drc_info info; pcb_cardinal_t group, comp; - LineType line; + pcb_line_t line; AttachedLineType aline; static PointType last_good; /* internal state of last good endpoint - we cna do thsi cheat, because... */ Index: trunk/src/obj_line_list.h =================================================================== --- trunk/src/obj_line_list.h (revision 4763) +++ trunk/src/obj_line_list.h (revision 4764) @@ -28,7 +28,7 @@ /* List of Lines */ #define TDL(x) linelist_ ## x #define TDL_LIST_T linelist_t -#define TDL_ITEM_T LineType +#define TDL_ITEM_T pcb_line_t #define TDL_FIELD link #define TDL_SIZE_T size_t #define TDL_FUNC Index: trunk/src/obj_line_op.h =================================================================== --- trunk/src/obj_line_op.h (revision 4763) +++ trunk/src/obj_line_op.h (revision 4764) @@ -28,24 +28,24 @@ #include "operation.h" -void *AddLineToBuffer(pcb_opctx_t *ctx, pcb_layer_t *Layer, LineTypePtr Line); -void *ChangeLineSize(pcb_opctx_t *ctx, pcb_layer_t *Layer, LineTypePtr Line); -void *ChangeLineClearSize(pcb_opctx_t *ctx, pcb_layer_t *Layer, LineTypePtr Line); -void *ChangeLineName(pcb_opctx_t *ctx, pcb_layer_t *Layer, LineTypePtr Line); -void *ChangeLineJoin(pcb_opctx_t *ctx, pcb_layer_t *Layer, LineTypePtr Line); -void *SetLineJoin(pcb_opctx_t *ctx, pcb_layer_t *Layer, LineTypePtr Line); -void *ClrLineJoin(pcb_opctx_t *ctx, pcb_layer_t *Layer, LineTypePtr Line); -void *InsertPointIntoLine(pcb_opctx_t *ctx, pcb_layer_t *Layer, LineTypePtr Line); -void *MoveLineToBuffer(pcb_opctx_t *ctx, pcb_layer_t * layer, LineType * line); -void *CopyLine(pcb_opctx_t *ctx, pcb_layer_t *Layer, LineTypePtr Line); -void *MoveLine(pcb_opctx_t *ctx, pcb_layer_t *Layer, LineTypePtr Line); -void *MoveLinePoint(pcb_opctx_t *ctx, pcb_layer_t *Layer, LineTypePtr Line, PointTypePtr Point); -void *MoveLineToLayerLowLevel(pcb_opctx_t *ctx, pcb_layer_t * Source, LineType * line, pcb_layer_t * Destination); -void *MoveLineToLayer(pcb_opctx_t *ctx, pcb_layer_t * Layer, LineType * Line); -void *DestroyLine(pcb_opctx_t *ctx, pcb_layer_t *Layer, LineTypePtr Line); -void *RemoveLinePoint(pcb_opctx_t *ctx, pcb_layer_t *Layer, LineTypePtr Line, PointTypePtr Point); -void *RemoveLine_op(pcb_opctx_t *ctx, pcb_layer_t *Layer, LineTypePtr Line); -void *RotateLinePoint(pcb_opctx_t *ctx, pcb_layer_t *Layer, LineTypePtr Line, PointTypePtr Point); +void *AddLineToBuffer(pcb_opctx_t *ctx, pcb_layer_t *Layer, pcb_line_t *Line); +void *ChangeLineSize(pcb_opctx_t *ctx, pcb_layer_t *Layer, pcb_line_t *Line); +void *ChangeLineClearSize(pcb_opctx_t *ctx, pcb_layer_t *Layer, pcb_line_t *Line); +void *ChangeLineName(pcb_opctx_t *ctx, pcb_layer_t *Layer, pcb_line_t *Line); +void *ChangeLineJoin(pcb_opctx_t *ctx, pcb_layer_t *Layer, pcb_line_t *Line); +void *SetLineJoin(pcb_opctx_t *ctx, pcb_layer_t *Layer, pcb_line_t *Line); +void *ClrLineJoin(pcb_opctx_t *ctx, pcb_layer_t *Layer, pcb_line_t *Line); +void *InsertPointIntoLine(pcb_opctx_t *ctx, pcb_layer_t *Layer, pcb_line_t *Line); +void *MoveLineToBuffer(pcb_opctx_t *ctx, pcb_layer_t * layer, pcb_line_t * line); +void *CopyLine(pcb_opctx_t *ctx, pcb_layer_t *Layer, pcb_line_t *Line); +void *MoveLine(pcb_opctx_t *ctx, pcb_layer_t *Layer, pcb_line_t *Line); +void *MoveLinePoint(pcb_opctx_t *ctx, pcb_layer_t *Layer, pcb_line_t *Line, PointTypePtr Point); +void *MoveLineToLayerLowLevel(pcb_opctx_t *ctx, pcb_layer_t * Source, pcb_line_t * line, pcb_layer_t * Destination); +void *MoveLineToLayer(pcb_opctx_t *ctx, pcb_layer_t * Layer, pcb_line_t * Line); +void *DestroyLine(pcb_opctx_t *ctx, pcb_layer_t *Layer, pcb_line_t *Line); +void *RemoveLinePoint(pcb_opctx_t *ctx, pcb_layer_t *Layer, pcb_line_t *Line, PointTypePtr Point); +void *RemoveLine_op(pcb_opctx_t *ctx, pcb_layer_t *Layer, pcb_line_t *Line); +void *RotateLinePoint(pcb_opctx_t *ctx, pcb_layer_t *Layer, pcb_line_t *Line, PointTypePtr Point); Index: trunk/src/obj_pinvia_therm.c =================================================================== --- trunk/src/obj_pinvia_therm.c (revision 4763) +++ trunk/src/obj_pinvia_therm.c (revision 4764) @@ -157,7 +157,7 @@ return p; case 4: { - LineType l; + pcb_line_t l; l.Flags = NoFlags(); d = pin->Thickness / 2 - pcb->ThermScale * pin->Clearance; out = pin->Thickness / 2 + pin->Clearance / 4; Index: trunk/src/obj_poly.c =================================================================== --- trunk/src/obj_poly.c (revision 4763) +++ trunk/src/obj_poly.c (revision 4764) @@ -299,7 +299,7 @@ { PointType save; pcb_cardinal_t n; - LineType line; + pcb_line_t line; if (!ctx->insert.forcible) { /* Index: trunk/src/obj_rat.c =================================================================== --- trunk/src/obj_rat.c (revision 4763) +++ trunk/src/obj_rat.c (revision 4764) @@ -88,7 +88,7 @@ Line->Point2.ID = CreateIDGet(); Line->group1 = group1; Line->group2 = group2; - SetLineBoundingBox((LineTypePtr) Line); + SetLineBoundingBox((pcb_line_t *) Line); if (!Data->rat_tree) Data->rat_tree = r_create_tree(NULL, 0, 0); r_insert_entry(Data->rat_tree, &Line->BoundingBox, 0); @@ -150,7 +150,7 @@ /* inserts a point into a rat-line */ void *InsertPointIntoRat(pcb_opctx_t *ctx, RatTypePtr Rat) { - LineTypePtr newone; + pcb_line_t *newone; newone = CreateDrawnLineOnLayer(CURRENT, Rat->Point1.X, Rat->Point1.Y, ctx->insert.x, ctx->insert.y, conf_core.design.line_thickness, 2 * conf_core.design.clearance, Rat->Flags); @@ -173,7 +173,7 @@ /* moves a line between layers */ void *MoveRatToLayer(pcb_opctx_t *ctx, RatType * Rat) { - LineTypePtr newone; + pcb_line_t *newone; /*Coord X1 = Rat->Point1.X, Y1 = Rat->Point1.Y; Coord X1 = Rat->Point1.X, Y1 = Rat->Point1.Y; if PCB_FLAG_VIA @@ -246,7 +246,7 @@ gui->draw_arc(Output.fgGC, rat->Point1.X, rat->Point1.Y, w * 2, w * 2, 0, 360); } else - _draw_line((LineType *) rat); + _draw_line((pcb_line_t *) rat); return R_DIR_FOUND_CONTINUE; } @@ -264,7 +264,7 @@ pcb_draw_invalidate(&b); } else - EraseLine((LineType *) Rat); + EraseLine((pcb_line_t *) Rat); EraseFlags(&Rat->Flags); } @@ -285,5 +285,5 @@ pcb_draw_invalidate(&b); } else - DrawLine(NULL, (LineType *) Rat); + DrawLine(NULL, (pcb_line_t *) Rat); } Index: trunk/src/obj_text.c =================================================================== --- trunk/src/obj_text.c (revision 4763) +++ trunk/src/obj_text.c (revision 4764) @@ -132,7 +132,7 @@ /* calculate size of the bounding box */ for (; s && *s; s++) { if (*s <= MAX_FONTPOSITION && symbol[*s].Valid) { - LineTypePtr line = symbol[*s].Line; + pcb_line_t *line = symbol[*s].Line; for (i = 0; i < symbol[*s].LineN; line++, i++) { /* Clamp the width of text lines at the minimum thickness. * NB: Divide 4 in thickness calculation is comprised of a factor @@ -478,8 +478,8 @@ while (string && *string) { /* draw lines if symbol is valid and data is present */ if (*string <= MAX_FONTPOSITION && font->Symbol[*string].Valid) { - LineTypePtr line = font->Symbol[*string].Line; - LineType newline; + pcb_line_t *line = font->Symbol[*string].Line; + pcb_line_t newline; for (n = font->Symbol[*string].LineN; n; n--, line++) { /* create one line, scale, move, rotate and swap it */ Index: trunk/src/operation.h =================================================================== --- trunk/src/operation.h (revision 4763) +++ trunk/src/operation.h (revision 4764) @@ -110,7 +110,7 @@ /* pointer to low-level operation (copy, move and rotate) functions */ typedef struct { - void *(*Line)(pcb_opctx_t *ctx, pcb_layer_t *, LineTypePtr); + void *(*Line)(pcb_opctx_t *ctx, pcb_layer_t *, pcb_line_t *); void *(*Text)(pcb_opctx_t *ctx, pcb_layer_t *, TextTypePtr); void *(*Polygon)(pcb_opctx_t *ctx, pcb_layer_t *, PolygonTypePtr); void *(*Via)(pcb_opctx_t *ctx, PinTypePtr); @@ -118,7 +118,7 @@ void *(*ElementName)(pcb_opctx_t *ctx, ElementTypePtr); void *(*Pin)(pcb_opctx_t *ctx, ElementTypePtr, PinTypePtr); void *(*Pad)(pcb_opctx_t *ctx, ElementTypePtr, PadTypePtr); - void *(*LinePoint)(pcb_opctx_t *ctx, pcb_layer_t *, LineTypePtr, PointTypePtr); + void *(*LinePoint)(pcb_opctx_t *ctx, pcb_layer_t *, pcb_line_t *, PointTypePtr); void *(*Point)(pcb_opctx_t *ctx, pcb_layer_t *, PolygonTypePtr, PointTypePtr); void *(*Arc)(pcb_opctx_t *ctx, pcb_layer_t *, ArcTypePtr); void *(*Rat)(pcb_opctx_t *ctx, RatTypePtr); Index: trunk/src/polygon.c =================================================================== --- trunk/src/polygon.c (revision 4763) +++ trunk/src/polygon.c (revision 4764) @@ -567,7 +567,7 @@ return ArcPolyNoIntersect(a, thick); } -POLYAREA *LinePoly(LineType * L, Coord thick) +POLYAREA *LinePoly(pcb_line_t * L, Coord thick) { PLINE *contour = NULL; POLYAREA *np = NULL; @@ -574,7 +574,7 @@ Vector v; double d, dx, dy; long half; - LineType _l = *L, *l = &_l; + pcb_line_t _l = *L, *l = &_l; if (thick <= 0) return NULL; @@ -796,7 +796,7 @@ return Subtract(np, p, pcb_true); } -static int SubtractLine(LineType * line, PolygonType * p) +static int SubtractLine(pcb_line_t * line, PolygonType * p) { POLYAREA *np; @@ -841,7 +841,7 @@ return -1; } else { - if (!(np = LinePoly((LineType *) pad, pad->Thickness + pad->Clearance))) + if (!(np = LinePoly((pcb_line_t *) pad, pad->Thickness + pad->Clearance))) return -1; } return Subtract(np, p, pcb_true); @@ -945,7 +945,7 @@ static r_dir_t line_sub_callback(const pcb_box_t * b, void *cl) { - LineTypePtr line = (LineTypePtr) b; + pcb_line_t *line = (pcb_line_t *) b; struct cpInfo *info = (struct cpInfo *) cl; PolygonTypePtr polygon; POLYAREA *np; @@ -1118,7 +1118,7 @@ return 1; } -static int UnsubtractLine(LineType * line, pcb_layer_t * l, PolygonType * p) +static int UnsubtractLine(pcb_line_t * line, pcb_layer_t * l, PolygonType * p) { POLYAREA *np; @@ -1198,7 +1198,7 @@ { PointTypePtr p; pcb_cardinal_t n, prev, next; - LineType line; + pcb_line_t line; pcb_bool changed = pcb_false; if (Undoing()) @@ -1404,7 +1404,7 @@ Polygon->NoHolesValid = 0; return R_DIR_FOUND_CONTINUE; case PCB_TYPE_LINE: - SubtractLine((LineTypePtr) ptr2, Polygon); + SubtractLine((pcb_line_t *) ptr2, Polygon); Polygon->NoHolesValid = 0; return R_DIR_FOUND_CONTINUE; case PCB_TYPE_ARC: @@ -1431,7 +1431,7 @@ UnsubtractPin((PinTypePtr) ptr2, Layer, Polygon); return R_DIR_FOUND_CONTINUE; case PCB_TYPE_LINE: - UnsubtractLine((LineTypePtr) ptr2, Layer, Polygon); + UnsubtractLine((pcb_line_t *) ptr2, Layer, Polygon); return R_DIR_FOUND_CONTINUE; case PCB_TYPE_ARC: UnsubtractArc((ArcTypePtr) ptr2, Layer, Polygon); @@ -1495,7 +1495,7 @@ case PCB_TYPE_ARC: case PCB_TYPE_TEXT: /* the cast works equally well for lines and arcs */ - if (!TEST_FLAG(PCB_FLAG_CLEARLINE, (LineTypePtr) ptr2)) + if (!TEST_FLAG(PCB_FLAG_CLEARLINE, (pcb_line_t *) ptr2)) return 0; /* silk doesn't plow */ if (GetLayerNumber(Data, (pcb_layer_t *) ptr1) >= max_copper_layer) Index: trunk/src/polygon.h =================================================================== --- trunk/src/polygon.h (revision 4763) +++ trunk/src/polygon.h (revision 4764) @@ -70,7 +70,7 @@ POLYAREA *RectPoly(Coord x1, Coord x2, Coord y1, Coord y2); POLYAREA *CirclePoly(Coord x, Coord y, Coord radius); POLYAREA *OctagonPoly(Coord x, Coord y, Coord radius, int style); -POLYAREA *LinePoly(LineType * l, Coord thick); +POLYAREA *LinePoly(pcb_line_t * l, Coord thick); POLYAREA *ArcPoly(ArcType * l, Coord thick); POLYAREA *PinPoly(PinType * l, Coord thick, Coord clear); POLYAREA *BoxPolyBloated(pcb_box_t * box, Coord radius); Index: trunk/src/rotate.h =================================================================== --- trunk/src/rotate.h (revision 4763) +++ trunk/src/rotate.h (revision 4764) @@ -87,7 +87,7 @@ } while(0) #define ROTATE_PAD_LOWLEVEL(p,x0,y0,n) \ - RotateLineLowLevel(((LineTypePtr) (p)),(x0),(y0),(n)) + RotateLineLowLevel(((pcb_line_t *) (p)),(x0),(y0),(n)) #define ROTATE_TYPES (PCB_TYPE_ELEMENT | PCB_TYPE_TEXT | PCB_TYPE_ELEMENT_NAME | PCB_TYPE_ARC) Index: trunk/src/rubberband.c =================================================================== --- trunk/src/rubberband.c (revision 4763) +++ trunk/src/rubberband.c (revision 4764) @@ -44,7 +44,7 @@ */ static void CheckPadForRubberbandConnection(PadTypePtr); static void CheckPinForRubberbandConnection(PinTypePtr); -static void CheckLinePointForRubberbandConnection(pcb_layer_t *, LineTypePtr, PointTypePtr, pcb_bool); +static void CheckLinePointForRubberbandConnection(pcb_layer_t *, pcb_line_t *, PointTypePtr, pcb_bool); static void CheckPolygonForRubberbandConnection(pcb_layer_t *, PolygonTypePtr); static void CheckLinePointForRat(pcb_layer_t *, PointTypePtr); static r_dir_t rubber_callback(const pcb_box_t * b, void *cl); @@ -52,7 +52,7 @@ struct rubber_info { Coord radius; Coord X, Y; - LineTypePtr line; + pcb_line_t *line; pcb_box_t box; pcb_layer_t *layer; }; @@ -59,7 +59,7 @@ static r_dir_t rubber_callback(const pcb_box_t * b, void *cl) { - LineTypePtr line = (LineTypePtr) b; + pcb_line_t *line = (pcb_line_t *) b; struct rubber_info *i = (struct rubber_info *) cl; double x, y, rad, dist1, dist2; Coord t; @@ -218,33 +218,33 @@ switch (i->type) { case PCB_TYPE_PIN: if (rat->Point1.X == i->pin->X && rat->Point1.Y == i->pin->Y) - CreateNewRubberbandEntry(NULL, (LineTypePtr) rat, &rat->Point1); + CreateNewRubberbandEntry(NULL, (pcb_line_t *) rat, &rat->Point1); else if (rat->Point2.X == i->pin->X && rat->Point2.Y == i->pin->Y) - CreateNewRubberbandEntry(NULL, (LineTypePtr) rat, &rat->Point2); + CreateNewRubberbandEntry(NULL, (pcb_line_t *) rat, &rat->Point2); break; case PCB_TYPE_PAD: if (rat->Point1.X == i->pad->Point1.X && rat->Point1.Y == i->pad->Point1.Y && rat->group1 == i->group) - CreateNewRubberbandEntry(NULL, (LineTypePtr) rat, &rat->Point1); + CreateNewRubberbandEntry(NULL, (pcb_line_t *) rat, &rat->Point1); else if (rat->Point2.X == i->pad->Point1.X && rat->Point2.Y == i->pad->Point1.Y && rat->group2 == i->group) - CreateNewRubberbandEntry(NULL, (LineTypePtr) rat, &rat->Point2); + CreateNewRubberbandEntry(NULL, (pcb_line_t *) rat, &rat->Point2); else if (rat->Point1.X == i->pad->Point2.X && rat->Point1.Y == i->pad->Point2.Y && rat->group1 == i->group) - CreateNewRubberbandEntry(NULL, (LineTypePtr) rat, &rat->Point1); + CreateNewRubberbandEntry(NULL, (pcb_line_t *) rat, &rat->Point1); else if (rat->Point2.X == i->pad->Point2.X && rat->Point2.Y == i->pad->Point2.Y && rat->group2 == i->group) - CreateNewRubberbandEntry(NULL, (LineTypePtr) rat, &rat->Point2); + CreateNewRubberbandEntry(NULL, (pcb_line_t *) rat, &rat->Point2); else if (rat->Point1.X == (i->pad->Point1.X + i->pad->Point2.X) / 2 && rat->Point1.Y == (i->pad->Point1.Y + i->pad->Point2.Y) / 2 && rat->group1 == i->group) - CreateNewRubberbandEntry(NULL, (LineTypePtr) rat, &rat->Point1); + CreateNewRubberbandEntry(NULL, (pcb_line_t *) rat, &rat->Point1); else if (rat->Point2.X == (i->pad->Point1.X + i->pad->Point2.X) / 2 && rat->Point2.Y == (i->pad->Point1.Y + i->pad->Point2.Y) / 2 && rat->group2 == i->group) - CreateNewRubberbandEntry(NULL, (LineTypePtr) rat, &rat->Point2); + CreateNewRubberbandEntry(NULL, (pcb_line_t *) rat, &rat->Point2); break; case PCB_TYPE_LINE_POINT: if (rat->group1 == i->group && rat->Point1.X == i->point->X && rat->Point1.Y == i->point->Y) - CreateNewRubberbandEntry(NULL, (LineTypePtr) rat, &rat->Point1); + CreateNewRubberbandEntry(NULL, (pcb_line_t *) rat, &rat->Point1); else if (rat->group2 == i->group && rat->Point2.X == i->point->X && rat->Point2.Y == i->point->Y) - CreateNewRubberbandEntry(NULL, (LineTypePtr) rat, &rat->Point2); + CreateNewRubberbandEntry(NULL, (pcb_line_t *) rat, &rat->Point2); break; default: Message(PCB_MSG_DEFAULT, "hace: bad rubber-rat lookup callback\n"); @@ -322,7 +322,7 @@ * If one of the endpoints of the line lays * inside the passed line, * the scanned line is added to the 'rubberband' list */ -static void CheckLinePointForRubberbandConnection(pcb_layer_t *Layer, LineTypePtr Line, PointTypePtr LinePoint, pcb_bool Exact) +static void CheckLinePointForRubberbandConnection(pcb_layer_t *Layer, pcb_line_t *Line, PointTypePtr LinePoint, pcb_bool Exact) { pcb_cardinal_t group; struct rubber_info info; @@ -424,7 +424,7 @@ case PCB_TYPE_LINE: { pcb_layer_t *layer = (pcb_layer_t *) Ptr1; - LineTypePtr line = (LineTypePtr) Ptr2; + pcb_line_t *line = (pcb_line_t *) Ptr2; if (GetLayerNumber(PCB->Data, layer) < max_copper_layer) { CheckLinePointForRubberbandConnection(layer, line, &line->Point1, pcb_false); CheckLinePointForRubberbandConnection(layer, line, &line->Point2, pcb_false); @@ -434,7 +434,7 @@ case PCB_TYPE_LINE_POINT: if (GetLayerNumber(PCB->Data, (pcb_layer_t *) Ptr1) < max_copper_layer) - CheckLinePointForRubberbandConnection((pcb_layer_t *) Ptr1, (LineTypePtr) Ptr2, (PointTypePtr) Ptr3, pcb_true); + CheckLinePointForRubberbandConnection((pcb_layer_t *) Ptr1, (pcb_line_t *) Ptr2, (PointTypePtr) Ptr3, pcb_true); break; case PCB_TYPE_VIA: @@ -471,7 +471,7 @@ case PCB_TYPE_LINE: { pcb_layer_t *layer = (pcb_layer_t *) Ptr1; - LineTypePtr line = (LineTypePtr) Ptr2; + pcb_line_t *line = (pcb_line_t *) Ptr2; CheckLinePointForRat(layer, &line->Point1); CheckLinePointForRat(layer, &line->Point2); @@ -509,7 +509,7 @@ * adds a new line to the rubberband list of 'Crosshair.AttachedObject' * if Layer == 0 it is a rat line */ -RubberbandTypePtr CreateNewRubberbandEntry(pcb_layer_t *Layer, LineTypePtr Line, PointTypePtr MovedPoint) +RubberbandTypePtr CreateNewRubberbandEntry(pcb_layer_t *Layer, pcb_line_t *Line, PointTypePtr MovedPoint) { RubberbandTypePtr ptr = GetRubberbandMemory(); Index: trunk/src/rubberband.h =================================================================== --- trunk/src/rubberband.h (revision 4763) +++ trunk/src/rubberband.h (revision 4764) @@ -36,7 +36,7 @@ */ typedef struct { /* rubberband lines for element moves */ pcb_layer_t *Layer; /* layer that holds the line */ - LineTypePtr Line; /* the line itself */ + pcb_line_t *Line; /* the line itself */ PointTypePtr MovedPoint; /* and finally the point */ } RubberbandType, *RubberbandTypePtr; @@ -44,6 +44,6 @@ void LookupRubberbandLines(int, void *, void *, void *); void LookupRatLines(int, void *, void *, void *); RubberbandTypePtr GetRubberbandMemory(void); -RubberbandTypePtr CreateNewRubberbandEntry(pcb_layer_t *Layer, LineTypePtr Line, PointTypePtr MovedPoint); +RubberbandTypePtr CreateNewRubberbandEntry(pcb_layer_t *Layer, pcb_line_t *Line, PointTypePtr MovedPoint); #endif Index: trunk/src/search.c =================================================================== --- trunk/src/search.c (revision 4763) +++ trunk/src/search.c (revision 4764) @@ -53,7 +53,7 @@ * some local prototypes. The first parameter includes PCB_TYPE_LOCKED if we * want to include locked types in the search. */ -static pcb_bool SearchLineByLocation(int, pcb_layer_t **, LineTypePtr *, LineTypePtr *); +static pcb_bool SearchLineByLocation(int, pcb_layer_t **, pcb_line_t **, pcb_line_t **); static pcb_bool SearchArcByLocation(int, pcb_layer_t **, ArcTypePtr *, ArcTypePtr *); static pcb_bool SearchRatLineByLocation(int, RatTypePtr *, RatTypePtr *, RatTypePtr *); static pcb_bool SearchTextByLocation(int, pcb_layer_t **, TextTypePtr *, TextTypePtr *); @@ -62,7 +62,7 @@ static pcb_bool SearchPadByLocation(int, ElementTypePtr *, PadTypePtr *, PadTypePtr *, pcb_bool); static pcb_bool SearchViaByLocation(int, PinTypePtr *, PinTypePtr *, PinTypePtr *); static pcb_bool SearchElementNameByLocation(int, ElementTypePtr *, TextTypePtr *, TextTypePtr *, pcb_bool); -static pcb_bool SearchLinePointByLocation(int, pcb_layer_t **, LineTypePtr *, PointTypePtr *); +static pcb_bool SearchLinePointByLocation(int, pcb_layer_t **, pcb_line_t **, PointTypePtr *); static pcb_bool SearchPointByLocation(int, pcb_layer_t **, PolygonTypePtr *, PointTypePtr *); static pcb_bool SearchElementByLocation(int, ElementTypePtr *, ElementTypePtr *, ElementTypePtr *, pcb_bool); @@ -176,7 +176,7 @@ */ struct line_info { - LineTypePtr *Line; + pcb_line_t **Line; PointTypePtr *Point; double least; int locked; @@ -185,7 +185,7 @@ static r_dir_t line_callback(const pcb_box_t * box, void *cl) { struct line_info *i = (struct line_info *) cl; - LineTypePtr l = (LineTypePtr) box; + pcb_line_t *l = (pcb_line_t *) box; if (TEST_FLAG(i->locked, l)) return R_DIR_NOT_FOUND; @@ -199,7 +199,7 @@ } -static pcb_bool SearchLineByLocation(int locked, pcb_layer_t ** Layer, LineTypePtr * Line, LineTypePtr * Dummy) +static pcb_bool SearchLineByLocation(int locked, pcb_layer_t ** Layer, pcb_line_t ** Line, pcb_line_t ** Dummy) { struct line_info info; @@ -216,7 +216,7 @@ static r_dir_t rat_callback(const pcb_box_t * box, void *cl) { - LineTypePtr line = (LineTypePtr) box; + pcb_line_t *line = (pcb_line_t *) box; struct ans_info *i = (struct ans_info *) cl; if (TEST_FLAG(i->locked, line)) @@ -353,7 +353,7 @@ static r_dir_t linepoint_callback(const pcb_box_t * b, void *cl) { - LineTypePtr line = (LineTypePtr) b; + pcb_line_t *line = (pcb_line_t *) b; struct line_info *i = (struct line_info *) cl; r_dir_t ret_val = R_DIR_NOT_FOUND; double d; @@ -383,7 +383,7 @@ /* --------------------------------------------------------------------------- * searches a line-point on all the search layer */ -static pcb_bool SearchLinePointByLocation(int locked, pcb_layer_t ** Layer, LineTypePtr * Line, PointTypePtr * Point) +static pcb_bool SearchLinePointByLocation(int locked, pcb_layer_t ** Layer, pcb_line_t ** Line, PointTypePtr * Point) { struct line_info info; *Layer = SearchLayer; @@ -582,7 +582,7 @@ * Finally, D1 and D2 are orthogonal, so we can sum them easily * by Pythagorean theorem. */ -pcb_bool IsPointOnLine(Coord X, Coord Y, Coord Radius, LineTypePtr Line) +pcb_bool IsPointOnLine(Coord X, Coord Y, Coord Radius, pcb_line_t *Line) { double D1, D2, L; @@ -611,7 +611,7 @@ static int is_point_on_line(Coord px, Coord py, Coord lx1, Coord ly1, Coord lx2, Coord ly2) { /* ohh well... let's hope the optimizer does something clever with inlining... */ - LineType l; + pcb_line_t l; l.Point1.X = lx1; l.Point1.Y = ly1; l.Point2.X = lx2; @@ -623,9 +623,9 @@ /* --------------------------------------------------------------------------- * checks if a line crosses a rectangle */ -pcb_bool IsLineInRectangle(Coord X1, Coord Y1, Coord X2, Coord Y2, LineTypePtr Line) +pcb_bool IsLineInRectangle(Coord X1, Coord Y1, Coord X2, Coord Y2, pcb_line_t *Line) { - LineType line; + pcb_line_t line; /* first, see if point 1 is inside the rectangle */ /* in case the whole line is inside the rectangle */ @@ -696,9 +696,9 @@ * checks if a line crosses a quadrangle: almost copied from IsLineInRectangle() * Note: actually this quadrangle is a slanted rectangle */ -pcb_bool IsLineInQuadrangle(PointType p[4], LineTypePtr Line) +pcb_bool IsLineInQuadrangle(PointType p[4], pcb_line_t *Line) { - LineType line; + pcb_line_t line; /* first, see if point 1 is inside the rectangle */ /* in case the whole line is inside the rectangle */ @@ -744,7 +744,7 @@ */ pcb_bool IsArcInRectangle(Coord X1, Coord Y1, Coord X2, Coord Y2, ArcTypePtr Arc) { - LineType line; + pcb_line_t line; /* construct a set of dummy lines and check each of them */ line.Thickness = 0; @@ -1042,11 +1042,11 @@ if ((HigherAvail & (PCB_TYPE_PIN | PCB_TYPE_PAD)) == 0 && Type & PCB_TYPE_LINE_POINT && - SearchLinePointByLocation(locked, (pcb_layer_t **) Result1, (LineTypePtr *) Result2, (PointTypePtr *) Result3)) + SearchLinePointByLocation(locked, (pcb_layer_t **) Result1, (pcb_line_t **) Result2, (PointTypePtr *) Result3)) return (PCB_TYPE_LINE_POINT); if ((HigherAvail & (PCB_TYPE_PIN | PCB_TYPE_PAD)) == 0 && Type & PCB_TYPE_LINE - && SearchLineByLocation(locked, (pcb_layer_t **) Result1, (LineTypePtr *) Result2, (LineTypePtr *) Result3)) + && SearchLineByLocation(locked, (pcb_layer_t **) Result1, (pcb_line_t **) Result2, (pcb_line_t **) Result3)) return (PCB_TYPE_LINE); if ((HigherAvail & (PCB_TYPE_PIN | PCB_TYPE_PAD)) == 0 && Type & PCB_TYPE_ARC && Index: trunk/src/search.h =================================================================== --- trunk/src/search.h (revision 4763) +++ trunk/src/search.h (revision 4764) @@ -55,7 +55,7 @@ (POINT_IN_BOX((l)->Point1.X,(l)->Point1.Y,(b)) && \ POINT_IN_BOX((l)->Point2.X,(l)->Point2.Y,(b))) -#define PAD_IN_BOX(p,b) LINE_IN_BOX((LineTypePtr)(p),(b)) +#define PAD_IN_BOX(p,b) LINE_IN_BOX((pcb_line_t *)(p),(b)) #define BOX_IN_BOX(b1,b) \ ((b1)->X1 >= (b)->X1 && (b1)->X2 <= (b)->X2 && \ @@ -91,7 +91,7 @@ || lines_intersect((l)->Point1.X,(l)->Point1.Y,(l)->Point2.X,(l)->Point2.Y, (b)->X2, (b)->Y2, (b)->X2, (b)->Y1) \ || LINE_IN_BOX((l), (b))) -#define PAD_TOUCHES_BOX(p,b) LINE_TOUCHES_BOX((LineTypePtr)(p),(b)) +#define PAD_TOUCHES_BOX(p,b) LINE_TOUCHES_BOX((pcb_line_t *)(p),(b)) /* a corner of either box is within the other, or edges cross */ #define BOX_TOUCHES_BOX(b1,b2) \ @@ -145,12 +145,12 @@ /* --------------------------------------------------------------------------- * prototypes */ -pcb_bool IsPointOnLine(Coord, Coord, Coord, LineTypePtr); +pcb_bool IsPointOnLine(Coord, Coord, Coord, pcb_line_t *); pcb_bool IsPointOnPin(Coord, Coord, Coord, PinTypePtr); pcb_bool IsPointOnArc(Coord, Coord, Coord, ArcTypePtr); pcb_bool IsPointOnLineEnd(Coord, Coord, RatTypePtr); -pcb_bool IsLineInRectangle(Coord, Coord, Coord, Coord, LineTypePtr); -pcb_bool IsLineInQuadrangle(PointType p[4], LineTypePtr Line); +pcb_bool IsLineInRectangle(Coord, Coord, Coord, Coord, pcb_line_t *); +pcb_bool IsLineInQuadrangle(PointType p[4], pcb_line_t *Line); pcb_bool IsArcInRectangle(Coord, Coord, Coord, Coord, ArcTypePtr); pcb_bool IsPointInPad(Coord, Coord, Coord, PadTypePtr); pcb_bool IsPointInBox(Coord, Coord, pcb_box_t *, Coord); Index: trunk/src/select.c =================================================================== --- trunk/src/select.c (revision 4763) +++ trunk/src/select.c (revision 4764) @@ -127,7 +127,7 @@ case PCB_TYPE_LINE: { - LineType *line = (LineTypePtr) ptr2; + pcb_line_t *line = (pcb_line_t *) ptr2; layer = (pcb_layer_t *) ptr1; AddObjectToFlagUndoList(PCB_TYPE_LINE, ptr1, ptr2, ptr2); @@ -287,7 +287,7 @@ if (PCB->RatOn || !Flag) RAT_LOOP(PCB->Data); { - if (LINE_NEAR_BOX((LineTypePtr) line, Box) && !TEST_FLAG(PCB_FLAG_LOCK, line) && TEST_FLAG(PCB_FLAG_SELECTED, line) != Flag) { + if (LINE_NEAR_BOX((pcb_line_t *) line, Box) && !TEST_FLAG(PCB_FLAG_LOCK, line) && TEST_FLAG(PCB_FLAG_SELECTED, line) != Flag) { append(PCB_TYPE_RATLINE, line, line); if (PCB->RatOn) DrawRat(line); @@ -489,7 +489,7 @@ switch (Type) { case PCB_TYPE_LINE: if (F->Line) - return (F->Line(ctx, (pcb_layer_t *) Ptr1, (LineTypePtr) Ptr2)); + return (F->Line(ctx, (pcb_layer_t *) Ptr1, (pcb_line_t *) Ptr2)); break; case PCB_TYPE_ARC: @@ -499,7 +499,7 @@ case PCB_TYPE_LINE_POINT: if (F->LinePoint) - return (F->LinePoint(ctx, (pcb_layer_t *) Ptr1, (LineTypePtr) Ptr2, (PointTypePtr) Ptr3)); + return (F->LinePoint(ctx, (pcb_layer_t *) Ptr1, (pcb_line_t *) Ptr2, (PointTypePtr) Ptr3)); break; case PCB_TYPE_TEXT: Index: trunk/src/undo.c =================================================================== --- trunk/src/undo.c (revision 4763) +++ trunk/src/undo.c (revision 4764) @@ -1409,7 +1409,7 @@ break; case PCB_TYPE_LINE: case PCB_TYPE_ELEMENT_LINE: - undo->Data.Size = ((LineTypePtr) ptr2)->Thickness; + undo->Data.Size = ((pcb_line_t *) ptr2)->Thickness; break; case PCB_TYPE_TEXT: case PCB_TYPE_ELEMENT_NAME: @@ -1441,7 +1441,7 @@ undo->Data.Size = ((PinTypePtr) ptr2)->Clearance; break; case PCB_TYPE_LINE: - undo->Data.Size = ((LineTypePtr) ptr2)->Clearance; + undo->Data.Size = ((pcb_line_t *) ptr2)->Clearance; break; case PCB_TYPE_PAD: undo->Data.Size = ((PadTypePtr) ptr2)->Clearance; Index: trunk/src/undo_act.c =================================================================== --- trunk/src/undo_act.c (revision 4763) +++ trunk/src/undo_act.c (revision 4764) @@ -154,11 +154,11 @@ if (Crosshair.AttachedLine.State == STATE_THIRD) { int type; void *ptr1, *ptr3, *ptrtmp; - LineTypePtr ptr2; + pcb_line_t *ptr2; /* this search is guaranteed to succeed */ SearchObjectByLocation(PCB_TYPE_LINE | PCB_TYPE_RATLINE, &ptr1, &ptrtmp, &ptr3, Crosshair.AttachedLine.Point1.X, Crosshair.AttachedLine.Point1.Y, 0); - ptr2 = (LineTypePtr) ptrtmp; + ptr2 = (pcb_line_t *) ptrtmp; /* save both ends of line */ Crosshair.AttachedLine.Point2.X = ptr2->Point1.X; @@ -181,7 +181,7 @@ /* this search should find the restored line */ SearchObjectByLocation(PCB_TYPE_LINE | PCB_TYPE_RATLINE, &ptr1, &ptrtmp, &ptr3, Crosshair.AttachedLine.Point2.X, Crosshair.AttachedLine.Point2.Y, 0); - ptr2 = (LineTypePtr) ptrtmp; + ptr2 = (pcb_line_t *) ptrtmp; if (conf_core.editor.auto_drc) { /* undo loses PCB_FLAG_FOUND */ SET_FLAG(PCB_FLAG_FOUND, ptr2); @@ -200,7 +200,7 @@ /* this search is guaranteed to succeed too */ SearchObjectByLocation(PCB_TYPE_LINE | PCB_TYPE_RATLINE, &ptr1, &ptrtmp, &ptr3, Crosshair.AttachedLine.Point1.X, Crosshair.AttachedLine.Point1.Y, 0); - ptr2 = (LineTypePtr) ptrtmp; + ptr2 = (pcb_line_t *) ptrtmp; lastLayer = (pcb_layer_t *) ptr1; } notify_crosshair_change(pcb_true); @@ -273,7 +273,7 @@ if (Redo(pcb_true)) { SetChangedFlag(pcb_true); if (conf_core.editor.mode == PCB_MODE_LINE && Crosshair.AttachedLine.State != STATE_FIRST) { - LineType *line = linelist_last(&CURRENT->Line); + pcb_line_t *line = linelist_last(&CURRENT->Line); Crosshair.AttachedLine.Point1.X = Crosshair.AttachedLine.Point2.X = line->Point2.X; Crosshair.AttachedLine.Point1.Y = Crosshair.AttachedLine.Point2.Y = line->Point2.Y; addedLines++; Index: trunk/src/vtonpoint.h =================================================================== --- trunk/src/vtonpoint.h (revision 4763) +++ trunk/src/vtonpoint.h (revision 4764) @@ -9,7 +9,7 @@ int type; union { void *any; - LineType *line; + pcb_line_t *line; ArcType *arc; } obj; } OnpointType; Index: trunk/src_plugins/autocrop/autocrop.c =================================================================== --- trunk/src_plugins/autocrop/autocrop.c (revision 4763) +++ trunk/src_plugins/autocrop/autocrop.c (revision 4764) @@ -75,7 +75,7 @@ return Via; } -static void *MyMoveLineLowLevel(pcb_data_t * Data, pcb_layer_t * Layer, LineType * Line, Coord dx, Coord dy) +static void *MyMoveLineLowLevel(pcb_data_t * Data, pcb_layer_t * Layer, pcb_line_t * Line, Coord dx, Coord dy) { if (Data) { RestoreToPolygon(Data, PCB_TYPE_LINE, Layer, Line); Index: trunk/src_plugins/autoroute/autoroute.c =================================================================== --- trunk/src_plugins/autoroute/autoroute.c (revision 4763) +++ trunk/src_plugins/autoroute/autoroute.c (revision 4764) @@ -227,7 +227,7 @@ PinTypePtr via; struct routebox *via_shadow; /* points to the via in r-tree which * points to the PinType in the PCB. */ - LineTypePtr line; + pcb_line_t *line; void *generic; /* 'other' is polygon, arc, text */ struct routebox *expansion_area; /* previous expansion area in search */ } parent; @@ -293,7 +293,7 @@ routebox_list same_net, same_subnet, original_subnet, different_net; union { PinType *via; - LineType *line; + pcb_line_t *line; } livedraw_obj; } routebox_t; @@ -660,8 +660,8 @@ return *rbpp; } -static routebox_t *AddLine(PointerListType layergroupboxes[], int layergroup, LineTypePtr line, - LineTypePtr ptr, RouteStyleType * style) +static routebox_t *AddLine(PointerListType layergroupboxes[], int layergroup, pcb_line_t *line, + pcb_line_t *ptr, RouteStyleType * style) { routebox_t **rbpp; assert(layergroupboxes && line); @@ -955,7 +955,7 @@ routebox_t *rb = NULL; SET_FLAG(PCB_FLAG_DRC, (PinTypePtr) connection->ptr2); if (connection->type == PCB_TYPE_LINE) { - LineType *line = (LineType *) connection->ptr2; + pcb_line_t *line = (pcb_line_t *) connection->ptr2; /* lines are listed at each end, so skip one */ /* this should probably by a macro named "BUMP_LOOP" */ @@ -963,7 +963,7 @@ /* dice up non-straight lines into many tiny obstacles */ if (line->Point1.X != line->Point2.X && line->Point1.Y != line->Point2.Y) { - LineType fake_line = *line; + pcb_line_t fake_line = *line; Coord dx = (line->Point2.X - line->Point1.X); Coord dy = (line->Point2.Y - line->Point1.Y); int segs = MAX(PCB_ABS(dx), @@ -1078,7 +1078,7 @@ } /* dice up non-straight lines into many tiny obstacles */ if (line->Point1.X != line->Point2.X && line->Point1.Y != line->Point2.Y) { - LineType fake_line = *line; + pcb_line_t fake_line = *line; Coord dx = (line->Point2.X - line->Point1.X); Coord dy = (line->Point2.Y - line->Point1.Y); int segs = MAX(PCB_ABS(dx), PCB_ABS(dy)) / (4 * rd->max_bloat + 1); @@ -1318,7 +1318,7 @@ /* makes a line on the solder layer silk surrounding the box */ static void showbox(pcb_box_t b, pcb_dimension_t thickness, int group) { - LineTypePtr line; + pcb_line_t *line; pcb_layer_t *SLayer = LAYER_PTR(group); if (showboxen < -1) return; @@ -2986,7 +2986,7 @@ if (conf_core.editor.live_routing) { pcb_layer_t *layer = LAYER_PTR(PCB->LayerGroups.Entries[rb->group][0]); - LineType *line = CreateNewLineOnLayer(layer, qX1, qY1, qX2, qY2, + pcb_line_t *line = CreateNewLineOnLayer(layer, qX1, qY1, qX2, qY2, 2 * qhthick, 0, MakeFlags(0)); rb->livedraw_obj.line = line; if (line != NULL) Index: trunk/src_plugins/djopt/djopt.c =================================================================== --- trunk/src_plugins/djopt/djopt.c (revision 4763) +++ trunk/src_plugins/djopt/djopt.c (revision 4764) @@ -98,7 +98,7 @@ int layer; struct line_s *next; corner_s *s, *e; - LineType *line; + pcb_line_t *line; char is_pad; } line_s; @@ -444,10 +444,10 @@ dprintf("add_line_to_corner %#mD\n", c->x, c->y); } -static LineType *create_pcb_line(int layer, int x1, int y1, int x2, int y2, int thick, int clear, FlagType flags) +static pcb_line_t *create_pcb_line(int layer, int x1, int y1, int x2, int y2, int thick, int clear, FlagType flags) { char *from, *to; - LineType *nl; + pcb_line_t *nl; pcb_layer_t *lyr = LAYER_PTR(layer); from = (char *) linelist_first(&lyr->Line); @@ -460,14 +460,14 @@ for (lp = lines; lp; lp = lp->next) { if (DELETED(lp)) continue; - if ((char *) (lp->line) >= from && (char *) (lp->line) <= from + linelist_length(&lyr->Line) * sizeof(LineType)) - lp->line = (LineType *) ((char *) (lp->line) + (to - from)); + if ((char *) (lp->line) >= from && (char *) (lp->line) <= from + linelist_length(&lyr->Line) * sizeof(pcb_line_t)) + lp->line = (pcb_line_t *) ((char *) (lp->line) + (to - from)); } } return nl; } -static void new_line(corner_s * s, corner_s * e, int layer, LineType * example) +static void new_line(corner_s * s, corner_s * e, int layer, pcb_line_t * example) { line_s *ls; @@ -495,7 +495,7 @@ else #endif { - LineType *nl; + pcb_line_t *nl; dprintf ("New line \033[35m%#mD to %#mD from l%d t%#mS c%#mS f%s\033[0m\n", s->x, s->y, e->x, e->y, layer, example->Thickness, example->Clearance, flags_to_string(example->Flags, PCB_TYPE_LINE)); @@ -754,7 +754,7 @@ dprintf("via move %#mD to %#mD\n", via->X, via->Y, x, y); } for (i = 0; i < c->n_lines; i++) { - LineTypePtr tl = c->lines[i]->line; + pcb_line_t *tl = c->lines[i]->line; if (tl) { if (c->lines[i]->s == c) { MoveObject(PCB_TYPE_LINE_POINT, LAYER_PTR(c->lines[i]->layer), tl, &tl->Point1, x - (tl->Point1.X), y - (tl->Point1.Y)); @@ -814,7 +814,7 @@ static int split_line(line_s * l, corner_s * c) { int i; - LineType *pcbline; + pcb_line_t *pcbline; line_s *ls; if (!intersecting_layers(l->layer, c->layer)) @@ -2176,7 +2176,7 @@ c[ci]->lines[li]->line->Thickness, c[ci]->lines[li]->line->Clearance, flags_to_string(c[ci]->lines[li]->line->Flags, PCB_TYPE_LINE)); /* Pads are disqualified, as we want to mimic a trace line. */ - if (c[ci]->lines[li]->line == (LineTypePtr) c[ci]->pad) { + if (c[ci]->lines[li]->line == (pcb_line_t *) c[ci]->pad) { dprintf(" bad, pad\n"); continue; } @@ -2196,7 +2196,7 @@ { int layer; line_s *ex = choose_example_line(c1, c2); - LineType *example = ex->line; + pcb_line_t *example = ex->line; dprintf ("connect_corners \033[32m%#mD to %#mD, example line %#mD to %#mD l%d\033[0m\n", @@ -2582,7 +2582,7 @@ ls->e = find_corner(pad->Point2.X, pad->Point2.Y, layern); ls->e->pad = pad; ls->layer = layern; - ls->line = (LineTypePtr) pad; + ls->line = (pcb_line_t *) pad; add_line_to_corner(ls, ls->s); add_line_to_corner(ls, ls->e); Index: trunk/src_plugins/fontmode/fontmode.c =================================================================== --- trunk/src_plugins/fontmode/fontmode.c (revision 4763) +++ trunk/src_plugins/fontmode/fontmode.c (revision 4764) @@ -160,7 +160,7 @@ pcb_font_t *font; SymbolTypePtr symbol; int i; - LineType *l; + pcb_line_t *l; gdl_iterator_t it; pcb_layer_t *lfont, *lwidth; Index: trunk/src_plugins/gpmi/pcb-gpmi/gpmi_plugin/gpmi_pkg/layout/layout.h =================================================================== --- trunk/src_plugins/gpmi/pcb-gpmi/gpmi_plugin/gpmi_pkg/layout/layout.h (revision 4763) +++ trunk/src_plugins/gpmi/pcb-gpmi/gpmi_plugin/gpmi_pkg/layout/layout.h (revision 4764) @@ -81,7 +81,7 @@ typedef struct layout_object_s { layout_object_mask_t type; union { - LineType *l; + pcb_line_t *l; TextType *t; PolygonType *p; ArcType *a; Index: trunk/src_plugins/import_dsn/dsn.c =================================================================== --- trunk/src_plugins/import_dsn/dsn.c (revision 4763) +++ trunk/src_plugins/import_dsn/dsn.c (revision 4764) @@ -95,7 +95,7 @@ Coord linethick = 0, lineclear, viadiam, viadrill; char lname[200]; pcb_layer_t *rlayer = NULL; - LineType *line = NULL; + pcb_line_t *line = NULL; fname = argc ? argv[0] : 0; Index: trunk/src_plugins/io_kicad/write.c =================================================================== --- trunk/src_plugins/io_kicad/write.c (revision 4763) +++ trunk/src_plugins/io_kicad/write.c (revision 4764) @@ -573,7 +573,7 @@ pcb_layer_t *layer, Coord xOffset, Coord yOffset, pcb_cardinal_t indentation) { gdl_iterator_t it; - LineType *line; + pcb_line_t *line; pcb_cardinal_t currentLayer = number; /* write information about non empty layers */ @@ -801,7 +801,7 @@ gdl_iterator_t eit; - LineType *line; + pcb_line_t *line; ArcType *arc; ElementType *element; pcb_box_t *boxResult; @@ -1037,7 +1037,7 @@ { gdl_iterator_t eit; - LineType *line; + pcb_line_t *line; ArcType *arc; Coord arcStartX, arcStartY, arcEndX, arcEndY; /* for arc rendering */ Coord xPos, yPos; Index: trunk/src_plugins/io_kicad_legacy/write.c =================================================================== --- trunk/src_plugins/io_kicad_legacy/write.c (revision 4763) +++ trunk/src_plugins/io_kicad_legacy/write.c (revision 4764) @@ -532,7 +532,7 @@ pcb_layer_t *layer, Coord xOffset, Coord yOffset) { gdl_iterator_t it; - LineType *line; + pcb_line_t *line; pcb_cardinal_t currentLayer = number; /* write information about non empty layers */ @@ -761,7 +761,7 @@ gdl_iterator_t eit; - LineType *line; + pcb_line_t *line; ArcType *arc; ElementType *element; pcb_box_t *boxResult; @@ -992,7 +992,7 @@ { gdl_iterator_t eit; - LineType *line; + pcb_line_t *line; ArcType *arc; Coord arcStartX, arcStartY, arcEndX, arcEndY; /* for arc rendering */ Coord xPos, yPos; Index: trunk/src_plugins/io_lihata/read.c =================================================================== --- trunk/src_plugins/io_lihata/read.c (revision 4763) +++ trunk/src_plugins/io_lihata/read.c (revision 4764) @@ -338,7 +338,7 @@ static int parse_line(pcb_layer_t *ly, ElementType *el, lht_node_t *obj, int no_id, Coord dx, Coord dy) { - LineType *line; + pcb_line_t *line; if (ly != NULL) line = GetLineMemory(ly); Index: trunk/src_plugins/io_lihata/write.c =================================================================== --- trunk/src_plugins/io_lihata/write.c (revision 4763) +++ trunk/src_plugins/io_lihata/write.c (revision 4764) @@ -212,7 +212,7 @@ return hsh; } -static lht_node_t *build_line(LineType *line, int local_id, Coord dx, Coord dy) +static lht_node_t *build_line(pcb_line_t *line, int local_id, Coord dx, Coord dy) { char buff[128]; lht_node_t *obj; @@ -378,7 +378,7 @@ static lht_node_t *build_element(ElementType *elem) { char buff[128]; - LineType *li; + pcb_line_t *li; ArcType *ar; PinType *pi; PadType *pa; @@ -421,7 +421,7 @@ static lht_node_t *build_data_layer(pcb_data_t *data, pcb_layer_t *layer, int layer_group) { lht_node_t *obj, *grp; - LineType *li; + pcb_line_t *li; ArcType *ar; PolygonType *po; TextType *tx; @@ -513,7 +513,7 @@ static lht_node_t *build_symbol(SymbolType *sym, const char *name) { lht_node_t *lst, *ndt; - LineType *li; + pcb_line_t *li; int n; ndt = lht_dom_node_alloc(LHT_HASH, name); Index: trunk/src_plugins/io_pcb/file.c =================================================================== --- trunk/src_plugins/io_pcb/file.c (revision 4763) +++ trunk/src_plugins/io_pcb/file.c (revision 4764) @@ -269,7 +269,7 @@ static void WritePCBFontData(FILE * FP) { pcb_cardinal_t i, j; - LineTypePtr line; + pcb_line_t *line; pcb_font_t *font; for (font = &PCB->Font, i = 0; i <= MAX_FONTPOSITION; i++) { @@ -369,7 +369,7 @@ int io_pcb_WriteElementData(plug_io_t *ctx, FILE * FP, pcb_data_t *Data) { gdl_iterator_t eit; - LineType *line; + pcb_line_t *line; ArcType *arc; ElementType *element; @@ -439,7 +439,7 @@ static void WriteLayerData(FILE * FP, pcb_cardinal_t Number, pcb_layer_t *layer) { gdl_iterator_t it; - LineType *line; + pcb_line_t *line; ArcType *arc; TextType *text; PolygonType *polygon; Index: trunk/src_plugins/jostle/jostle.c =================================================================== --- trunk/src_plugins/jostle/jostle.c (revision 4763) +++ trunk/src_plugins/jostle/jostle.c (revision 4764) @@ -269,9 +269,9 @@ /*! * Wrapper for CreateNewLineOnLayer that takes vectors and deals with Undo */ -static LineType *CreateVectorLineOnLayer(pcb_layer_t * layer, Vector a, Vector b, int thickness, int clearance, FlagType flags) +static pcb_line_t *CreateVectorLineOnLayer(pcb_layer_t * layer, Vector a, Vector b, int thickness, int clearance, FlagType flags) { - LineType *line; + pcb_line_t *line; line = CreateNewLineOnLayer(layer, a[0], a[1], b[0], b[1], thickness, clearance, flags); if (line) { @@ -280,9 +280,9 @@ return line; } -static LineType *MakeBypassLine(pcb_layer_t * layer, Vector a, Vector b, LineType * orig, POLYAREA ** expandp) +static pcb_line_t *MakeBypassLine(pcb_layer_t * layer, Vector a, Vector b, pcb_line_t * orig, POLYAREA ** expandp) { - LineType *line; + pcb_line_t *line; line = CreateVectorLineOnLayer(layer, a, b, orig->Thickness, orig->Clearance, orig->Flags); if (line && expandp) { @@ -311,7 +311,7 @@ * points a, b, c, d. Finally connect the dots and remove the * old straight line. */ -static int MakeBypassingLines(POLYAREA * brush, pcb_layer_t * layer, LineType * line, int side, POLYAREA ** expandp) +static int MakeBypassingLines(POLYAREA * brush, pcb_layer_t * layer, pcb_line_t * line, int side, POLYAREA ** expandp) { Vector pA, pB, flatA, flatB, qA, qB; Vector lA, lB; @@ -354,7 +354,7 @@ /*!< after cutting brush with line, the smallest chunk, which we * will go around on 'side'. */ - LineType *line; + pcb_line_t *line; int side; double centroid; /*!< smallest difference between slices of brush after cutting with @@ -368,7 +368,7 @@ */ static r_dir_t jostle_callback(const pcb_box_t * targ, void *private) { - LineType *line = (LineType *) targ; + pcb_line_t *line = (pcb_line_t *) targ; struct info *info = private; POLYAREA *lp, *copy, *tmp, *n, *smallest = NULL; Vector p; Index: trunk/src_plugins/propedit/propsel.c =================================================================== --- trunk/src_plugins/propedit/propsel.c (revision 4763) +++ trunk/src_plugins/propedit/propsel.c (revision 4764) @@ -89,7 +89,7 @@ free(big); } -static void map_line_cb(void *ctx, pcb_board_t *pcb, pcb_layer_t *layer, LineType *line) +static void map_line_cb(void *ctx, pcb_board_t *pcb, pcb_layer_t *layer, pcb_line_t *line) { map_chk_skip(ctx, line); map_add_prop(ctx, "p/trace/thickness", Coord, line->Thickness); @@ -124,7 +124,7 @@ map_attr(ctx, &poly->Attributes); } -static void map_eline_cb(void *ctx, pcb_board_t *pcb, ElementType *element, LineType *line) +static void map_eline_cb(void *ctx, pcb_board_t *pcb, ElementType *element, pcb_line_t *line) { map_chk_skip(ctx, line); map_line_cb(ctx, pcb, NULL, line); @@ -216,7 +216,7 @@ #define DONE { st->set_cnt++; RestoreUndoSerialNumber(); return; } -static void set_line_cb(void *ctx, pcb_board_t *pcb, pcb_layer_t *layer, LineType *line) +static void set_line_cb(void *ctx, pcb_board_t *pcb, pcb_layer_t *layer, pcb_line_t *line) { set_ctx_t *st = (set_ctx_t *)ctx; const char *pn = st->name + 8; @@ -323,7 +323,7 @@ } } -static void set_eline_cb(void *ctx, pcb_board_t *pcb, ElementType *element, LineType *line) +static void set_eline_cb(void *ctx, pcb_board_t *pcb, ElementType *element, pcb_line_t *line) { set_ctx_t *st = (set_ctx_t *)ctx; @@ -486,7 +486,7 @@ st->del_cnt++; } -static void del_line_cb(void *ctx, pcb_board_t *pcb, pcb_layer_t *layer, LineType *line) +static void del_line_cb(void *ctx, pcb_board_t *pcb, pcb_layer_t *layer, pcb_line_t *line) { map_chk_skip(ctx, line); del_attr(ctx, &line->Attributes); @@ -510,7 +510,7 @@ del_attr(ctx, &poly->Attributes); } -static void del_eline_cb(void *ctx, pcb_board_t *pcb, ElementType *element, LineType *line) +static void del_eline_cb(void *ctx, pcb_board_t *pcb, ElementType *element, pcb_line_t *line) { map_chk_skip(ctx, line); del_attr(ctx, &line->Attributes); Index: trunk/src_plugins/puller/puller.c =================================================================== --- trunk/src_plugins/puller/puller.c (revision 4763) +++ trunk/src_plugins/puller/puller.c (revision 4764) @@ -81,7 +81,7 @@ #define sqr(x) (1.0*(x)*(x)) static int multi, line_exact, arc_exact; -static LineTypePtr the_line; +static pcb_line_t *the_line; static ArcTypePtr the_arc; static double arc_dist; @@ -277,7 +277,7 @@ static r_dir_t line_callback(const pcb_box_t * b, void *cl) { /* pcb_layer_t *layer = (pcb_layer_t *)cl; */ - LineTypePtr l = (LineTypePtr) b; + pcb_line_t *l = (pcb_line_t *) b; double d1, d2, t; #if TRACE1 pcb_printf("line %#mD .. %#mD\n", l->Point1.X, l->Point1.Y, l->Point2.X, l->Point2.Y); @@ -562,7 +562,7 @@ unsigned deleted:1; int type; union { - LineType *line; + pcb_line_t *line; ArcType *arc; } parent; } Extra; @@ -579,7 +579,7 @@ #if TRACE1 static void trace_paths(); #endif -static void mark_line_for_deletion(LineTypePtr); +static void mark_line_for_deletion(pcb_line_t *); #define LINE2EXTRA(l) ((Extra *)g_hash_table_lookup (lines, l)) #define ARC2EXTRA(a) ((Extra *)g_hash_table_lookup (arcs, a)) @@ -649,7 +649,7 @@ static r_dir_t find_pair_line_callback(const pcb_box_t * b, void *cl) { - LineTypePtr line = (LineTypePtr) b; + pcb_line_t *line = (pcb_line_t *) b; #if TRACE1 Extra *e = LINE2EXTRA(line); #endif @@ -751,7 +751,7 @@ static r_dir_t find_pair_pinline_callback(const pcb_box_t * b, void *cl) { - LineTypePtr line = (LineTypePtr) b; + pcb_line_t *line = (pcb_line_t *) b; PinTypePtr pin = (PinTypePtr) cl; Extra *e = LINE2EXTRA(line); int hits; @@ -839,7 +839,7 @@ static r_dir_t find_pair_padline_callback(const pcb_box_t * b, void *cl) { - LineTypePtr line = (LineTypePtr) b; + pcb_line_t *line = (pcb_line_t *) b; PadTypePtr pad = (PadTypePtr) cl; Extra *e = LINE2EXTRA(line); int hits; @@ -925,7 +925,7 @@ extra->end.next = NULL; } -static Extra *new_line_extra(LineType * line) +static Extra *new_line_extra(pcb_line_t * line) { Extra *extra = g_slice_new0(Extra); g_hash_table_insert(lines, line, extra); @@ -1048,7 +1048,7 @@ { if (extra->start.next != NULL && extra->start.next == extra->end.next) { extra->end.next = NULL; - mark_line_for_deletion((LineType *) ptr); + mark_line_for_deletion((pcb_line_t *) ptr); } if (extra->start.at_pin) @@ -1123,7 +1123,7 @@ e->end.in_pin ? "I" : "-", e->end.at_pin ? "A" : "-", e->end.is_pad ? "P" : "-", e->end.pending ? "p" : "-"); if (EXTRA_IS_LINE(e)) { - LineTypePtr line = EXTRA2LINE(e); + pcb_line_t *line = EXTRA2LINE(e); pcb_printf(" %p L %#mD-%#mD", (void *)line, line->Point1.X, line->Point1.Y, line->Point2.X, line->Point2.Y); printf(" %s %p %s %p\n", e->start.is_pad ? "pad" : "pin", (void *)e->start.pin, e->end.is_pad ? "pad" : "pin", (void *)e->end.pin); } @@ -1181,7 +1181,7 @@ } #endif -static void reverse_line(LineTypePtr line) +static void reverse_line(pcb_line_t *line) { Extra *e = LINE2EXTRA(line); int x, y; @@ -1235,8 +1235,8 @@ /* what we're working with */ static ArcTypePtr start_arc; -static LineTypePtr start_line; -static LineTypePtr end_line; +static pcb_line_t *start_line; +static pcb_line_t *end_line; static ArcTypePtr end_arc; static Extra *start_extra, *end_extra; static Extra *sarc_extra, *earc_extra; @@ -1492,7 +1492,7 @@ static r_dir_t gp_line_cb(const pcb_box_t * b, void *cb) { - const LineTypePtr l = (LineTypePtr) b; + const pcb_line_t *l = (pcb_line_t *) b; Extra *e = LINE2EXTRA(l); if (l == start_line || l == end_line) return R_DIR_NOT_FOUND; @@ -1619,13 +1619,13 @@ return R_DIR_NOT_FOUND; } -static LineTypePtr create_line(LineTypePtr sample, int x1, int y1, int x2, int y2) +static pcb_line_t *create_line(pcb_line_t *sample, int x1, int y1, int x2, int y2) { #if TRACE1 Extra *e; pcb_printf("create_line from %#mD to %#mD\n", x1, y1, x2, y2); #endif - LineTypePtr line = CreateNewLineOnLayer(CURRENT, x1, y1, x2, y2, + pcb_line_t *line = CreateNewLineOnLayer(CURRENT, x1, y1, x2, y2, sample->Thickness, sample->Clearance, sample->Flags); AddObjectToCreateUndoList(PCB_TYPE_LINE, CURRENT, line, line); @@ -1639,7 +1639,7 @@ return line; } -static ArcTypePtr create_arc(LineTypePtr sample, int x, int y, int r, int sa, int da) +static ArcTypePtr create_arc(pcb_line_t *sample, int x, int y, int r, int sa, int da) { Extra *e; ArcTypePtr arc; @@ -1719,7 +1719,7 @@ e->start.next = e->end.next = 0; } -static void mark_line_for_deletion(LineTypePtr l) +static void mark_line_for_deletion(pcb_line_t *l) { Extra *e = LINE2EXTRA(l); if (e->deleted) { @@ -1764,12 +1764,12 @@ S E S E S E E S */ -static void maybe_pull_1(LineTypePtr line) +static void maybe_pull_1(pcb_line_t *line) { pcb_box_t box; /* Line half-thicknesses, including line space */ int ex, ey; - LineTypePtr new_line; + pcb_line_t *new_line; Extra *new_lextra; ArcTypePtr new_arc; Extra *new_aextra; @@ -2182,7 +2182,7 @@ } /* Given a line with a end_next, attempt to pull both ends. */ -static void maybe_pull(LineTypePtr line, Extra * e) +static void maybe_pull(pcb_line_t *line, Extra * e) { #if TRACE0 printf("maybe_pull: "); @@ -2236,7 +2236,7 @@ g_slice_free(Extra, extra); } -static void mark_ends_pending(LineType * line, Extra * extra, void *userdata) +static void mark_ends_pending(pcb_line_t * line, Extra * extra, void *userdata) { int *select_flags = userdata; if (TEST_FLAGS(*select_flags, line)) { Index: trunk/src_plugins/query/query_access.c =================================================================== --- trunk/src_plugins/query/query_access.c (revision 4763) +++ trunk/src_plugins/query/query_access.c (revision 4764) @@ -49,7 +49,7 @@ return 0; } -static void list_line_cb(void *ctx, pcb_board_t *pcb, pcb_layer_t *layer, LineType *line) +static void list_line_cb(void *ctx, pcb_board_t *pcb, pcb_layer_t *layer, pcb_line_t *line) { APPEND(ctx, PCB_OBJ_LINE, line, PCB_PARENT_LAYER, layer); } @@ -76,7 +76,7 @@ return 0; } -static void list_eline_cb(void *ctx, pcb_board_t *pcb, ElementType *element, LineType *line) +static void list_eline_cb(void *ctx, pcb_board_t *pcb, ElementType *element, pcb_line_t *line) { APPEND(ctx, PCB_OBJ_ELINE, line, PCB_PARENT_ELEMENT, element); } @@ -283,7 +283,7 @@ static int field_line(pcb_obj_t *obj, pcb_qry_node_t *fld, pcb_qry_val_t *res) { - LineType *l = obj->data.line; + pcb_line_t *l = obj->data.line; query_fields_keys_t fh1; fld2hash_req(fh1, fld, 0); @@ -562,7 +562,7 @@ static int field_eline(pcb_obj_t *obj, pcb_qry_node_t *fld, pcb_qry_val_t *res) { - LineType *l = obj->data.line; + pcb_line_t *l = obj->data.line; query_fields_keys_t fh1; fld2hash_req(fh1, fld, 0); Index: trunk/src_plugins/report/report.c =================================================================== --- trunk/src_plugins/report/report.c (revision 4763) +++ trunk/src_plugins/report/report.c (revision 4764) @@ -218,7 +218,7 @@ } case PCB_TYPE_LINE: { - LineTypePtr line; + pcb_line_t *line; #ifndef NDEBUG if (gui->shift_is_pressed()) { pcb_layer_t *layer = (pcb_layer_t *) ptr1; @@ -226,7 +226,7 @@ return 0; } #endif - line = (LineTypePtr) ptr2; + line = (pcb_line_t *) ptr2; report = pcb_strdup_printf("%m+LINE ID# %ld; Flags:%s\n" "FirstPoint(X,Y) = %$mD, ID = %ld.\n" "SecondPoint(X,Y) = %$mD, ID = %ld.\n" Index: trunk/src_plugins/teardrops/teardrops.c =================================================================== --- trunk/src_plugins/teardrops/teardrops.c (revision 4763) +++ trunk/src_plugins/teardrops/teardrops.c (revision 4764) @@ -59,7 +59,7 @@ static r_dir_t check_line_callback(const pcb_box_t * box, void *cl) { pcb_layer_t *lay = &PCB->Data->Layer[layer]; - LineType *l = (LineType *) box; + pcb_line_t *l = (pcb_line_t *) box; int x1, x2, y1, y2; double a, b, c, x, r, t; double dx, dy, len; Index: trunk/src_plugins/toporouter/toporouter.c =================================================================== --- trunk/src_plugins/toporouter/toporouter.c (revision 4763) +++ trunk/src_plugins/toporouter/toporouter.c (revision 4764) @@ -615,7 +615,7 @@ return 0.; } else if (box->type == LINE) { - LineType *line = (LineType *) box->data; + pcb_line_t *line = (pcb_line_t *) box->data; return line->Thickness; } else if (box->type == POLYGON) { @@ -2716,7 +2716,7 @@ { if (connection->type == PCB_TYPE_LINE) { - LineType *line = (LineType *) connection->ptr2; + pcb_line_t *line = (pcb_line_t *) connection->ptr2; toporouter_bbox_t *box = toporouter_bbox_locate(r, LINE, line, connection->X, connection->Y, connection->group); cluster_join_bbox(cluster, box); @@ -2913,7 +2913,7 @@ if (box->layer == (int) z) { if (box->type != BOARD) { if (box->type == LINE) { - LineType *line = (LineType *) box->data; + pcb_line_t *line = (pcb_line_t *) box->data; gint linewind = coord_wind(line->Point1.X, line->Point1.Y, x, y, line->Point2.X, line->Point2.Y); if (line->Point1.X > x - EPSILON && line->Point1.X < x + EPSILON && @@ -5530,7 +5530,7 @@ gdouble export_pcb_drawline(guint layer, guint x0, guint y0, guint x1, guint y1, guint thickness, guint clearance) { gdouble d = 0.; - LineTypePtr line; + pcb_line_t *line; line = CreateDrawnLineOnLayer(LAYER_PTR(layer), x0, y0, x1, y1, thickness, clearance, MakeFlags(PCB_FLAG_AUTO | (TEST_FLAG(CLEARNEWFLAG, PCB) ? PCB_FLAG_CLEARLINE : 0))); @@ -8149,7 +8149,7 @@ { if (TEST_FLAG(PCB_FLAG_SELECTED, pad)) { PinTypePtr via; - LineTypePtr line; + pcb_line_t *line; PadType *pad0 = element->Pad->data; PadType *pad1 = g_list_next(element->Pad)->data;