Index: trunk/doc-rnd/hacking/renames =================================================================== --- trunk/doc-rnd/hacking/renames (revision 5064) +++ trunk/doc-rnd/hacking/renames (revision 5065) @@ -1105,3 +1105,7 @@ DESCRIPTION_TEXT -> PCB_ELEM_TEXT_DESCRIPTION NAMEONPCB_TEXT -> PCB_ELEM_TEXT_REFDES VALUE_TEXT -> PCB_ELEM_TEXT_VALUE +AdjustAttachedLine -> pcb_line_adjust_attached +AdjustTwoLine -> pcb_line_adjust_attached_2lines +FortyFiveLine -> pcb_line_45 +EnforceLineDRC -> pcb_line_enforce_drc Index: trunk/src/action_helper.c =================================================================== --- trunk/src/action_helper.c (revision 5064) +++ trunk/src/action_helper.c (revision 5065) @@ -463,14 +463,14 @@ /* polygon creation mode */ case PCB_MODE_POLYGON: case PCB_MODE_POLYGON_HOLE: - AdjustAttachedLine(); + pcb_line_adjust_attached(); break; /* line creation mode */ case PCB_MODE_LINE: if (PCB->RatDraw || conf_core.editor.line_refraction == 0) - AdjustAttachedLine(); + pcb_line_adjust_attached(); else - AdjustTwoLine(conf_core.editor.line_refraction - 1); + pcb_line_adjust_attached_2lines(conf_core.editor.line_refraction - 1); break; /* point insertion mode */ case PCB_MODE_INSERT_POINT: Index: trunk/src/crosshair.c =================================================================== --- trunk/src/crosshair.c (revision 5064) +++ trunk/src/crosshair.c (revision 5065) @@ -1150,7 +1150,7 @@ } if (conf_core.editor.mode == PCB_MODE_LINE && pcb_crosshair.AttachedLine.State != PCB_CH_STATE_FIRST && conf_core.editor.auto_drc) - EnforceLineDRC(); + pcb_line_enforce_drc(); pcb_gui->set_crosshair(pcb_crosshair.X, pcb_crosshair.Y, HID_SC_DO_NOTHING); } Index: trunk/src/insert.c =================================================================== --- trunk/src/insert.c (revision 5064) +++ trunk/src/insert.c (revision 5065) @@ -101,7 +101,7 @@ myline.Point1 = myline.Point2 = line->Point1; else myline.Point1 = myline.Point2 = line->Point2; - FortyFiveLine(&myline); + pcb_line_45(&myline); InsertedPoint.X = myline.Point2.X; InsertedPoint.Y = myline.Point2.Y; return &InsertedPoint; Index: trunk/src/obj_line.h =================================================================== --- trunk/src/obj_line.h (revision 5064) +++ trunk/src/obj_line.h (revision 5065) @@ -61,10 +61,10 @@ void pcb_line_rotate90(pcb_line_t *Line, pcb_coord_t X, pcb_coord_t Y, unsigned Number); /*** DRC enforcement (obj_line_drcenf.c) ***/ -void AdjustAttachedLine(void); -void AdjustTwoLine(pcb_bool); -void FortyFiveLine(pcb_attached_line_t *); -void EnforceLineDRC(void); +void pcb_line_adjust_attached(void); +void pcb_line_adjust_attached_2lines(pcb_bool); +void pcb_line_45(pcb_attached_line_t *); +void pcb_line_enforce_drc(void); /* Rather than mode the line bounding box, we set it so the point bounding * boxes are updated too. Index: trunk/src/obj_line_drcenf.c =================================================================== --- trunk/src/obj_line_drcenf.c (revision 5064) +++ trunk/src/obj_line_drcenf.c (revision 5065) @@ -42,7 +42,7 @@ /* --------------------------------------------------------------------------- * Adjust the attached line to 45 degrees if necessary */ -void AdjustAttachedLine(void) +void pcb_line_adjust_attached(void) { pcb_attached_line_t *line = &pcb_crosshair.AttachedLine; @@ -62,7 +62,7 @@ line->Point2.Y = pcb_crosshair.Y; return; } - FortyFiveLine(line); + pcb_line_45(line); } /* --------------------------------------------------------------------------- @@ -76,7 +76,7 @@ * 5 3 * 4 */ -void FortyFiveLine(pcb_attached_line_t *Line) +void pcb_line_45(pcb_attached_line_t *Line) { pcb_coord_t dx, dy, min; unsigned direction = 0; @@ -147,7 +147,7 @@ /* --------------------------------------------------------------------------- * adjusts the insert lines to make them 45 degrees as necessary */ -void AdjustTwoLine(pcb_bool way) +void pcb_line_adjust_attached_2lines(pcb_bool way) { pcb_coord_t dx, dy; pcb_attached_line_t *line = &pcb_crosshair.AttachedLine; @@ -428,7 +428,7 @@ /* check where the line wants to end */ aline.Point1.X = pcb_crosshair.AttachedLine.Point1.X; aline.Point1.Y = pcb_crosshair.AttachedLine.Point1.Y; - FortyFiveLine(&aline); + pcb_line_45(&aline); line.Point1 = aline.Point1; line.Point2 = aline.Point2; @@ -469,7 +469,7 @@ end->Y = last_good.Y; } -void EnforceLineDRC(void) +void pcb_line_enforce_drc(void) { pcb_point_t r45, rs; pcb_bool shift;