Index: trunk/doc-rnd/hacking/renames =================================================================== --- trunk/doc-rnd/hacking/renames (revision 4925) +++ trunk/doc-rnd/hacking/renames (revision 4926) @@ -510,3 +510,7 @@ CreateNewPointInPolygon -> pcb_poly_point_new CreateNewHoleInPolygon -> pcb_poly_hole_new RemovePolygon -> pcb_poly_remove +GetRatMemory -> pcb_rat_alloc +RemoveFreeRat -> pcb_rat_free +CreateNewRat -> pcb_rat_new +DeleteRats -> pcb_rats_delete Index: trunk/src/data.c =================================================================== --- trunk/src/data.c (revision 4925) +++ trunk/src/data.c (revision 4926) @@ -198,7 +198,7 @@ } END_LOOP; list_map0(&data->Element, pcb_element_t, pcb_element_free); - list_map0(&data->Rat, pcb_rat_t, RemoveFreeRat); + list_map0(&data->Rat, pcb_rat_t, pcb_rat_free); for (layer = data->Layer, i = 0; i < MAX_LAYER + 2; layer++, i++) { pcb_attribute_free(&layer->Attributes); Index: trunk/src/obj_rat.c =================================================================== --- trunk/src/obj_rat.c (revision 4925) +++ trunk/src/obj_rat.c (revision 4926) @@ -51,7 +51,7 @@ /*** allocation ***/ /* get next slot for a Rat, allocates memory if necessary */ -pcb_rat_t *GetRatMemory(pcb_data_t *data) +pcb_rat_t *pcb_rat_alloc(pcb_data_t *data) { pcb_rat_t *new_obj; @@ -61,7 +61,7 @@ return new_obj; } -void RemoveFreeRat(pcb_rat_t *data) +void pcb_rat_free(pcb_rat_t *data) { ratlist_remove(data); free(data); @@ -69,9 +69,9 @@ /*** utility ***/ /* creates a new rat-line */ -pcb_rat_t *CreateNewRat(pcb_data_t *Data, pcb_coord_t X1, pcb_coord_t Y1, pcb_coord_t X2, pcb_coord_t Y2, pcb_cardinal_t group1, pcb_cardinal_t group2, pcb_coord_t Thickness, pcb_flag_t Flags) +pcb_rat_t *pcb_rat_new(pcb_data_t *Data, pcb_coord_t X1, pcb_coord_t Y1, pcb_coord_t X2, pcb_coord_t Y2, pcb_cardinal_t group1, pcb_cardinal_t group2, pcb_coord_t Thickness, pcb_flag_t Flags) { - pcb_rat_t *Line = GetRatMemory(Data); + pcb_rat_t *Line = pcb_rat_alloc(Data); if (!Line) return (Line); @@ -97,7 +97,7 @@ /* DeleteRats - deletes rat lines only * can delete all rat lines, or only selected one */ -pcb_bool DeleteRats(pcb_bool selected) +pcb_bool pcb_rats_delete(pcb_bool selected) { pcb_opctx_t ctx; pcb_bool changed = pcb_false; @@ -126,7 +126,7 @@ /* copies a rat-line to paste buffer */ void *AddRatToBuffer(pcb_opctx_t *ctx, pcb_rat_t *Rat) { - return (CreateNewRat(ctx->buffer.dst, Rat->Point1.X, Rat->Point1.Y, + return (pcb_rat_new(ctx->buffer.dst, Rat->Point1.X, Rat->Point1.Y, Rat->Point2.X, Rat->Point2.Y, Rat->group1, Rat->group2, Rat->Thickness, pcb_flag_mask(Rat->Flags, PCB_FLAG_FOUND | ctx->buffer.extraflg))); } @@ -202,7 +202,7 @@ if (ctx->remove.destroy_target->rat_tree) r_delete_entry(ctx->remove.destroy_target->rat_tree, &Rat->BoundingBox); - RemoveFreeRat(Rat); + pcb_rat_free(Rat); return NULL; } Index: trunk/src/obj_rat.h =================================================================== --- trunk/src/obj_rat.h (revision 4925) +++ trunk/src/obj_rat.h (revision 4926) @@ -38,10 +38,10 @@ }; -pcb_rat_t *GetRatMemory(pcb_data_t *data); -void RemoveFreeRat(pcb_rat_t *data); +pcb_rat_t *pcb_rat_alloc(pcb_data_t *data); +void pcb_rat_free(pcb_rat_t *data); -pcb_rat_t *CreateNewRat(pcb_data_t *Data, pcb_coord_t X1, pcb_coord_t Y1, pcb_coord_t X2, pcb_coord_t Y2, pcb_cardinal_t group1, pcb_cardinal_t group2, pcb_coord_t Thickness, pcb_flag_t Flags); -pcb_bool DeleteRats(pcb_bool selected); +pcb_rat_t *pcb_rat_new(pcb_data_t *Data, pcb_coord_t X1, pcb_coord_t Y1, pcb_coord_t X2, pcb_coord_t Y2, pcb_cardinal_t group1, pcb_cardinal_t group2, pcb_coord_t Thickness, pcb_flag_t Flags); +pcb_bool pcb_rats_delete(pcb_bool selected); #endif Index: trunk/src/rats.c =================================================================== --- trunk/src/rats.c (revision 4925) +++ trunk/src/rats.c (revision 4926) @@ -609,7 +609,7 @@ } else { /* found the shortest distance subnet, draw the rat */ - if ((line = CreateNewRat(PCB->Data, + if ((line = pcb_rat_new(PCB->Data, firstpoint->X, firstpoint->Y, secondpoint->X, secondpoint->Y, firstpoint->group, secondpoint->group, conf_core.appearance.rat_thickness, pcb_no_flags())) != NULL) { @@ -897,7 +897,7 @@ ratIt: pcb_netlist_changed(0); - return (CreateNewRat(PCB->Data, Crosshair.AttachedLine.Point1.X, + return (pcb_rat_new(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, pcb_no_flags())); Index: trunk/src/rats_act.c =================================================================== --- trunk/src/rats_act.c (revision 4925) +++ trunk/src/rats_act.c (revision 4926) @@ -201,12 +201,12 @@ pcb_clear_warnings(); switch (pcb_funchash_get(function, NULL)) { case F_AllRats: - if (DeleteRats(pcb_false)) + if (pcb_rats_delete(pcb_false)) SetChangedFlag(pcb_true); break; case F_SelectedRats: case F_Selected: - if (DeleteRats(pcb_true)) + if (pcb_rats_delete(pcb_true)) SetChangedFlag(pcb_true); break; } Index: trunk/src/remove_act.c =================================================================== --- trunk/src/remove_act.c (revision 4925) +++ trunk/src/remove_act.c (revision 4926) @@ -66,11 +66,11 @@ RemoveSelected(); break; case F_AllRats: - if (DeleteRats(pcb_false)) + if (pcb_rats_delete(pcb_false)) SetChangedFlag(pcb_true); break; case F_SelectedRats: - if (DeleteRats(pcb_true)) + if (pcb_rats_delete(pcb_true)) SetChangedFlag(pcb_true); break; } Index: trunk/src_plugins/autoplace/autoplace.c =================================================================== --- trunk/src_plugins/autoplace/autoplace.c (revision 4925) +++ trunk/src_plugins/autoplace/autoplace.c (revision 4926) @@ -756,7 +756,7 @@ } done: if (changed) { - DeleteRats(pcb_false); + pcb_rats_delete(pcb_false); AddAllRats(pcb_false, NULL); pcb_redraw(); } Index: trunk/src_plugins/autoroute/autoroute.c =================================================================== --- trunk/src_plugins/autoroute/autoroute.c (revision 4925) +++ trunk/src_plugins/autoroute/autoroute.c (revision 4926) @@ -4706,7 +4706,7 @@ SaveUndoSerialNumber(); /* optimize rats, we've changed connectivity a lot. */ - DeleteRats(pcb_false /*all rats */ ); + pcb_rats_delete(pcb_false /*all rats */ ); RestoreUndoSerialNumber(); AddAllRats(pcb_false /*all rats */ , NULL); RestoreUndoSerialNumber(); Index: trunk/src_plugins/import_sch/import_sch.c =================================================================== --- trunk/src_plugins/import_sch/import_sch.c (revision 4925) +++ trunk/src_plugins/import_sch/import_sch.c (revision 4926) @@ -434,7 +434,7 @@ return 1; } - DeleteRats(pcb_false); + pcb_rats_delete(pcb_false); AddAllRats(pcb_false, NULL); #ifdef DEBUG Index: trunk/src_plugins/io_lihata/read.c =================================================================== --- trunk/src_plugins/io_lihata/read.c (revision 4925) +++ trunk/src_plugins/io_lihata/read.c (revision 4926) @@ -396,7 +396,7 @@ post_id_req(&rat.Point1); post_id_req(&rat.Point2); - new_rat = CreateNewRat(dt, rat.Point1.X, rat.Point1.Y, rat.Point2.X, rat.Point2.Y, rat.group1, rat.group2, + new_rat = pcb_rat_new(dt, rat.Point1.X, rat.Point1.Y, rat.Point2.X, rat.Point2.Y, rat.group1, rat.group2, conf_core.appearance.rat_thickness, rat.Flags); new_rat->ID = rat.ID; Index: trunk/src_plugins/io_pcb/parse_y.c =================================================================== --- trunk/src_plugins/io_pcb/parse_y.c (revision 4925) +++ trunk/src_plugins/io_pcb/parse_y.c (revision 4926) @@ -2192,7 +2192,7 @@ case 71: #line 827 "parse_y.y" /* yacc.c:1646 */ { - CreateNewRat(yyData, NU ((yyvsp[-7].measure)), NU ((yyvsp[-6].measure)), NU ((yyvsp[-4].measure)), NU ((yyvsp[-3].measure)), (yyvsp[-5].integer), (yyvsp[-2].integer), + pcb_rat_new(yyData, NU ((yyvsp[-7].measure)), NU ((yyvsp[-6].measure)), NU ((yyvsp[-4].measure)), NU ((yyvsp[-3].measure)), (yyvsp[-5].integer), (yyvsp[-2].integer), conf_core.appearance.rat_thickness, (yyvsp[-1].flagtype)); } #line 2199 "parse_y.c" /* yacc.c:1646 */ @@ -2201,7 +2201,7 @@ case 72: #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), + pcb_rat_new(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, pcb_flag_old((yyvsp[-1].integer))); } #line 2208 "parse_y.c" /* yacc.c:1646 */ Index: trunk/src_plugins/io_pcb/parse_y.y =================================================================== --- trunk/src_plugins/io_pcb/parse_y.y (revision 4925) +++ trunk/src_plugins/io_pcb/parse_y.y (revision 4926) @@ -825,12 +825,12 @@ rats : T_RAT '[' measure measure INTEGER measure measure INTEGER flags ']' { - CreateNewRat(yyData, NU ($3), NU ($4), NU ($6), NU ($7), $5, $8, + pcb_rat_new(yyData, NU ($3), NU ($4), NU ($6), NU ($7), $5, $8, conf_core.appearance.rat_thickness, $9); } | T_RAT '(' measure measure INTEGER measure measure INTEGER INTEGER ')' { - CreateNewRat(yyData, OU ($3), OU ($4), OU ($6), OU ($7), $5, $8, + pcb_rat_new(yyData, OU ($3), OU ($4), OU ($6), OU ($7), $5, $8, conf_core.appearance.rat_thickness, pcb_flag_old($9)); } ; Index: trunk/src_plugins/toporouter/toporouter.c =================================================================== --- trunk/src_plugins/toporouter/toporouter.c (revision 4925) +++ trunk/src_plugins/toporouter/toporouter.c (revision 4926) @@ -8124,7 +8124,7 @@ toporouter_free(r); SaveUndoSerialNumber(); - DeleteRats(pcb_false); + pcb_rats_delete(pcb_false); RestoreUndoSerialNumber(); AddAllRats(pcb_false, NULL); RestoreUndoSerialNumber();