Index: trunk/doc-rnd/hacking/renames =================================================================== --- trunk/doc-rnd/hacking/renames (revision 4874) +++ trunk/doc-rnd/hacking/renames (revision 4875) @@ -300,3 +300,9 @@ ClearFlagOnPinsViasAndPads -> pcb_clear_flag_on_pins_vias_pads ClearFlagOnLinesAndPolygons -> pcb_clear_flag_on_lines_polys ClearFlagOnAllObjects -> pcb_clear_flag_on_all_objs +MakeFlags -> pcb_flag_make +OldFlags -> pcb_flag_old +AddFlags -> pcb_flag_add +MaskFlags -> pcb_flag_mask +EraseFlags -> pcb_flag_erase +NoFlags -> pcb_no_flags Index: trunk/src/action_helper.c =================================================================== --- trunk/src/action_helper.c (revision 4874) +++ trunk/src/action_helper.c (revision 4875) @@ -601,7 +601,7 @@ } if ((via = CreateNewVia(PCB->Data, Note.X, Note.Y, conf_core.design.via_thickness, 2 * conf_core.design.clearance, - 0, conf_core.design.via_drilling_hole, NULL, NoFlags())) != NULL) { + 0, conf_core.design.via_drilling_hole, NULL, pcb_no_flags())) != NULL) { AddObjectToCreateUndoList(PCB_TYPE_VIA, via, via, via); if (gui->shift_is_pressed()) pcb_chg_obj_thermal(PCB_TYPE_VIA, via, via, via, PCB->ThermStyle); @@ -660,7 +660,7 @@ dir, conf_core.design.line_thickness, 2 * conf_core.design.clearance, - MakeFlags(conf_core.editor.clear_line ? PCB_FLAG_CLEARLINE : 0)))) { + pcb_flag_make(conf_core.editor.clear_line ? PCB_FLAG_CLEARLINE : 0)))) { pcb_box_t *bx; bx = GetArcEnds(arc); @@ -803,7 +803,7 @@ Crosshair.AttachedLine.Point2.Y, conf_core.design.line_thickness, 2 * conf_core.design.clearance, - MakeFlags(maybe_found_flag | + pcb_flag_make(maybe_found_flag | (conf_core.editor.clear_line ? PCB_FLAG_CLEARLINE : 0)))) != NULL) { pcb_pin_t *via; @@ -825,7 +825,7 @@ Crosshair.AttachedLine.Point1.X, Crosshair.AttachedLine.Point1.Y, conf_core.design.via_thickness, - 2 * conf_core.design.clearance, 0, conf_core.design.via_drilling_hole, NULL, NoFlags())) != NULL) { + 2 * conf_core.design.clearance, 0, conf_core.design.via_drilling_hole, NULL, pcb_no_flags())) != NULL) { AddObjectToCreateUndoList(PCB_TYPE_VIA, via, via, via); DrawVia(via); } @@ -843,7 +843,7 @@ Note.X, Note.Y, conf_core.design.line_thickness, 2 * conf_core.design.clearance, - MakeFlags((conf_core.editor.auto_drc ? PCB_FLAG_FOUND : 0) | + pcb_flag_make((conf_core.editor.auto_drc ? PCB_FLAG_FOUND : 0) | (conf_core.editor.clear_line ? PCB_FLAG_CLEARLINE : 0)))) != NULL) { addedLines++; AddObjectToCreateUndoList(PCB_TYPE_LINE, CURRENT, line, line); @@ -888,7 +888,7 @@ Crosshair.AttachedBox.Point1.X, Crosshair.AttachedBox.Point1.Y, Crosshair.AttachedBox.Point2.X, - Crosshair.AttachedBox.Point2.Y, MakeFlags(flags))) != NULL) { + Crosshair.AttachedBox.Point2.Y, pcb_flag_make(flags))) != NULL) { AddObjectToCreateUndoList(PCB_TYPE_POLYGON, CURRENT, polygon, polygon); IncrementUndoSerialNumber(); DrawPolygon(CURRENT, polygon); @@ -912,7 +912,7 @@ if (GetLayerGroupNumberByNumber(INDEXOFCURRENT) == GetLayerGroupNumberByNumber(solder_silk_layer)) flag |= PCB_FLAG_ONSOLDER; if ((text = CreateNewText(CURRENT, &PCB->Font, Note.X, - Note.Y, 0, conf_core.design.text_scale, string, MakeFlags(flag))) != NULL) { + Note.Y, 0, conf_core.design.text_scale, string, pcb_flag_make(flag))) != NULL) { AddObjectToCreateUndoList(PCB_TYPE_TEXT, CURRENT, text, text); IncrementUndoSerialNumber(); DrawText(CURRENT, text); Index: trunk/src/crosshair.c =================================================================== --- trunk/src/crosshair.c (revision 4874) +++ trunk/src/crosshair.c (revision 4875) @@ -499,7 +499,7 @@ via.Clearance = 2 * conf_core.design.clearance; via.DrillingHole = conf_core.design.via_drilling_hole; via.Mask = 0; - via.Flags = NoFlags(); + via.Flags = pcb_no_flags(); gui->thindraw_pcb_pv(Crosshair.GC, Crosshair.GC, &via, pcb_true, pcb_false); Index: trunk/src/find_geo.c =================================================================== --- trunk/src/find_geo.c (revision 4874) +++ trunk/src/find_geo.c (revision 4875) @@ -578,7 +578,7 @@ line.Point1.Y = v->point[1]; line.Thickness = 2 * Bloat; line.Clearance = 0; - line.Flags = NoFlags(); + line.Flags = pcb_no_flags(); for (v = v->next; v != &c->head; v = v->next) { line.Point2.X = v->point[0]; line.Point2.Y = v->point[1]; Index: trunk/src/flag.c =================================================================== --- trunk/src/flag.c (revision 4874) +++ trunk/src/flag.c (revision 4875) @@ -30,7 +30,7 @@ #include "flag.h" /* This just fills in a pcb_flag_t with current flags. */ -pcb_flag_t MakeFlags(unsigned int flags) +pcb_flag_t pcb_flag_make(unsigned int flags) { pcb_flag_t rv; memset(&rv, 0, sizeof(rv)); @@ -39,7 +39,7 @@ } /* This converts old flag bits (from saved PCB files) to new format. */ -pcb_flag_t OldFlags(unsigned int flags) +pcb_flag_t pcb_flag_old(unsigned int flags) { pcb_flag_t rv; int i, f; @@ -56,13 +56,13 @@ return rv; } -pcb_flag_t AddFlags(pcb_flag_t flag, unsigned int flags) +pcb_flag_t pcb_flag_add(pcb_flag_t flag, unsigned int flags) { flag.f |= flags; return flag; } -pcb_flag_t MaskFlags(pcb_flag_t flag, unsigned int flags) +pcb_flag_t pcb_flag_mask(pcb_flag_t flag, unsigned int flags) { flag.f &= ~flags; return flag; @@ -76,7 +76,7 @@ return 0; } -void EraseFlags(pcb_flag_t * f) +void pcb_flag_erase(pcb_flag_t * f) { pcb_unknown_flag_t *u, *next; for (u = f->unknowns; u != NULL; u = next) { Index: trunk/src/flag.h =================================================================== --- trunk/src/flag.h (revision 4874) +++ trunk/src/flag.h (revision 4875) @@ -96,12 +96,12 @@ /* For passing modified flags to other functions. */ -pcb_flag_t MakeFlags(unsigned int); -pcb_flag_t OldFlags(unsigned int); -pcb_flag_t AddFlags(pcb_flag_t, unsigned int); -pcb_flag_t MaskFlags(pcb_flag_t, unsigned int); -void EraseFlags(pcb_flag_t *f); -#define NoFlags() MakeFlags(0) +pcb_flag_t pcb_flag_make(unsigned int); +pcb_flag_t pcb_flag_old(unsigned int); +pcb_flag_t pcb_flag_add(pcb_flag_t, unsigned int); +pcb_flag_t pcb_flag_mask(pcb_flag_t, unsigned int); +void pcb_flag_erase(pcb_flag_t *f); +#define pcb_no_flags() pcb_flag_make(0) /* --------------------------------------------------------------------------- * some routines for flag setting, clearing, changing and testing Index: trunk/src/obj_arc.c =================================================================== --- trunk/src/obj_arc.c (revision 4874) +++ trunk/src/obj_arc.c (revision 4875) @@ -227,7 +227,7 @@ return (CreateNewArcOnLayer(layer, Arc->X, Arc->Y, Arc->Width, Arc->Height, Arc->StartAngle, Arc->Delta, - Arc->Thickness, Arc->Clearance, MaskFlags(Arc->Flags, PCB_FLAG_FOUND | ctx->buffer.extraflg))); + Arc->Thickness, Arc->Clearance, pcb_flag_mask(Arc->Flags, PCB_FLAG_FOUND | ctx->buffer.extraflg))); } /* moves an arc to buffer */ @@ -419,7 +419,7 @@ arc = CreateNewArcOnLayer(Layer, Arc->X + ctx->copy.DeltaX, Arc->Y + ctx->copy.DeltaY, Arc->Width, Arc->Height, Arc->StartAngle, - Arc->Delta, Arc->Thickness, Arc->Clearance, MaskFlags(Arc->Flags, PCB_FLAG_FOUND)); + Arc->Delta, Arc->Thickness, Arc->Clearance, pcb_flag_mask(Arc->Flags, PCB_FLAG_FOUND)); if (!arc) return (arc); DrawArc(Layer, arc); @@ -604,7 +604,7 @@ if (!Arc->Thickness) return; pcb_draw_invalidate(Arc); - EraseFlags(&Arc->Flags); + pcb_flag_erase(&Arc->Flags); } void DrawArc(pcb_layer_t *Layer, pcb_arc_t *Arc) Index: trunk/src/obj_elem.c =================================================================== --- trunk/src/obj_elem.c (revision 4874) +++ trunk/src/obj_elem.c (revision 4875) @@ -183,7 +183,7 @@ ELEMENTLINE_LOOP(element); { CreateNewLineOnLayer(&Buffer->Data->SILKLAYER, - line->Point1.X, line->Point1.Y, line->Point2.X, line->Point2.Y, line->Thickness, 0, NoFlags()); + line->Point1.X, line->Point1.Y, line->Point2.X, line->Point2.Y, line->Thickness, 0, pcb_no_flags()); if (line) line->Number = pcb_strdup_null(NAMEONPCB_NAME(element)); } @@ -191,15 +191,15 @@ ARC_LOOP(element); { CreateNewArcOnLayer(&Buffer->Data->SILKLAYER, - arc->X, arc->Y, arc->Width, arc->Height, arc->StartAngle, arc->Delta, arc->Thickness, 0, NoFlags()); + arc->X, arc->Y, arc->Width, arc->Height, arc->StartAngle, arc->Delta, arc->Thickness, 0, pcb_no_flags()); } END_LOOP; PIN_LOOP(element); { - pcb_flag_t f = NoFlags(); - AddFlags(f, PCB_FLAG_VIA); + pcb_flag_t f = pcb_no_flags(); + pcb_flag_add(f, PCB_FLAG_VIA); if (TEST_FLAG(PCB_FLAG_HOLE, pin)) - AddFlags(f, PCB_FLAG_HOLE); + pcb_flag_add(f, PCB_FLAG_HOLE); CreateNewVia(Buffer->Data, pin->X, pin->Y, pin->Thickness, pin->Clearance, pin->Mask, pin->DrillingHole, pin->Number, f); } @@ -213,7 +213,7 @@ 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()); + pad->Point2.X, pad->Point2.Y, pad->Thickness, pad->Clearance, pcb_no_flags()); if (line) line->Number = pcb_strdup_null(pad->Number); } @@ -265,9 +265,9 @@ if (Buffer->Data->pcb == 0) Buffer->Data->pcb = PCB; - Element = CreateNewElement(PCB->Data, NULL, &PCB->Font, NoFlags(), + Element = CreateNewElement(PCB->Data, NULL, &PCB->Font, pcb_no_flags(), NULL, NULL, NULL, PCB_PASTEBUFFER->X, - PCB_PASTEBUFFER->Y, 0, 100, MakeFlags(SWAP_IDENT ? PCB_FLAG_ONSOLDER : PCB_FLAG_NO), pcb_false); + PCB_PASTEBUFFER->Y, 0, 100, pcb_flag_make(SWAP_IDENT ? PCB_FLAG_ONSOLDER : PCB_FLAG_NO), pcb_false); if (!Element) return (pcb_false); VIA_LOOP(Buffer->Data); @@ -278,12 +278,12 @@ if (via->Name) CreateNewPin(Element, via->X, via->Y, via->Thickness, via->Clearance, via->Mask, via->DrillingHole, - NULL, via->Name, MaskFlags(via->Flags, PCB_FLAG_VIA | PCB_FLAG_FOUND | PCB_FLAG_SELECTED | PCB_FLAG_WARN)); + NULL, via->Name, pcb_flag_mask(via->Flags, PCB_FLAG_VIA | PCB_FLAG_FOUND | PCB_FLAG_SELECTED | PCB_FLAG_WARN)); else { sprintf(num, "%d", pin_n++); CreateNewPin(Element, via->X, via->Y, via->Thickness, via->Clearance, via->Mask, via->DrillingHole, - NULL, num, MaskFlags(via->Flags, PCB_FLAG_VIA | PCB_FLAG_FOUND | PCB_FLAG_SELECTED | PCB_FLAG_WARN)); + NULL, num, pcb_flag_mask(via->Flags, PCB_FLAG_VIA | PCB_FLAG_FOUND | PCB_FLAG_SELECTED | PCB_FLAG_WARN)); } hasParts = pcb_true; } @@ -324,7 +324,7 @@ line->Point1.Y, line->Point2.X, line->Point2.Y, line->Thickness, line->Clearance, - line->Thickness + line->Clearance, NULL, line->Number ? line->Number : num, MakeFlags(onsolderflag)); + line->Thickness + line->Clearance, NULL, line->Number ? line->Number : num, pcb_flag_make(onsolderflag)); MAYBE_WARN(); hasParts = pcb_true; } @@ -349,7 +349,7 @@ sprintf(num, "%d", pin_n++); CreateNewPad(Element, x1, y1, x2, y2, t, - 2 * conf_core.design.clearance, t + conf_core.design.clearance, NULL, num, MakeFlags(PCB_FLAG_SQUARE | onsolderflag)); + 2 * conf_core.design.clearance, t + conf_core.design.clearance, NULL, num, pcb_flag_make(PCB_FLAG_SQUARE | onsolderflag)); MAYBE_WARN(); hasParts = pcb_true; } @@ -515,12 +515,12 @@ /* both coordinates and flags are the same */ Dest = CreateNewElement(Data, Dest, &PCB->Font, - MaskFlags(Src->Flags, PCB_FLAG_FOUND), + pcb_flag_mask(Src->Flags, PCB_FLAG_FOUND), DESCRIPTION_NAME(Src), NAMEONPCB_NAME(Src), VALUE_NAME(Src), DESCRIPTION_TEXT(Src).X + dx, DESCRIPTION_TEXT(Src).Y + dy, DESCRIPTION_TEXT(Src).Direction, - DESCRIPTION_TEXT(Src).Scale, MaskFlags(DESCRIPTION_TEXT(Src).Flags, PCB_FLAG_FOUND), uniqueName); + DESCRIPTION_TEXT(Src).Scale, pcb_flag_mask(DESCRIPTION_TEXT(Src).Flags, PCB_FLAG_FOUND), uniqueName); /* abort on error */ if (!Dest) @@ -535,7 +535,7 @@ PIN_LOOP(Src); { CreateNewPin(Dest, pin->X + dx, pin->Y + dy, pin->Thickness, - pin->Clearance, pin->Mask, pin->DrillingHole, pin->Name, pin->Number, MaskFlags(pin->Flags, PCB_FLAG_FOUND)); + pin->Clearance, pin->Mask, pin->DrillingHole, pin->Name, pin->Number, pcb_flag_mask(pin->Flags, PCB_FLAG_FOUND)); } END_LOOP; PAD_LOOP(Src); @@ -542,7 +542,7 @@ { CreateNewPad(Dest, pad->Point1.X + dx, pad->Point1.Y + dy, pad->Point2.X + dx, pad->Point2.Y + dy, pad->Thickness, - pad->Clearance, pad->Mask, pad->Name, pad->Number, MaskFlags(pad->Flags, PCB_FLAG_FOUND)); + pad->Clearance, pad->Mask, pad->Name, pad->Number, pcb_flag_mask(pad->Flags, PCB_FLAG_FOUND)); } END_LOOP; ARC_LOOP(Src); @@ -638,7 +638,7 @@ line->Point2.X = X2; line->Point2.Y = Y2; line->Thickness = Thickness; - line->Flags = NoFlags(); + line->Flags = pcb_no_flags(); line->ID = CreateIDGet(); return line; } @@ -1812,7 +1812,7 @@ END_LOOP; EraseElementName(Element); EraseElementPinsAndPads(Element); - EraseFlags(&Element->Flags); + pcb_flag_erase(&Element->Flags); } void EraseElementPinsAndPads(pcb_element_t *Element) Index: trunk/src/obj_line.c =================================================================== --- trunk/src/obj_line.c (revision 4874) +++ trunk/src/obj_line.c (revision 4875) @@ -166,7 +166,7 @@ info.Thickness = Thickness; info.Flags = Flags; info.test.Thickness = 0; - info.test.Flags = NoFlags(); + info.test.Flags = pcb_no_flags(); info.ans = NULL; /* prevent stacking of duplicate lines * and remove needless intermediate points @@ -251,7 +251,7 @@ line = CreateNewLineOnLayer(layer, Line->Point1.X, Line->Point1.Y, Line->Point2.X, Line->Point2.Y, - Line->Thickness, Line->Clearance, MaskFlags(Line->Flags, PCB_FLAG_FOUND | ctx->buffer.extraflg)); + Line->Thickness, Line->Clearance, pcb_flag_mask(Line->Flags, PCB_FLAG_FOUND | ctx->buffer.extraflg)); if (line && Line->Number) line->Number = pcb_strdup(Line->Number); return (line); @@ -380,7 +380,7 @@ line = CreateDrawnLineOnLayer(Layer, Line->Point1.X + ctx->copy.DeltaX, Line->Point1.Y + ctx->copy.DeltaY, Line->Point2.X + ctx->copy.DeltaX, - Line->Point2.Y + ctx->copy.DeltaY, Line->Thickness, Line->Clearance, MaskFlags(Line->Flags, PCB_FLAG_FOUND)); + Line->Point2.Y + ctx->copy.DeltaY, Line->Thickness, Line->Clearance, pcb_flag_mask(Line->Flags, PCB_FLAG_FOUND)); if (!line) return (line); if (Line->Number) @@ -470,7 +470,7 @@ if ((via = CreateNewVia(PCB->Data, i->X, i->Y, - conf_core.design.via_thickness, 2 * conf_core.design.clearance, PCB_FLAG_NO, conf_core.design.via_drilling_hole, NULL, NoFlags())) != NULL) { + conf_core.design.via_thickness, 2 * conf_core.design.clearance, PCB_FLAG_NO, conf_core.design.via_drilling_hole, NULL, pcb_no_flags())) != NULL) { AddObjectToCreateUndoList(PCB_TYPE_VIA, via, via, via); DrawVia(via); } @@ -751,7 +751,7 @@ void EraseLine(pcb_line_t *Line) { pcb_draw_invalidate(Line); - EraseFlags(&Line->Flags); + pcb_flag_erase(&Line->Flags); } void DrawLine(pcb_layer_t *Layer, pcb_line_t *Line) Index: trunk/src/obj_line_drcenf.c =================================================================== --- trunk/src/obj_line_drcenf.c (revision 4874) +++ trunk/src/obj_line_drcenf.c (revision 4875) @@ -262,7 +262,7 @@ f = 1.0; s = 0.5; last = -1; - line1.Flags = line2.Flags = NoFlags(); + line1.Flags = line2.Flags = pcb_no_flags(); line1.Thickness = conf_core.design.line_thickness + 2 * (PCB->Bloat + 1); line2.Thickness = line1.Thickness; line1.Clearance = line2.Clearance = 0; Index: trunk/src/obj_pad.c =================================================================== --- trunk/src/obj_pad.c (revision 4874) +++ trunk/src/obj_pad.c (revision 4875) @@ -333,7 +333,7 @@ gui->set_color(Output.fgGC, PCB->PinNameColor); - text.Flags = NoFlags(); + text.Flags = pcb_no_flags(); /* Set font height to approx 90% of pin thickness */ text.Scale = 90 * pad->Thickness / FONT_CAPHEIGHT; text.X = box.X1; @@ -458,7 +458,7 @@ pcb_draw_invalidate(Pad); if (TEST_FLAG(PCB_FLAG_DISPLAYNAME, Pad)) ErasePadName(Pad); - EraseFlags(&Pad->Flags); + pcb_flag_erase(&Pad->Flags); } void ErasePadName(pcb_pad_t *Pad) Index: trunk/src/obj_pinvia.c =================================================================== --- trunk/src/obj_pinvia.c (revision 4874) +++ trunk/src/obj_pinvia.c (revision 4875) @@ -235,7 +235,7 @@ /* copies a via to paste buffer */ void *AddViaToBuffer(pcb_opctx_t *ctx, pcb_pin_t *Via) { - return (CreateNewVia(ctx->buffer.dst, Via->X, Via->Y, Via->Thickness, Via->Clearance, Via->Mask, Via->DrillingHole, Via->Name, MaskFlags(Via->Flags, PCB_FLAG_FOUND | ctx->buffer.extraflg))); + return (CreateNewVia(ctx->buffer.dst, Via->X, Via->Y, Via->Thickness, Via->Clearance, Via->Mask, Via->DrillingHole, Via->Name, pcb_flag_mask(Via->Flags, PCB_FLAG_FOUND | ctx->buffer.extraflg))); } /* moves a via to paste buffer without allocating memory for the name */ @@ -705,7 +705,7 @@ pcb_pin_t *via; via = CreateNewVia(PCB->Data, Via->X + ctx->copy.DeltaX, Via->Y + ctx->copy.DeltaY, - Via->Thickness, Via->Clearance, Via->Mask, Via->DrillingHole, Via->Name, MaskFlags(Via->Flags, PCB_FLAG_FOUND)); + Via->Thickness, Via->Clearance, Via->Mask, Via->DrillingHole, Via->Name, pcb_flag_mask(Via->Flags, PCB_FLAG_FOUND)); if (!via) return (via); DrawVia(via); @@ -833,7 +833,7 @@ gui->set_color(Output.fgGC, PCB->PinNameColor); - text.Flags = NoFlags(); + text.Flags = pcb_no_flags(); /* Set font height to approx 56% of pin thickness */ text.Scale = 56 * pv->Thickness / FONT_CAPHEIGHT; text.X = box.X1; @@ -965,7 +965,7 @@ pcb_draw_invalidate(Via); if (TEST_FLAG(PCB_FLAG_DISPLAYNAME, Via)) EraseViaName(Via); - EraseFlags(&Via->Flags); + pcb_flag_erase(&Via->Flags); } void EraseViaName(pcb_pin_t *Via) @@ -978,7 +978,7 @@ pcb_draw_invalidate(Pin); if (TEST_FLAG(PCB_FLAG_DISPLAYNAME, Pin)) ErasePinName(Pin); - EraseFlags(&Pin->Flags); + pcb_flag_erase(&Pin->Flags); } void ErasePinName(pcb_pin_t *Pin) Index: trunk/src/obj_pinvia_therm.c =================================================================== --- trunk/src/obj_pinvia_therm.c (revision 4874) +++ trunk/src/obj_pinvia_therm.c (revision 4875) @@ -158,7 +158,7 @@ case 4: { pcb_line_t l; - l.Flags = NoFlags(); + l.Flags = pcb_no_flags(); d = pin->Thickness / 2 - pcb->ThermScale * pin->Clearance; out = pin->Thickness / 2 + pin->Clearance / 4; in = pin->Clearance / 2; @@ -406,7 +406,7 @@ a.Height = a.Width = pin->Thickness / 2 + pin->Clearance / 4; a.Thickness = 1; a.Clearance = pin->Clearance / 2; - a.Flags = NoFlags(); + a.Flags = pcb_no_flags(); a.Delta = 90 - (a.Clearance * (1. + 2. * pcb->ThermScale) * 180) / (M_PI * a.Width); a.StartAngle = 90 - a.Delta / 2 + (style == 4 ? 0 : 45); pa = ArcPoly(&a, a.Clearance); Index: trunk/src/obj_poly.c =================================================================== --- trunk/src/obj_poly.c (revision 4874) +++ trunk/src/obj_poly.c (revision 4875) @@ -621,7 +621,7 @@ { pcb_polygon_t *polygon; - polygon = CreateNewPolygon(Layer, NoFlags()); + polygon = CreateNewPolygon(Layer, pcb_no_flags()); CopyPolygonLowLevel(polygon, Polygon); MovePolygonLowLevel(polygon, ctx->copy.DeltaX, ctx->copy.DeltaY); if (!Layer->polygon_tree) @@ -679,7 +679,7 @@ void ErasePolygon(pcb_polygon_t *Polygon) { pcb_draw_invalidate(Polygon); - EraseFlags(&Polygon->Flags); + pcb_flag_erase(&Polygon->Flags); } void DrawPolygon(pcb_layer_t *Layer, pcb_polygon_t *Polygon) Index: trunk/src/obj_rat.c =================================================================== --- trunk/src/obj_rat.c (revision 4874) +++ trunk/src/obj_rat.c (revision 4875) @@ -128,7 +128,7 @@ { return (CreateNewRat(ctx->buffer.dst, Rat->Point1.X, Rat->Point1.Y, Rat->Point2.X, Rat->Point2.Y, Rat->group1, Rat->group2, Rat->Thickness, - MaskFlags(Rat->Flags, PCB_FLAG_FOUND | ctx->buffer.extraflg))); + pcb_flag_mask(Rat->Flags, PCB_FLAG_FOUND | ctx->buffer.extraflg))); } /* moves a rat-line to paste buffer */ @@ -265,7 +265,7 @@ } else EraseLine((pcb_line_t *) Rat); - EraseFlags(&Rat->Flags); + pcb_flag_erase(&Rat->Flags); } void DrawRat(pcb_rat_t *Rat) Index: trunk/src/obj_text.c =================================================================== --- trunk/src/obj_text.c (revision 4874) +++ trunk/src/obj_text.c (revision 4875) @@ -221,7 +221,7 @@ { pcb_layer_t *layer = &ctx->buffer.dst->Layer[GetLayerNumber(ctx->buffer.src, Layer)]; - return (CreateNewText(layer, &PCB->Font, Text->X, Text->Y, Text->Direction, Text->Scale, Text->TextString, MaskFlags(Text->Flags, ctx->buffer.extraflg))); + return (CreateNewText(layer, &PCB->Font, Text->X, Text->Y, Text->Direction, Text->Scale, Text->TextString, pcb_flag_mask(Text->Flags, ctx->buffer.extraflg))); } /* moves a text to buffer without allocating memory for the name */ @@ -328,7 +328,7 @@ pcb_text_t *text; text = CreateNewText(Layer, &PCB->Font, Text->X + ctx->copy.DeltaX, - Text->Y + ctx->copy.DeltaY, Text->Direction, Text->Scale, Text->TextString, MaskFlags(Text->Flags, PCB_FLAG_FOUND)); + Text->Y + ctx->copy.DeltaY, Text->Direction, Text->Scale, Text->TextString, pcb_flag_mask(Text->Flags, PCB_FLAG_FOUND)); DrawText(Layer, text); AddObjectToCreateUndoList(PCB_TYPE_TEXT, Layer, text, text); return (text); Index: trunk/src/polygon.c =================================================================== --- trunk/src/polygon.c (revision 4874) +++ trunk/src/polygon.c (revision 4875) @@ -1336,7 +1336,7 @@ int saveID; /* move data to layer and clear attached struct */ - polygon = CreateNewPolygon(CURRENT, NoFlags()); + polygon = CreateNewPolygon(CURRENT, pcb_no_flags()); saveID = polygon->ID; *polygon = Crosshair.AttachedPolygon; polygon->ID = saveID; Index: trunk/src/rats.c =================================================================== --- trunk/src/rats.c (revision 4874) +++ trunk/src/rats.c (revision 4875) @@ -612,7 +612,7 @@ if ((line = CreateNewRat(PCB->Data, firstpoint->X, firstpoint->Y, secondpoint->X, secondpoint->Y, - firstpoint->group, secondpoint->group, conf_core.appearance.rat_thickness, NoFlags())) != NULL) { + firstpoint->group, secondpoint->group, conf_core.appearance.rat_thickness, pcb_no_flags())) != NULL) { if (distance == 0) SET_FLAG(PCB_FLAG_VIA, line); AddObjectToCreateUndoList(PCB_TYPE_RATLINE, line, line, line); @@ -900,7 +900,7 @@ return (CreateNewRat(PCB->Data, Crosshair.AttachedLine.Point1.X, Crosshair.AttachedLine.Point1.Y, Crosshair.AttachedLine.Point2.X, - Crosshair.AttachedLine.Point2.Y, group1, group2, conf_core.appearance.rat_thickness, NoFlags())); + Crosshair.AttachedLine.Point2.Y, group1, group2, conf_core.appearance.rat_thickness, pcb_no_flags())); } Index: trunk/src/search.c =================================================================== --- trunk/src/search.c (revision 4874) +++ trunk/src/search.c (revision 4875) @@ -633,7 +633,7 @@ return (pcb_true); /* construct a set of dummy lines and check each of them */ line.Thickness = 0; - line.Flags = NoFlags(); + line.Flags = pcb_no_flags(); /* upper-left to upper-right corner */ line.Point1.Y = line.Point2.Y = Y1; @@ -708,7 +708,7 @@ return pcb_true; /* construct a set of dummy lines and check each of them */ line.Thickness = 0; - line.Flags = NoFlags(); + line.Flags = pcb_no_flags(); /* upper-left to upper-right corner */ line.Point1.X = p[0].X; @@ -748,7 +748,7 @@ /* construct a set of dummy lines and check each of them */ line.Thickness = 0; - line.Flags = NoFlags(); + line.Flags = pcb_no_flags(); /* upper-left to upper-right corner */ line.Point1.Y = line.Point2.Y = Y1; Index: trunk/src/stub_draw_fab.c =================================================================== --- trunk/src/stub_draw_fab.c (revision 4874) +++ trunk/src/stub_draw_fab.c (revision 4875) @@ -41,7 +41,7 @@ t.TextString = "Can't render the fab layer: the draw_fab plugin is not compiled and/or not loaded"; t.Direction = 0; t.Scale = 150; - t.Flags = NoFlags(); + t.Flags = pcb_no_flags(); DrawTextLowLevel(&t, 0); } Index: trunk/src/undo.c =================================================================== --- trunk/src/undo.c (revision 4874) +++ trunk/src/undo.c (revision 4875) @@ -528,8 +528,8 @@ swap = pin->Flags; must_redraw = 0; - f1 = MaskFlags(pin->Flags, ~DRAW_FLAGS); - f2 = MaskFlags(Entry->Data.Flags, ~DRAW_FLAGS); + f1 = pcb_flag_mask(pin->Flags, ~DRAW_FLAGS); + f2 = pcb_flag_mask(Entry->Data.Flags, ~DRAW_FLAGS); if (!FLAGS_EQUAL(f1, f2)) must_redraw = 1; Index: trunk/src_plugins/autoroute/autoroute.c =================================================================== --- trunk/src_plugins/autoroute/autoroute.c (revision 4874) +++ trunk/src_plugins/autoroute/autoroute.c (revision 4875) @@ -1339,16 +1339,16 @@ #if 1 if (b.Y1 == b.Y2 || b.X1 == b.X2) thickness = 5; - line = CreateNewLineOnLayer(LAYER_PTR(component_silk_layer), b.X1, b.Y1, b.X2, b.Y1, thickness, 0, MakeFlags(0)); + line = CreateNewLineOnLayer(LAYER_PTR(component_silk_layer), b.X1, b.Y1, b.X2, b.Y1, thickness, 0, pcb_flag_make(0)); AddObjectToCreateUndoList(PCB_TYPE_LINE, LAYER_PTR(component_silk_layer), line, line); if (b.Y1 != b.Y2) { - line = CreateNewLineOnLayer(LAYER_PTR(component_silk_layer), b.X1, b.Y2, b.X2, b.Y2, thickness, 0, MakeFlags(0)); + line = CreateNewLineOnLayer(LAYER_PTR(component_silk_layer), b.X1, b.Y2, b.X2, b.Y2, thickness, 0, pcb_flag_make(0)); AddObjectToCreateUndoList(PCB_TYPE_LINE, LAYER_PTR(component_silk_layer), line, line); } - line = CreateNewLineOnLayer(LAYER_PTR(component_silk_layer), b.X1, b.Y1, b.X1, b.Y2, thickness, 0, MakeFlags(0)); + line = CreateNewLineOnLayer(LAYER_PTR(component_silk_layer), b.X1, b.Y1, b.X1, b.Y2, thickness, 0, pcb_flag_make(0)); AddObjectToCreateUndoList(PCB_TYPE_LINE, LAYER_PTR(component_silk_layer), line, line); if (b.X1 != b.X2) { - line = CreateNewLineOnLayer(LAYER_PTR(component_silk_layer), b.X2, b.Y1, b.X2, b.Y2, thickness, 0, MakeFlags(0)); + line = CreateNewLineOnLayer(LAYER_PTR(component_silk_layer), b.X2, b.Y1, b.X2, b.Y2, thickness, 0, pcb_flag_make(0)); AddObjectToCreateUndoList(PCB_TYPE_LINE, LAYER_PTR(component_silk_layer), line, line); } #endif @@ -2859,7 +2859,7 @@ if (conf_core.editor.live_routing) { live_via = CreateNewVia(PCB->Data, X, Y, radius * 2, - 2 * AutoRouteParameters.style->Clearance, 0, AutoRouteParameters.style->Hole, NULL, MakeFlags(0)); + 2 * AutoRouteParameters.style->Clearance, 0, AutoRouteParameters.style->Hole, NULL, pcb_flag_make(0)); if (live_via != NULL) DrawVia(live_via); } @@ -2987,7 +2987,7 @@ if (conf_core.editor.live_routing) { pcb_layer_t *layer = LAYER_PTR(PCB->LayerGroups.Entries[rb->group][0]); pcb_line_t *line = CreateNewLineOnLayer(layer, qX1, qY1, qX2, qY2, - 2 * qhthick, 0, MakeFlags(0)); + 2 * qhthick, 0, pcb_flag_make(0)); rb->livedraw_obj.line = line; if (line != NULL) DrawLine(layer, line); @@ -4472,7 +4472,7 @@ /* using CreateDrawn instead of CreateNew concatenates sequential lines */ p->parent.line = CreateDrawnLineOnLayer (layer, b.X1, b.Y1, b.X2, b.Y2, - p->style->Thick, p->style->Clearance * 2, MakeFlags(PCB_FLAG_AUTO | (conf_core.editor.clear_line ? PCB_FLAG_CLEARLINE : 0))); + p->style->Thick, p->style->Clearance * 2, pcb_flag_make(PCB_FLAG_AUTO | (conf_core.editor.clear_line ? PCB_FLAG_CLEARLINE : 0))); if (p->parent.line) { AddObjectToCreateUndoList(PCB_TYPE_LINE, layer, p->parent.line, p->parent.line); @@ -4491,7 +4491,7 @@ pp->parent.via = CreateNewVia(PCB->Data, b.X1 + radius, b.Y1 + radius, - pp->style->Diameter, 2 * pp->style->Clearance, 0, pp->style->Hole, NULL, MakeFlags(PCB_FLAG_AUTO)); + pp->style->Diameter, 2 * pp->style->Clearance, 0, pp->style->Hole, NULL, pcb_flag_make(PCB_FLAG_AUTO)); assert(pp->parent.via); if (pp->parent.via) { AddObjectToCreateUndoList(PCB_TYPE_VIA, pp->parent.via, pp->parent.via, pp->parent.via); Index: trunk/src_plugins/draw_fab/draw_fab.c =================================================================== --- trunk/src_plugins/draw_fab/draw_fab.c (revision 4874) +++ trunk/src_plugins/draw_fab/draw_fab.c (revision 4875) @@ -75,7 +75,7 @@ t.Direction = 0; t.TextString = tmp; t.Scale = PCB_COORD_TO_MIL(TEXT_SIZE); /* pcnt of 100mil base height */ - t.Flags = NoFlags(); + t.Flags = pcb_no_flags(); t.X = x; t.Y = y; for (i = 0; tmp[i]; i++) Index: trunk/src_plugins/fontmode/fontmode.c =================================================================== --- trunk/src_plugins/fontmode/fontmode.c (revision 4874) +++ trunk/src_plugins/fontmode/fontmode.c (revision 4875) @@ -122,11 +122,11 @@ symbol->Line[l].Point1.X + ox, symbol->Line[l].Point1.Y + oy, symbol->Line[l].Point2.X + ox, - symbol->Line[l].Point2.Y + oy, symbol->Line[l].Thickness, symbol->Line[l].Thickness, NoFlags()); + symbol->Line[l].Point2.Y + oy, symbol->Line[l].Thickness, symbol->Line[l].Thickness, pcb_no_flags()); CreateDrawnLineOnLayer(lorig, symbol->Line[l].Point1.X + ox, symbol->Line[l].Point1.Y + oy, symbol->Line[l].Point2.X + ox, - symbol->Line[l].Point2.Y + oy, symbol->Line[l].Thickness, symbol->Line[l].Thickness, NoFlags()); + symbol->Line[l].Point2.Y + oy, symbol->Line[l].Thickness, symbol->Line[l].Thickness, pcb_no_flags()); if (maxx < symbol->Line[l].Point1.X) maxx = symbol->Line[l].Point1.X; if (maxx < symbol->Line[l].Point2.X) @@ -133,16 +133,16 @@ maxx = symbol->Line[l].Point2.X; } w = maxx + symbol->Delta + ox; - CreateDrawnLineOnLayer(lwidth, w, miny + oy, w, maxy + oy, PCB_MIL_TO_COORD(1), PCB_MIL_TO_COORD(1), NoFlags()); + CreateDrawnLineOnLayer(lwidth, w, miny + oy, w, maxy + oy, PCB_MIL_TO_COORD(1), PCB_MIL_TO_COORD(1), pcb_no_flags()); } for (l = 0; l < 16; l++) { int x = (l + 1) * CELL_SIZE; - CreateDrawnLineOnLayer(lgrid, x, 0, x, PCB->MaxHeight, PCB_MIL_TO_COORD(1), PCB_MIL_TO_COORD(1), NoFlags()); + CreateDrawnLineOnLayer(lgrid, x, 0, x, PCB->MaxHeight, PCB_MIL_TO_COORD(1), PCB_MIL_TO_COORD(1), pcb_no_flags()); } for (l = 0; l <= MAX_FONTPOSITION / 16 + 1; l++) { int y = (l + 1) * CELL_SIZE; - CreateDrawnLineOnLayer(lgrid, 0, y, PCB->MaxWidth, y, PCB_MIL_TO_COORD(1), PCB_MIL_TO_COORD(1), NoFlags()); + CreateDrawnLineOnLayer(lgrid, 0, y, PCB->MaxWidth, y, PCB_MIL_TO_COORD(1), PCB_MIL_TO_COORD(1), pcb_no_flags()); } return 0; } Index: trunk/src_plugins/hid_gtk/ghid-propedit.c =================================================================== --- trunk/src_plugins/hid_gtk/ghid-propedit.c (revision 4874) +++ trunk/src_plugins/hid_gtk/ghid-propedit.c (revision 4875) @@ -304,7 +304,7 @@ v = CreateNewPolygonFromRectangle(PCB->Data->Layer+1, PCB_MIL_TO_COORD(0), PCB_MIL_TO_COORD(0), PCB_MIL_TO_COORD(1500), PCB_MIL_TO_COORD(1500), - MakeFlags(PCB_FLAG_CLEARPOLY | PCB_FLAG_FULLPOLY)); + pcb_flag_make(PCB_FLAG_CLEARPOLY | PCB_FLAG_FULLPOLY)); printf("poly2=%p -----------\n", (void *)v); DrawPolygon(PCB->Data->Layer+1, v); pcb_draw(); @@ -333,27 +333,27 @@ CreateNewVia(preview_pcb.Data, PCB_MIL_TO_COORD(1000), PCB_MIL_TO_COORD(1000), - PCB_MIL_TO_COORD(50), PCB_MIL_TO_COORD(10), 0, PCB_MIL_TO_COORD(20), "", NoFlags()); + PCB_MIL_TO_COORD(50), PCB_MIL_TO_COORD(10), 0, PCB_MIL_TO_COORD(20), "", pcb_no_flags()); CreateNewLineOnLayer(preview_pcb.Data->Layer+0, PCB_MIL_TO_COORD(1000), PCB_MIL_TO_COORD(1000), PCB_MIL_TO_COORD(1000), PCB_MIL_TO_COORD(1300), - PCB_MIL_TO_COORD(20), PCB_MIL_TO_COORD(20), MakeFlags(PCB_FLAG_CLEARLINE)); + PCB_MIL_TO_COORD(20), PCB_MIL_TO_COORD(20), pcb_flag_make(PCB_FLAG_CLEARLINE)); CreateNewArcOnLayer(preview_pcb.Data->Layer+0, PCB_MIL_TO_COORD(1000), PCB_MIL_TO_COORD(1000), PCB_MIL_TO_COORD(100), PCB_MIL_TO_COORD(100), 0.0, 90.0, - PCB_MIL_TO_COORD(20), PCB_MIL_TO_COORD(20), MakeFlags(PCB_FLAG_CLEARLINE)); + PCB_MIL_TO_COORD(20), PCB_MIL_TO_COORD(20), pcb_flag_make(PCB_FLAG_CLEARLINE)); CreateNewText(preview_pcb.Data->Layer+0, &PCB->Font, - PCB_MIL_TO_COORD(850), PCB_MIL_TO_COORD(1150), 0, 100, "Text", MakeFlags(PCB_FLAG_CLEARLINE)); + PCB_MIL_TO_COORD(850), PCB_MIL_TO_COORD(1150), 0, 100, "Text", pcb_flag_make(PCB_FLAG_CLEARLINE)); { pcb_polygon_t *v = CreateNewPolygonFromRectangle(preview_pcb.Data->Layer, PCB_MIL_TO_COORD(10), PCB_MIL_TO_COORD(10), PCB_MIL_TO_COORD(1200), PCB_MIL_TO_COORD(1200), - MakeFlags(PCB_FLAG_CLEARPOLY)); + pcb_flag_make(PCB_FLAG_CLEARPOLY)); InitClip(preview_pcb.Data, preview_pcb.Data->Layer, v); } Index: trunk/src_plugins/import_dsn/dsn.c =================================================================== --- trunk/src_plugins/import_dsn/dsn.c (revision 4874) +++ trunk/src_plugins/import_dsn/dsn.c (revision 4875) @@ -144,7 +144,7 @@ y1 = dim2; if (x0 != 0 || y0 != 0) { line = CreateDrawnLineOnLayer(rlayer, x0, PCB->MaxHeight - y0, - x1, PCB->MaxHeight - y1, linethick, lineclear, MakeFlags(PCB_FLAG_AUTO | PCB_FLAG_CLEARLINE)); + x1, PCB->MaxHeight - y1, linethick, lineclear, pcb_flag_make(PCB_FLAG_AUTO | PCB_FLAG_CLEARLINE)); ClearFromPolygon(PCB->Data, PCB_TYPE_LINE, rlayer, line); } x0 = x1; @@ -152,7 +152,7 @@ } ret = sscanf(str, " (via via_%ld_%ld %ld %ld", &viadiam, &viadrill, &dim1, &dim2); if (ret == 4) { - CreateNewVia(PCB->Data, dim1, PCB->MaxHeight - dim2, viadiam, lineclear, 0, viadrill, 0, MakeFlags(PCB_FLAG_AUTO)); + CreateNewVia(PCB->Data, dim1, PCB->MaxHeight - dim2, viadiam, lineclear, 0, viadrill, 0, pcb_flag_make(PCB_FLAG_AUTO)); } } fclose(fp); Index: trunk/src_plugins/io_kicad/read.c =================================================================== --- trunk/src_plugins/io_kicad/read.c (revision 4874) +++ trunk/src_plugins/io_kicad/read.c (revision 4875) @@ -177,7 +177,7 @@ int mirrored = 0; double glyphWidth = 1.27; /* a reasonable approximation of pcb glyph width, ~= 5000 centimils */ unsigned direction = 0; /* default is horizontal */ - pcb_flag_t Flags = MakeFlags(0); /* start with something bland here */ + pcb_flag_t Flags = pcb_flag_make(0); /* start with something bland here */ int PCBLayer = 0; /* sane default value */ if (subtree->str != NULL) { @@ -237,7 +237,7 @@ if (PCBLayer == -1) { return -1; } else if (pcb_layer_flags(PCBLayer) & PCB_LYT_BOTTOM) { - Flags = MakeFlags(PCB_FLAG_ONSOLDER); + Flags = pcb_flag_make(PCB_FLAG_ONSOLDER); } } else { return -1; @@ -349,7 +349,7 @@ char *end; double val; pcb_coord_t X1, Y1, X2, Y2, Thickness, Clearance; /* not sure what to do with mask */ - pcb_flag_t Flags = MakeFlags(0); /* start with something bland here */ + pcb_flag_t Flags = pcb_flag_make(0); /* start with something bland here */ int PCBLayer = 0; /* sane default value */ Clearance = Thickness = PCB_MM_TO_COORD(0.250); /* start with sane defaults */ @@ -472,7 +472,7 @@ pcb_coord_t centreX, centreY, endX, endY, width, height, Thickness, Clearance; pcb_angle_t startAngle = 0.0; pcb_angle_t delta = 360.0; /* these defaults allow a gr_circle to be parsed, which does not specify (angle XXX) */ - pcb_flag_t Flags = MakeFlags(0); /* start with something bland here */ + pcb_flag_t Flags = pcb_flag_make(0); /* start with something bland here */ int PCBLayer = 0; /* sane default value */ Clearance = Thickness = PCB_MM_TO_COORD(0.250); /* start with sane defaults */ @@ -627,7 +627,7 @@ char *end, *name; /* not using via name for now */ double val; pcb_coord_t X, Y, Thickness, Clearance, Mask, Drill; /* not sure what to do with mask */ - pcb_flag_t Flags = MakeFlags(0); /* start with something bland here */ + pcb_flag_t Flags = pcb_flag_make(0); /* start with something bland here */ /* int PCBLayer = 0; not used for now; no blind or buried vias currently in pcb-rnd */ Clearance = Mask = PCB_MM_TO_COORD(0.250); /* start with something bland here */ @@ -721,7 +721,7 @@ char *end; double val; pcb_coord_t X1, Y1, X2, Y2, Thickness, Clearance; - pcb_flag_t Flags = MakeFlags(PCB_FLAG_CLEARLINE); /* we try clearline flag here */ + pcb_flag_t Flags = pcb_flag_make(PCB_FLAG_CLEARLINE); /* we try clearline flag here */ int PCBLayer = 0; /* sane default value */ Clearance = PCB_MM_TO_COORD(0.250); /* start with something bland here */ @@ -1001,8 +1001,8 @@ char * moduleName, * moduleRefdes, * moduleValue, * pinName; pcb_element_t *newModule; - pcb_flag_t Flags = MakeFlags(0); /* start with something bland here */ - pcb_flag_t TextFlags = MakeFlags(0); /* start with something bland here */ + pcb_flag_t Flags = pcb_flag_make(0); /* start with something bland here */ + pcb_flag_t TextFlags = pcb_flag_make(0); /* start with something bland here */ Clearance = PCB_MM_TO_COORD(0.250); /* start with something bland here */ moduleName = moduleRefdes = moduleValue = NULL; @@ -1020,8 +1020,8 @@ if (PCBLayer == -1) { return -1; } else if (pcb_layer_flags(PCBLayer) & PCB_LYT_BOTTOM) { - Flags = MakeFlags(PCB_FLAG_ONSOLDER); - TextFlags = MakeFlags(PCB_FLAG_ONSOLDER); + Flags = pcb_flag_make(PCB_FLAG_ONSOLDER); + TextFlags = pcb_flag_make(PCB_FLAG_ONSOLDER); } } else { return -1; @@ -1165,7 +1165,7 @@ if (PCBLayer == -1) { return -1; } else if (pcb_layer_flags(PCBLayer) & PCB_LYT_BOTTOM) { - Flags = MakeFlags(PCB_FLAG_ONSOLDER); + Flags = pcb_flag_make(PCB_FLAG_ONSOLDER); } } else { return -1; @@ -1394,7 +1394,7 @@ } else if (PCBLayer < -1) { printf("\tUnimplemented layer definition: %s", l->str); } else if (pcb_layer_flags(PCBLayer) & PCB_LYT_BOTTOM) { - Flags = MakeFlags(PCB_FLAG_ONSOLDER); + Flags = pcb_flag_make(PCB_FLAG_ONSOLDER); kicadLayer = 0; } pcb_printf("\tpad layer: '%s', PCB layer number %d\n", (l->str), kicad_get_layeridx(st, l->str)); @@ -1488,13 +1488,13 @@ Thickness = padXsize; } if (square && kicadLayer) { - Flags = MakeFlags(PCB_FLAG_SQUARE); + Flags = pcb_flag_make(PCB_FLAG_SQUARE); } else if (kicadLayer) { - Flags = MakeFlags(0); + Flags = pcb_flag_make(0); } else if (square && !kicadLayer) { - Flags = MakeFlags(PCB_FLAG_SQUARE | PCB_FLAG_ONSOLDER); + Flags = pcb_flag_make(PCB_FLAG_SQUARE | PCB_FLAG_ONSOLDER); } else { - Flags = MakeFlags(PCB_FLAG_ONSOLDER); + Flags = pcb_flag_make(PCB_FLAG_ONSOLDER); } CreateNewPad(newModule, X1 + moduleX, Y1 + moduleY, X2 + moduleX, Y2 + moduleY, Thickness, Clearance, Clearance, pinName, pinName, Flags); /* using clearance value for arg 7 = mask too */ @@ -1823,7 +1823,7 @@ unsigned long required; pcb_polygon_t *polygon = NULL; - pcb_flag_t flags = MakeFlags(PCB_FLAG_CLEARPOLY); + pcb_flag_t flags = pcb_flag_make(PCB_FLAG_CLEARPOLY); char *end; double val; pcb_coord_t X, Y; Index: trunk/src_plugins/io_pcb/parse_y.c =================================================================== --- trunk/src_plugins/io_pcb/parse_y.c (revision 4874) +++ trunk/src_plugins/io_pcb/parse_y.c (revision 4875) @@ -2061,7 +2061,7 @@ case 41: #line 577 "parse_y.y" /* yacc.c:1646 */ { - yy_pcb_flags = MakeFlags ((yyvsp[-1].integer) & PCB_FLAGS); + yy_pcb_flags = pcb_flag_make((yyvsp[-1].integer) & PCB_FLAGS); } #line 2067 "parse_y.c" /* yacc.c:1646 */ break; @@ -2146,7 +2146,7 @@ #line 760 "parse_y.y" /* yacc.c:1646 */ { CreateNewVia(yyData, OU ((yyvsp[-8].measure)), OU ((yyvsp[-7].measure)), OU ((yyvsp[-6].measure)), OU ((yyvsp[-5].measure)), OU ((yyvsp[-4].measure)), OU ((yyvsp[-3].measure)), (yyvsp[-2].string), - OldFlags((yyvsp[-1].integer))); + pcb_flag_old((yyvsp[-1].integer))); free ((yyvsp[-2].string)); } #line 2153 "parse_y.c" /* yacc.c:1646 */ @@ -2156,7 +2156,7 @@ #line 771 "parse_y.y" /* yacc.c:1646 */ { CreateNewVia(yyData, OU ((yyvsp[-7].measure)), OU ((yyvsp[-6].measure)), OU ((yyvsp[-5].measure)), OU ((yyvsp[-4].measure)), - OU ((yyvsp[-5].measure)) + OU((yyvsp[-4].measure)), OU ((yyvsp[-3].measure)), (yyvsp[-2].string), OldFlags((yyvsp[-1].integer))); + OU ((yyvsp[-5].measure)) + OU((yyvsp[-4].measure)), OU ((yyvsp[-3].measure)), (yyvsp[-2].string), pcb_flag_old((yyvsp[-1].integer))); free ((yyvsp[-2].string)); } #line 2163 "parse_y.c" /* yacc.c:1646 */ @@ -2166,7 +2166,7 @@ #line 781 "parse_y.y" /* yacc.c:1646 */ { CreateNewVia(yyData, OU ((yyvsp[-6].measure)), OU ((yyvsp[-5].measure)), OU ((yyvsp[-4].measure)), 2*GROUNDPLANEFRAME, - OU((yyvsp[-4].measure)) + 2*MASKFRAME, OU ((yyvsp[-3].measure)), (yyvsp[-2].string), OldFlags((yyvsp[-1].integer))); + OU((yyvsp[-4].measure)) + 2*MASKFRAME, OU ((yyvsp[-3].measure)), (yyvsp[-2].string), pcb_flag_old((yyvsp[-1].integer))); free ((yyvsp[-2].string)); } #line 2173 "parse_y.c" /* yacc.c:1646 */ @@ -2183,7 +2183,7 @@ hole = OU((yyvsp[-3].measure)) - MIN_PINORVIACOPPER; CreateNewVia(yyData, OU ((yyvsp[-5].measure)), OU ((yyvsp[-4].measure)), OU ((yyvsp[-3].measure)), 2*GROUNDPLANEFRAME, - OU((yyvsp[-3].measure)) + 2*MASKFRAME, hole, (yyvsp[-2].string), OldFlags((yyvsp[-1].integer))); + OU((yyvsp[-3].measure)) + 2*MASKFRAME, hole, (yyvsp[-2].string), pcb_flag_old((yyvsp[-1].integer))); free ((yyvsp[-2].string)); } #line 2190 "parse_y.c" /* yacc.c:1646 */ @@ -2202,7 +2202,7 @@ #line 832 "parse_y.y" /* yacc.c:1646 */ { CreateNewRat(yyData, OU ((yyvsp[-7].measure)), OU ((yyvsp[-6].measure)), OU ((yyvsp[-4].measure)), OU ((yyvsp[-3].measure)), (yyvsp[-5].integer), (yyvsp[-2].integer), - conf_core.appearance.rat_thickness, OldFlags((yyvsp[-1].integer))); + conf_core.appearance.rat_thickness, pcb_flag_old((yyvsp[-1].integer))); } #line 2208 "parse_y.c" /* yacc.c:1646 */ break; @@ -2239,7 +2239,7 @@ #line 908 "parse_y.y" /* yacc.c:1646 */ { CreateNewPolygonFromRectangle(Layer, - OU ((yyvsp[-5].measure)), OU ((yyvsp[-4].measure)), OU ((yyvsp[-5].measure)) + OU ((yyvsp[-3].measure)), OU ((yyvsp[-4].measure)) + OU ((yyvsp[-2].measure)), OldFlags((yyvsp[-1].integer))); + OU ((yyvsp[-5].measure)), OU ((yyvsp[-4].measure)), OU ((yyvsp[-5].measure)) + OU ((yyvsp[-3].measure)), OU ((yyvsp[-4].measure)) + OU ((yyvsp[-2].measure)), pcb_flag_old((yyvsp[-1].integer))); } #line 2245 "parse_y.c" /* yacc.c:1646 */ break; @@ -2263,7 +2263,7 @@ #line 956 "parse_y.y" /* yacc.c:1646 */ { CreateNewLineOnLayer(Layer, OU ((yyvsp[-7].measure)), OU ((yyvsp[-6].measure)), OU ((yyvsp[-5].measure)), OU ((yyvsp[-4].measure)), - OU ((yyvsp[-3].measure)), OU ((yyvsp[-2].measure)), OldFlags((yyvsp[-1].integer))); + OU ((yyvsp[-3].measure)), OU ((yyvsp[-2].measure)), pcb_flag_old((yyvsp[-1].integer))); } #line 2269 "parse_y.c" /* yacc.c:1646 */ break; @@ -2274,7 +2274,7 @@ /* eliminate old-style rat-lines */ if ((IV ((yyvsp[-1].measure)) & PCB_FLAG_RAT) == 0) CreateNewLineOnLayer(Layer, OU ((yyvsp[-6].measure)), OU ((yyvsp[-5].measure)), OU ((yyvsp[-4].measure)), OU ((yyvsp[-3].measure)), OU ((yyvsp[-2].measure)), - 200*GROUNDPLANEFRAME, OldFlags(IV ((yyvsp[-1].measure)))); + 200*GROUNDPLANEFRAME, pcb_flag_old(IV ((yyvsp[-1].measure)))); } #line 2280 "parse_y.c" /* yacc.c:1646 */ break; @@ -2292,7 +2292,7 @@ #line 1022 "parse_y.y" /* yacc.c:1646 */ { CreateNewArcOnLayer(Layer, OU ((yyvsp[-9].measure)), OU ((yyvsp[-8].measure)), OU ((yyvsp[-7].measure)), OU ((yyvsp[-6].measure)), (yyvsp[-3].number), (yyvsp[-2].number), - OU ((yyvsp[-5].measure)), OU ((yyvsp[-4].measure)), OldFlags((yyvsp[-1].integer))); + OU ((yyvsp[-5].measure)), OU ((yyvsp[-4].measure)), pcb_flag_old((yyvsp[-1].integer))); } #line 2298 "parse_y.c" /* yacc.c:1646 */ break; @@ -2301,7 +2301,7 @@ #line 1031 "parse_y.y" /* yacc.c:1646 */ { CreateNewArcOnLayer(Layer, OU ((yyvsp[-8].measure)), OU ((yyvsp[-7].measure)), OU ((yyvsp[-6].measure)), OU ((yyvsp[-6].measure)), IV ((yyvsp[-3].measure)), (yyvsp[-2].number), - OU ((yyvsp[-4].measure)), 200*GROUNDPLANEFRAME, OldFlags((yyvsp[-1].integer))); + OU ((yyvsp[-4].measure)), 200*GROUNDPLANEFRAME, pcb_flag_old((yyvsp[-1].integer))); } #line 2307 "parse_y.c" /* yacc.c:1646 */ break; @@ -2310,7 +2310,7 @@ #line 1068 "parse_y.y" /* yacc.c:1646 */ { /* use a default scale of 100% */ - CreateNewText(Layer,yyFont,OU ((yyvsp[-5].measure)), OU ((yyvsp[-4].measure)), (yyvsp[-3].number), 100, (yyvsp[-2].string), OldFlags((yyvsp[-1].integer))); + CreateNewText(Layer,yyFont,OU ((yyvsp[-5].measure)), OU ((yyvsp[-4].measure)), (yyvsp[-3].number), 100, (yyvsp[-2].string), pcb_flag_old((yyvsp[-1].integer))); free ((yyvsp[-2].string)); } #line 2317 "parse_y.c" /* yacc.c:1646 */ @@ -2325,11 +2325,11 @@ (((yyvsp[-1].integer) & PCB_FLAG_ONSOLDER) ? SOLDER_LAYER : COMPONENT_LAYER)]; CreateNewText(lay ,yyFont, OU ((yyvsp[-6].measure)), OU ((yyvsp[-5].measure)), (yyvsp[-4].number), (yyvsp[-3].number), (yyvsp[-2].string), - OldFlags((yyvsp[-1].integer))); + pcb_flag_old((yyvsp[-1].integer))); } else CreateNewText(Layer, yyFont, OU ((yyvsp[-6].measure)), OU ((yyvsp[-5].measure)), (yyvsp[-4].number), (yyvsp[-3].number), (yyvsp[-2].string), - OldFlags((yyvsp[-1].integer))); + pcb_flag_old((yyvsp[-1].integer))); free ((yyvsp[-2].string)); } #line 2336 "parse_y.c" /* yacc.c:1646 */ @@ -2430,8 +2430,8 @@ case 116: #line 1279 "parse_y.y" /* yacc.c:1646 */ { - yyElement = CreateNewElement(yyData, yyElement, yyFont, NoFlags(), - (yyvsp[-6].string), (yyvsp[-5].string), NULL, OU ((yyvsp[-4].measure)), OU ((yyvsp[-3].measure)), (yyvsp[-2].integer), 100, NoFlags(), pcb_false); + yyElement = CreateNewElement(yyData, yyElement, yyFont, pcb_no_flags(), + (yyvsp[-6].string), (yyvsp[-5].string), NULL, OU ((yyvsp[-4].measure)), OU ((yyvsp[-3].measure)), (yyvsp[-2].integer), 100, pcb_no_flags(), pcb_false); free ((yyvsp[-6].string)); free ((yyvsp[-5].string)); pin_num = 1; @@ -2450,8 +2450,8 @@ case 118: #line 1297 "parse_y.y" /* yacc.c:1646 */ { - yyElement = CreateNewElement(yyData, yyElement, yyFont, OldFlags((yyvsp[-9].integer)), - (yyvsp[-8].string), (yyvsp[-7].string), NULL, OU ((yyvsp[-6].measure)), OU ((yyvsp[-5].measure)), IV ((yyvsp[-4].measure)), IV ((yyvsp[-3].measure)), OldFlags((yyvsp[-2].integer)), pcb_false); + yyElement = CreateNewElement(yyData, yyElement, yyFont, pcb_flag_old((yyvsp[-9].integer)), + (yyvsp[-8].string), (yyvsp[-7].string), NULL, OU ((yyvsp[-6].measure)), OU ((yyvsp[-5].measure)), IV ((yyvsp[-4].measure)), IV ((yyvsp[-3].measure)), pcb_flag_old((yyvsp[-2].integer)), pcb_false); free ((yyvsp[-8].string)); free ((yyvsp[-7].string)); pin_num = 1; @@ -2470,8 +2470,8 @@ case 120: #line 1315 "parse_y.y" /* yacc.c:1646 */ { - yyElement = CreateNewElement(yyData, yyElement, yyFont, OldFlags((yyvsp[-10].integer)), - (yyvsp[-9].string), (yyvsp[-8].string), (yyvsp[-7].string), OU ((yyvsp[-6].measure)), OU ((yyvsp[-5].measure)), IV ((yyvsp[-4].measure)), IV ((yyvsp[-3].measure)), OldFlags((yyvsp[-2].integer)), pcb_false); + yyElement = CreateNewElement(yyData, yyElement, yyFont, pcb_flag_old((yyvsp[-10].integer)), + (yyvsp[-9].string), (yyvsp[-8].string), (yyvsp[-7].string), OU ((yyvsp[-6].measure)), OU ((yyvsp[-5].measure)), IV ((yyvsp[-4].measure)), IV ((yyvsp[-3].measure)), pcb_flag_old((yyvsp[-2].integer)), pcb_false); free ((yyvsp[-9].string)); free ((yyvsp[-8].string)); free ((yyvsp[-7].string)); @@ -2491,9 +2491,9 @@ case 122: #line 1335 "parse_y.y" /* yacc.c:1646 */ { - yyElement = CreateNewElement(yyData, yyElement, yyFont, OldFlags((yyvsp[-12].integer)), + yyElement = CreateNewElement(yyData, yyElement, yyFont, pcb_flag_old((yyvsp[-12].integer)), (yyvsp[-11].string), (yyvsp[-10].string), (yyvsp[-9].string), OU ((yyvsp[-8].measure)) + OU ((yyvsp[-6].measure)), OU ((yyvsp[-7].measure)) + OU ((yyvsp[-5].measure)), - (yyvsp[-4].number), (yyvsp[-3].number), OldFlags((yyvsp[-2].integer)), pcb_false); + (yyvsp[-4].number), (yyvsp[-3].number), pcb_flag_old((yyvsp[-2].integer)), pcb_false); yyElement->MarkX = OU ((yyvsp[-8].measure)); yyElement->MarkY = OU ((yyvsp[-7].measure)); free ((yyvsp[-11].string)); @@ -2651,7 +2651,7 @@ { CreateNewPin(yyElement, OU ((yyvsp[-9].measure)) + yyElement->MarkX, OU ((yyvsp[-8].measure)) + yyElement->MarkY, OU ((yyvsp[-7].measure)), OU ((yyvsp[-6].measure)), OU ((yyvsp[-5].measure)), OU ((yyvsp[-4].measure)), (yyvsp[-3].string), - (yyvsp[-2].string), OldFlags((yyvsp[-1].integer))); + (yyvsp[-2].string), pcb_flag_old((yyvsp[-1].integer))); free ((yyvsp[-3].string)); free ((yyvsp[-2].string)); } @@ -2662,7 +2662,7 @@ #line 1580 "parse_y.y" /* yacc.c:1646 */ { CreateNewPin(yyElement, OU ((yyvsp[-7].measure)), OU ((yyvsp[-6].measure)), OU ((yyvsp[-5].measure)), 2*GROUNDPLANEFRAME, - OU ((yyvsp[-5].measure)) + 2*MASKFRAME, OU ((yyvsp[-4].measure)), (yyvsp[-3].string), (yyvsp[-2].string), OldFlags((yyvsp[-1].integer))); + OU ((yyvsp[-5].measure)) + 2*MASKFRAME, OU ((yyvsp[-4].measure)), (yyvsp[-3].string), (yyvsp[-2].string), pcb_flag_old((yyvsp[-1].integer))); free ((yyvsp[-3].string)); free ((yyvsp[-2].string)); } @@ -2676,7 +2676,7 @@ sprintf(p_number, "%d", pin_num++); CreateNewPin(yyElement, OU ((yyvsp[-6].measure)), OU ((yyvsp[-5].measure)), OU ((yyvsp[-4].measure)), 2*GROUNDPLANEFRAME, - OU ((yyvsp[-4].measure)) + 2*MASKFRAME, OU ((yyvsp[-3].measure)), (yyvsp[-2].string), p_number, OldFlags((yyvsp[-1].integer))); + OU ((yyvsp[-4].measure)) + 2*MASKFRAME, OU ((yyvsp[-3].measure)), (yyvsp[-2].string), p_number, pcb_flag_old((yyvsp[-1].integer))); free ((yyvsp[-2].string)); } @@ -2696,7 +2696,7 @@ sprintf(p_number, "%d", pin_num++); CreateNewPin(yyElement, OU ((yyvsp[-5].measure)), OU ((yyvsp[-4].measure)), OU ((yyvsp[-3].measure)), 2*GROUNDPLANEFRAME, - OU ((yyvsp[-3].measure)) + 2*MASKFRAME, hole, (yyvsp[-2].string), p_number, OldFlags((yyvsp[-1].integer))); + OU ((yyvsp[-3].measure)) + 2*MASKFRAME, hole, (yyvsp[-2].string), p_number, pcb_flag_old((yyvsp[-1].integer))); free ((yyvsp[-2].string)); } #line 2703 "parse_y.c" /* yacc.c:1646 */ @@ -2722,7 +2722,7 @@ CreateNewPad(yyElement,OU ((yyvsp[-10].measure)) + yyElement->MarkX, OU ((yyvsp[-9].measure)) + yyElement->MarkY, OU ((yyvsp[-8].measure)) + yyElement->MarkX, OU ((yyvsp[-7].measure)) + yyElement->MarkY, OU ((yyvsp[-6].measure)), OU ((yyvsp[-5].measure)), OU ((yyvsp[-4].measure)), - (yyvsp[-3].string), (yyvsp[-2].string), OldFlags((yyvsp[-1].integer))); + (yyvsp[-3].string), (yyvsp[-2].string), pcb_flag_old((yyvsp[-1].integer))); free ((yyvsp[-3].string)); free ((yyvsp[-2].string)); } @@ -2733,7 +2733,7 @@ #line 1688 "parse_y.y" /* yacc.c:1646 */ { CreateNewPad(yyElement,OU ((yyvsp[-8].measure)),OU ((yyvsp[-7].measure)),OU ((yyvsp[-6].measure)),OU ((yyvsp[-5].measure)),OU ((yyvsp[-4].measure)), 2*GROUNDPLANEFRAME, - OU ((yyvsp[-4].measure)) + 2*MASKFRAME, (yyvsp[-3].string), (yyvsp[-2].string), OldFlags((yyvsp[-1].integer))); + OU ((yyvsp[-4].measure)) + 2*MASKFRAME, (yyvsp[-3].string), (yyvsp[-2].string), pcb_flag_old((yyvsp[-1].integer))); free ((yyvsp[-3].string)); free ((yyvsp[-2].string)); } @@ -2747,7 +2747,7 @@ sprintf(p_number, "%d", pin_num++); CreateNewPad(yyElement,OU ((yyvsp[-7].measure)),OU ((yyvsp[-6].measure)),OU ((yyvsp[-5].measure)),OU ((yyvsp[-4].measure)),OU ((yyvsp[-3].measure)), 2*GROUNDPLANEFRAME, - OU ((yyvsp[-3].measure)) + 2*MASKFRAME, (yyvsp[-2].string),p_number, OldFlags((yyvsp[-1].integer))); + OU ((yyvsp[-3].measure)) + 2*MASKFRAME, (yyvsp[-2].string),p_number, pcb_flag_old((yyvsp[-1].integer))); free ((yyvsp[-2].string)); } #line 2754 "parse_y.c" /* yacc.c:1646 */ @@ -2755,7 +2755,7 @@ case 162: #line 1709 "parse_y.y" /* yacc.c:1646 */ - { (yyval.flagtype) = OldFlags((yyvsp[0].integer)); } + { (yyval.flagtype) = pcb_flag_old((yyvsp[0].integer)); } #line 2760 "parse_y.c" /* yacc.c:1646 */ break; Index: trunk/src_plugins/io_pcb/parse_y.y =================================================================== --- trunk/src_plugins/io_pcb/parse_y.y (revision 4874) +++ trunk/src_plugins/io_pcb/parse_y.y (revision 4875) @@ -575,7 +575,7 @@ pcbflags : T_FLAGS '(' INTEGER ')' { - yy_pcb_flags = MakeFlags ($3 & PCB_FLAGS); + yy_pcb_flags = pcb_flag_make($3 & PCB_FLAGS); } | T_FLAGS '(' STRING ')' { @@ -759,7 +759,7 @@ : T_VIA '(' measure measure measure measure measure measure STRING INTEGER ')' { CreateNewVia(yyData, OU ($3), OU ($4), OU ($5), OU ($6), OU ($7), OU ($8), $9, - OldFlags($10)); + pcb_flag_old($10)); free ($9); } ; @@ -770,7 +770,7 @@ : T_VIA '(' measure measure measure measure measure STRING INTEGER ')' { CreateNewVia(yyData, OU ($3), OU ($4), OU ($5), OU ($6), - OU ($5) + OU($6), OU ($7), $8, OldFlags($9)); + OU ($5) + OU($6), OU ($7), $8, pcb_flag_old($9)); free ($8); } ; @@ -780,7 +780,7 @@ : T_VIA '(' measure measure measure measure STRING INTEGER ')' { CreateNewVia(yyData, OU ($3), OU ($4), OU ($5), 2*GROUNDPLANEFRAME, - OU($5) + 2*MASKFRAME, OU ($6), $7, OldFlags($8)); + OU($5) + 2*MASKFRAME, OU ($6), $7, pcb_flag_old($8)); free ($7); } ; @@ -797,7 +797,7 @@ hole = OU($5) - MIN_PINORVIACOPPER; CreateNewVia(yyData, OU ($3), OU ($4), OU ($5), 2*GROUNDPLANEFRAME, - OU($5) + 2*MASKFRAME, hole, $6, OldFlags($7)); + OU($5) + 2*MASKFRAME, hole, $6, pcb_flag_old($7)); free ($6); } ; @@ -831,7 +831,7 @@ | T_RAT '(' measure measure INTEGER measure measure INTEGER INTEGER ')' { CreateNewRat(yyData, OU ($3), OU ($4), OU ($6), OU ($7), $5, $8, - conf_core.appearance.rat_thickness, OldFlags($9)); + conf_core.appearance.rat_thickness, pcb_flag_old($9)); } ; @@ -907,7 +907,7 @@ | T_RECTANGLE '(' measure measure measure measure INTEGER ')' { CreateNewPolygonFromRectangle(Layer, - OU ($3), OU ($4), OU ($3) + OU ($5), OU ($4) + OU ($6), OldFlags($7)); + OU ($3), OU ($4), OU ($3) + OU ($5), OU ($4) + OU ($6), pcb_flag_old($7)); } | text_hi_format | text_newformat @@ -955,7 +955,7 @@ : T_LINE '(' measure measure measure measure measure measure INTEGER ')' { CreateNewLineOnLayer(Layer, OU ($3), OU ($4), OU ($5), OU ($6), - OU ($7), OU ($8), OldFlags($9)); + OU ($7), OU ($8), pcb_flag_old($9)); } ; @@ -966,7 +966,7 @@ /* eliminate old-style rat-lines */ if ((IV ($8) & PCB_FLAG_RAT) == 0) CreateNewLineOnLayer(Layer, OU ($3), OU ($4), OU ($5), OU ($6), OU ($7), - 200*GROUNDPLANEFRAME, OldFlags(IV ($8))); + 200*GROUNDPLANEFRAME, pcb_flag_old(IV ($8))); } ; @@ -1021,7 +1021,7 @@ : T_ARC '(' measure measure measure measure measure measure number number INTEGER ')' { CreateNewArcOnLayer(Layer, OU ($3), OU ($4), OU ($5), OU ($6), $9, $10, - OU ($7), OU ($8), OldFlags($11)); + OU ($7), OU ($8), pcb_flag_old($11)); } ; @@ -1030,7 +1030,7 @@ : T_ARC '(' measure measure measure measure measure measure number INTEGER ')' { CreateNewArcOnLayer(Layer, OU ($3), OU ($4), OU ($5), OU ($5), IV ($8), $9, - OU ($7), 200*GROUNDPLANEFRAME, OldFlags($10)); + OU ($7), 200*GROUNDPLANEFRAME, pcb_flag_old($10)); } ; @@ -1067,7 +1067,7 @@ : T_TEXT '(' measure measure number STRING INTEGER ')' { /* use a default scale of 100% */ - CreateNewText(Layer,yyFont,OU ($3), OU ($4), $5, 100, $6, OldFlags($7)); + CreateNewText(Layer,yyFont,OU ($3), OU ($4), $5, 100, $6, pcb_flag_old($7)); free ($6); } ; @@ -1082,11 +1082,11 @@ (($8 & PCB_FLAG_ONSOLDER) ? SOLDER_LAYER : COMPONENT_LAYER)]; CreateNewText(lay ,yyFont, OU ($3), OU ($4), $5, $6, $7, - OldFlags($8)); + pcb_flag_old($8)); } else CreateNewText(Layer, yyFont, OU ($3), OU ($4), $5, $6, $7, - OldFlags($8)); + pcb_flag_old($8)); free ($7); } ; @@ -1277,8 +1277,8 @@ */ : T_ELEMENT '(' STRING STRING measure measure INTEGER ')' '(' { - yyElement = CreateNewElement(yyData, yyElement, yyFont, NoFlags(), - $3, $4, NULL, OU ($5), OU ($6), $7, 100, NoFlags(), pcb_false); + yyElement = CreateNewElement(yyData, yyElement, yyFont, pcb_no_flags(), + $3, $4, NULL, OU ($5), OU ($6), $7, 100, pcb_no_flags(), pcb_false); free ($3); free ($4); pin_num = 1; @@ -1295,8 +1295,8 @@ */ : T_ELEMENT '(' INTEGER STRING STRING measure measure measure measure INTEGER ')' '(' { - yyElement = CreateNewElement(yyData, yyElement, yyFont, OldFlags($3), - $4, $5, NULL, OU ($6), OU ($7), IV ($8), IV ($9), OldFlags($10), pcb_false); + yyElement = CreateNewElement(yyData, yyElement, yyFont, pcb_flag_old($3), + $4, $5, NULL, OU ($6), OU ($7), IV ($8), IV ($9), pcb_flag_old($10), pcb_false); free ($4); free ($5); pin_num = 1; @@ -1313,8 +1313,8 @@ */ : T_ELEMENT '(' INTEGER STRING STRING STRING measure measure measure measure INTEGER ')' '(' { - yyElement = CreateNewElement(yyData, yyElement, yyFont, OldFlags($3), - $4, $5, $6, OU ($7), OU ($8), IV ($9), IV ($10), OldFlags($11), pcb_false); + yyElement = CreateNewElement(yyData, yyElement, yyFont, pcb_flag_old($3), + $4, $5, $6, OU ($7), OU ($8), IV ($9), IV ($10), pcb_flag_old($11), pcb_false); free ($4); free ($5); free ($6); @@ -1333,9 +1333,9 @@ : T_ELEMENT '(' INTEGER STRING STRING STRING measure measure measure measure number number INTEGER ')' '(' { - yyElement = CreateNewElement(yyData, yyElement, yyFont, OldFlags($3), + yyElement = CreateNewElement(yyData, yyElement, yyFont, pcb_flag_old($3), $4, $5, $6, OU ($7) + OU ($9), OU ($8) + OU ($10), - $11, $12, OldFlags($13), pcb_false); + $11, $12, pcb_flag_old($13), pcb_false); yyElement->MarkX = OU ($7); yyElement->MarkY = OU ($8); free ($4); @@ -1568,7 +1568,7 @@ { CreateNewPin(yyElement, OU ($3) + yyElement->MarkX, OU ($4) + yyElement->MarkY, OU ($5), OU ($6), OU ($7), OU ($8), $9, - $10, OldFlags($11)); + $10, pcb_flag_old($11)); free ($9); free ($10); } @@ -1579,7 +1579,7 @@ : T_PIN '(' measure measure measure measure STRING STRING INTEGER ')' { CreateNewPin(yyElement, OU ($3), OU ($4), OU ($5), 2*GROUNDPLANEFRAME, - OU ($5) + 2*MASKFRAME, OU ($6), $7, $8, OldFlags($9)); + OU ($5) + 2*MASKFRAME, OU ($6), $7, $8, pcb_flag_old($9)); free ($7); free ($8); } @@ -1593,7 +1593,7 @@ sprintf(p_number, "%d", pin_num++); CreateNewPin(yyElement, OU ($3), OU ($4), OU ($5), 2*GROUNDPLANEFRAME, - OU ($5) + 2*MASKFRAME, OU ($6), $7, p_number, OldFlags($8)); + OU ($5) + 2*MASKFRAME, OU ($6), $7, p_number, pcb_flag_old($8)); free ($7); } @@ -1615,7 +1615,7 @@ sprintf(p_number, "%d", pin_num++); CreateNewPin(yyElement, OU ($3), OU ($4), OU ($5), 2*GROUNDPLANEFRAME, - OU ($5) + 2*MASKFRAME, hole, $6, p_number, OldFlags($7)); + OU ($5) + 2*MASKFRAME, hole, $6, p_number, pcb_flag_old($7)); free ($6); } ; @@ -1676,7 +1676,7 @@ CreateNewPad(yyElement,OU ($3) + yyElement->MarkX, OU ($4) + yyElement->MarkY, OU ($5) + yyElement->MarkX, OU ($6) + yyElement->MarkY, OU ($7), OU ($8), OU ($9), - $10, $11, OldFlags($12)); + $10, $11, pcb_flag_old($12)); free ($10); free ($11); } @@ -1687,7 +1687,7 @@ : T_PAD '(' measure measure measure measure measure STRING STRING INTEGER ')' { CreateNewPad(yyElement,OU ($3),OU ($4),OU ($5),OU ($6),OU ($7), 2*GROUNDPLANEFRAME, - OU ($7) + 2*MASKFRAME, $8, $9, OldFlags($10)); + OU ($7) + 2*MASKFRAME, $8, $9, pcb_flag_old($10)); free ($8); free ($9); } @@ -1701,12 +1701,12 @@ sprintf(p_number, "%d", pin_num++); CreateNewPad(yyElement,OU ($3),OU ($4),OU ($5),OU ($6),OU ($7), 2*GROUNDPLANEFRAME, - OU ($7) + 2*MASKFRAME, $8,p_number, OldFlags($9)); + OU ($7) + 2*MASKFRAME, $8,p_number, pcb_flag_old($9)); free ($8); } ; -flags : INTEGER { $$ = OldFlags($1); } +flags : INTEGER { $$ = pcb_flag_old($1); } | STRING { $$ = string_to_flags ($1, yyerror); free($1); } ; Index: trunk/src_plugins/toporouter/toporouter.c =================================================================== --- trunk/src_plugins/toporouter/toporouter.c (revision 4874) +++ trunk/src_plugins/toporouter/toporouter.c (revision 4875) @@ -5532,7 +5532,7 @@ gdouble d = 0.; 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))); + thickness, clearance, pcb_flag_make(PCB_FLAG_AUTO | (TEST_FLAG(CLEARNEWFLAG, PCB) ? PCB_FLAG_CLEARLINE : 0))); if (line) { AddObjectToCreateUndoList(PCB_TYPE_LINE, LAYER_PTR(layer), line, line); @@ -5581,7 +5581,7 @@ arc = CreateNewArcOnLayer(LAYER_PTR(layer), vx(a->centre), vy(a->centre), a->r, a->r, sa, da, thickness, clearance, - MakeFlags(PCB_FLAG_AUTO | (TEST_FLAG(CLEARNEWFLAG, PCB) ? PCB_FLAG_CLEARLINE : 0))); + pcb_flag_make(PCB_FLAG_AUTO | (TEST_FLAG(CLEARNEWFLAG, PCB) ? PCB_FLAG_CLEARLINE : 0))); if (arc) { AddObjectToCreateUndoList(PCB_TYPE_ARC, LAYER_PTR(layer), arc, arc); @@ -8200,13 +8200,13 @@ if ((via = CreateNewVia(PCB->Data, viax, viay, Settings.ViaThickness, 2 * Settings.Clearance, - 0, Settings.ViaDrillingHole, NULL, NoFlags())) != NULL) { + 0, Settings.ViaDrillingHole, NULL, pcb_no_flags())) != NULL) { AddObjectToCreateUndoList(PCB_TYPE_VIA, via, via, via); /* if (gui->shift_is_pressed ()) pcb_chg_obj_thermal(PCB_TYPE_VIA, via, via, via, PCB->ThermStyle);*/ DrawVia(via); if ((line = CreateDrawnLineOnLayer(CURRENT, pad->Point1.X + 1., pad->Point1.Y + 1., viax + 1., viay + 1., - Settings.LineThickness, 2 * Settings.Clearance, NoFlags()))) { + Settings.LineThickness, 2 * Settings.Clearance, pcb_no_flags()))) { AddObjectToCreateUndoList(PCB_TYPE_LINE, CURRENT, line, line); DrawLine(CURRENT, line);