Index: trunk/doc-rnd/hacking/renames =================================================================== --- trunk/doc-rnd/hacking/renames (revision 4992) +++ trunk/doc-rnd/hacking/renames (revision 4993) @@ -749,3 +749,12 @@ NoHolesPolygonDicer -> pcb_poly_no_holes_dicer PolyToPolygonsOnLayer -> pcb_poly_to_polygons_on_layer square_pin_factors -> pcb_poly_square_pin_factors +AddNet -> pcb_rat_add_net +ConnectionName -> pcb_connection_name +AddAllRats -> pcb_rat_add_all +SeekPad -> pcb_rat_seek_pad +ProcNetlist -> pcb_rat_proc_netlist +CollectSubnets -> pcb_rat_collect_subnets +GetConnectionMemory -> pcb_rat_connection_alloc +CONNECTION_LOOP -> PCB_CONNECTION_LOOP +RAT_LOOP -> PCB_RAT_LOOP Index: trunk/src/action_helper.c =================================================================== --- trunk/src/action_helper.c (revision 4992) +++ trunk/src/action_helper.c (revision 4993) @@ -757,7 +757,7 @@ if (PCB->RatDraw) { pcb_rat_t *line; - if ((line = AddNet())) { + if ((line = pcb_rat_add_net())) { addedLines++; AddObjectToCreateUndoList(PCB_TYPE_RATLINE, line, line, line); IncrementUndoSerialNumber(); Index: trunk/src/find_clear.c =================================================================== --- trunk/src/find_clear.c (revision 4992) +++ trunk/src/find_clear.c (revision 4993) @@ -82,7 +82,7 @@ { pcb_bool change = pcb_false; - RAT_LOOP(PCB->Data); + PCB_RAT_LOOP(PCB->Data); { if (PCB_FLAG_TEST(flag, line)) { if (AndDraw) Index: trunk/src/find_misc.c =================================================================== --- trunk/src/find_misc.c (revision 4992) +++ trunk/src/find_misc.c (revision 4993) @@ -239,7 +239,7 @@ } } else { - name = ConnectionName(type, ptr1, ptr2); + name = pcb_connection_name(type, ptr1, ptr2); pcb_hid_actionl("NetlistShow", name, NULL); } @@ -348,7 +348,7 @@ { pcb_bool change = pcb_false; - RAT_LOOP(PCB->Data); + PCB_RAT_LOOP(PCB->Data); { if (PCB_FLAG_TEST(TheFlag, line)) { if (AndDraw) Index: trunk/src/netlist.c =================================================================== --- trunk/src/netlist.c (revision 4992) +++ trunk/src/netlist.c (revision 4993) @@ -100,7 +100,7 @@ int pcb_pin_name_to_xy(pcb_lib_entry_t * pin, pcb_coord_t *x, pcb_coord_t *y) { pcb_connection_t conn; - if (!SeekPad(pin, &conn, pcb_false)) + if (!pcb_rat_seek_pad(pin, &conn, pcb_false)) return 1; switch (conn.type) { case PCB_TYPE_PIN: Index: trunk/src/obj_rat.c =================================================================== --- trunk/src/obj_rat.c (revision 4992) +++ trunk/src/obj_rat.c (revision 4993) @@ -106,7 +106,7 @@ ctx.remove.bulk = pcb_true; ctx.remove.destroy_target = NULL; - RAT_LOOP(PCB->Data); + PCB_RAT_LOOP(PCB->Data); { if ((!selected) || PCB_FLAG_TEST(PCB_FLAG_SELECTED, line)) { changed = pcb_true; Index: trunk/src/rats.c =================================================================== --- trunk/src/rats.c (revision 4992) +++ trunk/src/rats.c (revision 4993) @@ -153,7 +153,7 @@ * parse a netlist menu entry and locate the corresponding pad * returns pcb_true if found, and fills in Connection information */ -pcb_bool SeekPad(pcb_lib_entry_t * entry, pcb_connection_t * conn, pcb_bool Same) +pcb_bool pcb_rat_seek_pad(pcb_lib_entry_t * entry, pcb_connection_t * conn, pcb_bool Same) { int j; char ElementName[256]; @@ -184,7 +184,7 @@ * Read the library-netlist build a pcb_true Netlist structure */ -pcb_netlist_t *ProcNetlist(pcb_lib_t *net_menu) +pcb_netlist_t *pcb_rat_proc_netlist(pcb_lib_t *net_menu) { pcb_connection_t *connection; pcb_connection_t LastPoint; @@ -231,7 +231,7 @@ net->Style = NULL; ENTRY_LOOP(menu); { - if (SeekPad(entry, &LastPoint, pcb_false)) { + if (pcb_rat_seek_pad(entry, &LastPoint, pcb_false)) { if (PCB_FLAG_TEST(PCB_FLAG_DRC, (pcb_pin_t *) LastPoint.ptr2)) pcb_message(PCB_MSG_DEFAULT, _ ("Error! Element %s pin %s appears multiple times in the netlist file.\n"), @@ -239,7 +239,7 @@ (LastPoint.type == PCB_TYPE_PIN) ? ((pcb_pin_t *) LastPoint.ptr2)->Number : ((pcb_pad_t *) LastPoint.ptr2)->Number); else { - connection = GetConnectionMemory(net); + connection = pcb_rat_connection_alloc(net); *connection = LastPoint; /* indicate expect net */ connection->menu = menu; @@ -254,8 +254,8 @@ else badnet = pcb_true; /* check for more pins with the same number */ - for (; SeekPad(entry, &LastPoint, pcb_true);) { - connection = GetConnectionMemory(net); + for (; pcb_rat_seek_pad(entry, &LastPoint, pcb_true);) { + connection = pcb_rat_connection_alloc(net); *connection = LastPoint; /* indicate expect net */ connection->menu = menu; @@ -294,9 +294,9 @@ pcb_connection_t *conn; /* It would be worth checking if SourceNet is NULL here to avoid a segfault. Seb James. */ - CONNECTION_LOOP(SourceNet); + PCB_CONNECTION_LOOP(SourceNet); { - conn = GetConnectionMemory(DestNet); + conn = pcb_rat_connection_alloc(DestNet); *conn = *connection; } END_LOOP; @@ -425,7 +425,7 @@ if (PCB_FLAG_TEST(PCB_FLAG_DRC, line) && ((line->Point1.X == line->Point2.X) || (line->Point1.Y == line->Point2.Y))) { - conn = GetConnectionMemory(a); + conn = pcb_rat_connection_alloc(a); conn->X = line->Point1.X; conn->Y = line->Point1.Y; conn->type = PCB_TYPE_LINE; @@ -433,7 +433,7 @@ conn->ptr2 = line; conn->group = GetLayerGroupNumberByPointer(layer); conn->menu = NULL; /* agnostic view of where it belongs */ - conn = GetConnectionMemory(a); + conn = pcb_rat_connection_alloc(a); conn->X = line->Point2.X; conn->Y = line->Point2.Y; conn->type = PCB_TYPE_LINE; @@ -448,7 +448,7 @@ PCB_POLY_ALL_LOOP(PCB->Data); { if (PCB_FLAG_TEST(PCB_FLAG_DRC, polygon)) { - conn = GetConnectionMemory(a); + conn = pcb_rat_connection_alloc(a); /* make point on a vertex */ conn->X = polygon->Clipped->contours->head.point[0]; conn->Y = polygon->Clipped->contours->head.point[1]; @@ -463,7 +463,7 @@ PCB_VIA_LOOP(PCB->Data); { if (PCB_FLAG_TEST(PCB_FLAG_DRC, via)) { - conn = GetConnectionMemory(a); + conn = pcb_rat_connection_alloc(a); conn->X = via->X; conn->Y = via->Y; conn->type = PCB_TYPE_VIA; @@ -644,7 +644,7 @@ * if SelectedOnly is pcb_true, it will only draw rats to selected pins and pads */ pcb_bool -AddAllRats(pcb_bool SelectedOnly, +pcb_rat_add_all(pcb_bool SelectedOnly, void (*funcp) (register pcb_connection_t *, register pcb_connection_t *, register pcb_route_style_t *)) { pcb_netlist_t *Nets, *Wantlist; @@ -657,7 +657,7 @@ * structure the way the final routing * is supposed to look */ - Wantlist = ProcNetlist(&(PCB->NetlistLib[NETLIST_EDITED])); + Wantlist = pcb_rat_proc_netlist(&(PCB->NetlistLib[NETLIST_EDITED])); if (!Wantlist) { pcb_message(PCB_MSG_DEFAULT, _("Can't add rat lines because no netlist is loaded.\n")); return (pcb_false); @@ -681,11 +681,11 @@ */ PCB_NET_LOOP(Wantlist); { - CONNECTION_LOOP(net); + PCB_CONNECTION_LOOP(net); { if (!SelectedOnly || PCB_FLAG_TEST(PCB_FLAG_SELECTED, (pcb_pin_t *) connection->ptr2)) { lonesome = pcb_net_new(Nets); - onepin = GetConnectionMemory(lonesome); + onepin = pcb_rat_connection_alloc(lonesome); *onepin = *connection; lonesome->Style = net->Style; } @@ -731,7 +731,7 @@ /* XXX: This is copied in large part from AddAllRats above; for * maintainability, AddAllRats probably wants to be tweaked to use this * version of the code so that we don't have duplication. */ -pcb_netlist_list_t CollectSubnets(pcb_bool SelectedOnly) +pcb_netlist_list_t pcb_rat_collect_subnets(pcb_bool SelectedOnly) { pcb_netlist_list_t result = { 0, 0, NULL }; pcb_netlist_t *Nets, *Wantlist; @@ -743,7 +743,7 @@ * structure the way the final routing * is supposed to look */ - Wantlist = ProcNetlist(&(PCB->NetlistLib[NETLIST_EDITED])); + Wantlist = pcb_rat_proc_netlist(&(PCB->NetlistLib[NETLIST_EDITED])); if (!Wantlist) { pcb_message(PCB_MSG_DEFAULT, _("Can't add rat lines because no netlist is loaded.\n")); return result; @@ -766,11 +766,11 @@ PCB_NET_LOOP(Wantlist); { Nets = pcb_netlist_new(&result); - CONNECTION_LOOP(net); + PCB_CONNECTION_LOOP(net); { if (!SelectedOnly || PCB_FLAG_TEST(PCB_FLAG_SELECTED, (pcb_pin_t *) connection->ptr2)) { lonesome = pcb_net_new(Nets); - onepin = GetConnectionMemory(lonesome); + onepin = pcb_rat_connection_alloc(lonesome); *onepin = *connection; lonesome->Style = net->Style; } @@ -807,7 +807,7 @@ /* These next two functions moved from the original netlist.c as part of the | gui code separation for the Gtk port. */ -pcb_rat_t *AddNet(void) +pcb_rat_t *pcb_rat_add_net(void) { static int ratDrawn = 0; char name1[256], *name2; @@ -836,7 +836,7 @@ /* will work for pins to since the FLAG is common */ group1 = (PCB_FLAG_TEST(PCB_FLAG_ONSOLDER, (pcb_pad_t *) ptr2) ? GetLayerGroupNumberByNumber(solder_silk_layer) : GetLayerGroupNumberByNumber(component_silk_layer)); - strcpy(name1, ConnectionName(found, ptr1, ptr2)); + strcpy(name1, pcb_connection_name(found, ptr1, ptr2)); found = SearchObjectByLocation(PCB_TYPE_PAD | PCB_TYPE_PIN, &ptr1, &ptr2, &ptr3, Crosshair.AttachedLine.Point2.X, Crosshair.AttachedLine.Point2.Y, 5); if (found == PCB_TYPE_NONE) { @@ -849,7 +849,7 @@ } group2 = (PCB_FLAG_TEST(PCB_FLAG_ONSOLDER, (pcb_pad_t *) ptr2) ? GetLayerGroupNumberByNumber(solder_silk_layer) : GetLayerGroupNumberByNumber(component_silk_layer)); - name2 = ConnectionName(found, ptr1, ptr2); + name2 = pcb_connection_name(found, ptr1, ptr2); menu = pcb_netnode_to_netname(name1); if (menu) { @@ -904,7 +904,7 @@ } -char *ConnectionName(int type, void *ptr1, void *ptr2) +char *pcb_connection_name(int type, void *ptr1, void *ptr2) { static char name[256]; char *num; @@ -928,7 +928,7 @@ /* --------------------------------------------------------------------------- * get next slot for a connection, allocates memory if necessary */ -pcb_connection_t *GetConnectionMemory(pcb_net_t *Net) +pcb_connection_t *pcb_rat_connection_alloc(pcb_net_t *Net) { pcb_connection_t *con = Net->Connection; Index: trunk/src/rats.h =================================================================== --- trunk/src/rats.h (revision 4992) +++ trunk/src/rats.h (revision 4993) @@ -47,17 +47,17 @@ pcb_lib_menu_t *menu; /* the netmenu this *SHOULD* belong too */ }; -pcb_rat_t *AddNet(void); -char *ConnectionName(int, void *, void *); +pcb_rat_t *pcb_rat_add_net(void); +char *pcb_connection_name(int, void *, void *); -pcb_bool AddAllRats(pcb_bool, void (*)(register pcb_connection_t *, register pcb_connection_t *, register pcb_route_style_t *)); -pcb_bool SeekPad(pcb_lib_entry_t *, pcb_connection_t *, pcb_bool); +pcb_bool pcb_rat_add_all(pcb_bool, void (*)(register pcb_connection_t *, register pcb_connection_t *, register pcb_route_style_t *)); +pcb_bool pcb_rat_seek_pad(pcb_lib_entry_t *, pcb_connection_t *, pcb_bool); -pcb_netlist_t *ProcNetlist(pcb_lib_t *); -pcb_netlist_list_t CollectSubnets(pcb_bool); -pcb_connection_t *GetConnectionMemory(pcb_net_t *); +pcb_netlist_t *pcb_rat_proc_netlist(pcb_lib_t *); +pcb_netlist_list_t pcb_rat_collect_subnets(pcb_bool); +pcb_connection_t *pcb_rat_connection_alloc(pcb_net_t *); -#define CONNECTION_LOOP(net) do { \ +#define PCB_CONNECTION_LOOP(net) do { \ pcb_cardinal_t n; \ pcb_connection_t * connection; \ for (n = (net)->ConnectionN-1; n != -1; n--) \ @@ -64,7 +64,7 @@ { \ connection = & (net)->Connection[n] -#define RAT_LOOP(top) do { \ +#define PCB_RAT_LOOP(top) do { \ pcb_rat_t *line; \ gdl_iterator_t __it__; \ ratlist_foreach(&(top)->Rat, &__it__, line) { Index: trunk/src/rats_act.c =================================================================== --- trunk/src/rats_act.c (revision 4992) +++ trunk/src/rats_act.c (revision 4993) @@ -80,18 +80,18 @@ pcb_clear_warnings(); switch (pcb_funchash_get(function, NULL)) { case F_AllRats: - if (AddAllRats(pcb_false, NULL)) + if (pcb_rat_add_all(pcb_false, NULL)) SetChangedFlag(pcb_true); break; case F_SelectedRats: case F_Selected: - if (AddAllRats(pcb_true, NULL)) + if (pcb_rat_add_all(pcb_true, NULL)) SetChangedFlag(pcb_true); break; case F_Close: small = PCB_SQUARE(MAX_COORD); shorty = NULL; - RAT_LOOP(PCB->Data); + PCB_RAT_LOOP(PCB->Data); { if (PCB_FLAG_TEST(PCB_FLAG_SELECTED, line)) continue; Index: trunk/src/search.c =================================================================== --- trunk/src/search.c (revision 4992) +++ trunk/src/search.c (revision 4993) @@ -1211,7 +1211,7 @@ } if (type == PCB_TYPE_RATLINE || type == PCB_TYPE_LINE_POINT) { - RAT_LOOP(Base); + PCB_RAT_LOOP(Base); { if (line->ID == ID) { *Result1 = *Result2 = *Result3 = (void *) line; Index: trunk/src/select.c =================================================================== --- trunk/src/select.c (revision 4992) +++ trunk/src/select.c (revision 4993) @@ -285,7 +285,7 @@ } if (PCB->RatOn || !Flag) - RAT_LOOP(PCB->Data); + PCB_RAT_LOOP(PCB->Data); { if (LINE_NEAR_BOX((pcb_line_t *) line, Box) && !PCB_FLAG_TEST(PCB_FLAG_LOCK, line) && PCB_FLAG_TEST(PCB_FLAG_SELECTED, line) != Flag) { append(PCB_TYPE_RATLINE, line, line); @@ -700,7 +700,7 @@ END_LOOP; /* and rat-lines */ if (type & PCB_TYPE_RATLINE && PCB->RatOn && F->Rat) - RAT_LOOP(PCB->Data); + PCB_RAT_LOOP(PCB->Data); { if (PCB_FLAG_TEST(PCB_FLAG_SELECTED, line)) { if (Reset) { @@ -729,7 +729,7 @@ pcb_bool changed = pcb_false; if (PCB->RatOn) - RAT_LOOP(PCB->Data); + PCB_RAT_LOOP(PCB->Data); { if (PCB_FLAG_TEST(PCB_FLAG_FOUND, line)) { AddObjectToFlagUndoList(PCB_TYPE_RATLINE, line, line, line); @@ -987,7 +987,7 @@ /* Name[0] and Name[1] are special purpose, not the actual name */ if (menu->Name && menu->Name[0] != '\0' && menu->Name[1] != '\0' && REGEXEC(menu->Name + 2)) { for (i = menu->EntryN, entry = menu->Entry; i; i--, entry++) - if (SeekPad(entry, &conn, pcb_false)) + if (pcb_rat_seek_pad(entry, &conn, pcb_false)) pcb_rat_find_hook(conn.type, conn.ptr1, conn.ptr2, conn.ptr2, pcb_true, pcb_true); } } Index: trunk/src_plugins/autoplace/autoplace.c =================================================================== --- trunk/src_plugins/autoplace/autoplace.c (revision 4992) +++ trunk/src_plugins/autoplace/autoplace.c (revision 4993) @@ -684,7 +684,7 @@ * structure the way the final routing * is supposed to look */ - Nets = ProcNetlist(&(PCB->NetlistLib[NETLIST_EDITED])); + Nets = pcb_rat_proc_netlist(&(PCB->NetlistLib[NETLIST_EDITED])); if (!Nets) { pcb_message(PCB_MSG_DEFAULT, _("Can't add rat lines because no netlist is loaded.\n")); goto done; @@ -757,7 +757,7 @@ done: if (changed) { pcb_rats_destroy(pcb_false); - AddAllRats(pcb_false, NULL); + pcb_rat_add_all(pcb_false, NULL); pcb_redraw(); } FreePointerListMemory(&Selected); Index: trunk/src_plugins/autoroute/autoroute.c =================================================================== --- trunk/src_plugins/autoroute/autoroute.c (revision 4992) +++ trunk/src_plugins/autoroute/autoroute.c (revision 4993) @@ -936,7 +936,7 @@ */ /* use the PCB_FLAG_DRC to mark objects as they are entered */ pcb_reset_conns(pcb_false); - Nets = CollectSubnets(pcb_false); + Nets = pcb_rat_collect_subnets(pcb_false); { routebox_t *last_net = NULL; PCB_NETLIST_LOOP(&Nets); @@ -950,7 +950,7 @@ for (j = 0; j < rd->max_styles; j++) if (net->Style == rd->styles[j]) break; - CONNECTION_LOOP(net); + PCB_CONNECTION_LOOP(net); { routebox_t *rb = NULL; PCB_FLAG_SET(PCB_FLAG_DRC, (pcb_pin_t *) connection->ptr2); @@ -4568,7 +4568,7 @@ routebox_t *net, *rb, *last; int i = 0; /* count number of rats selected */ - RAT_LOOP(PCB->Data); + PCB_RAT_LOOP(PCB->Data); { if (!selected || PCB_FLAG_TEST(PCB_FLAG_SELECTED, line)) i++; @@ -4581,7 +4581,7 @@ goto donerouting; /* nothing to do here */ /* if only one rat selected, do things the quick way. =) */ if (i == 1) { - RAT_LOOP(PCB->Data); + PCB_RAT_LOOP(PCB->Data); if (!selected || PCB_FLAG_TEST(PCB_FLAG_SELECTED, line)) { /* look up the end points of this rat line */ routebox_t *a; @@ -4637,7 +4637,7 @@ } /* now merge only those subnets connected by a rat line */ - RAT_LOOP(PCB->Data); + PCB_RAT_LOOP(PCB->Data); if (!selected || PCB_FLAG_TEST(PCB_FLAG_SELECTED, line)) { /* look up the end points of this rat line */ routebox_t *a; @@ -4708,7 +4708,7 @@ /* optimize rats, we've changed connectivity a lot. */ pcb_rats_destroy(pcb_false /*all rats */ ); RestoreUndoSerialNumber(); - AddAllRats(pcb_false /*all rats */ , NULL); + pcb_rat_add_all(pcb_false /*all rats */ , NULL); RestoreUndoSerialNumber(); IncrementUndoSerialNumber(); Index: trunk/src_plugins/boardflip/boardflip.c =================================================================== --- trunk/src_plugins/boardflip/boardflip.c (revision 4992) +++ trunk/src_plugins/boardflip/boardflip.c (revision 4993) @@ -153,7 +153,7 @@ END_LOOP; } END_LOOP; - RAT_LOOP(PCB->Data); + PCB_RAT_LOOP(PCB->Data); { FLIP(line->Point1.Y); FLIP(line->Point2.Y); Index: trunk/src_plugins/hid_gtk/gui-drc-window.c =================================================================== --- trunk/src_plugins/hid_gtk/gui-drc-window.c (revision 4992) +++ trunk/src_plugins/hid_gtk/gui-drc-window.c (revision 4993) @@ -125,7 +125,7 @@ END_LOOP; } END_LOOP; - RAT_LOOP(PCB->Data); + PCB_RAT_LOOP(PCB->Data); { if (PCB_FLAG_TEST(flag, line)) { AddObjectToFlagUndoList(PCB_TYPE_RATLINE, line, line, line); Index: trunk/src_plugins/hid_gtk/gui-netlist-window.c =================================================================== --- trunk/src_plugins/hid_gtk/gui-netlist-window.c (revision 4992) +++ trunk/src_plugins/hid_gtk/gui-netlist-window.c (revision 4993) @@ -199,7 +199,7 @@ { pcb_connection_t conn; - if (!SeekPad(entry, &conn, pcb_false)) + if (!pcb_rat_seek_pad(entry, &conn, pcb_false)) return; AddObjectToFlagUndoList(conn.type, conn.ptr1, conn.ptr2, conn.ptr2); @@ -263,7 +263,7 @@ IncrementUndoSerialNumber(); /* And lead the user to the location */ - if (SeekPad(node, &conn, pcb_false)) + if (pcb_rat_seek_pad(node, &conn, pcb_false)) switch (conn.type) { case PCB_TYPE_PIN: { @@ -504,7 +504,7 @@ pcb_reset_conns(pcb_true); for (i = selected_net->EntryN, entry = selected_net->Entry; i; i--, entry++) - if (SeekPad(entry, &conn, pcb_false)) + if (pcb_rat_seek_pad(entry, &conn, pcb_false)) pcb_rat_find_hook(conn.type, conn.ptr1, conn.ptr2, conn.ptr2, pcb_true, pcb_true); SelectConnection(select_flag); Index: trunk/src_plugins/hid_gtk/gui-output-events.c =================================================================== --- trunk/src_plugins/hid_gtk/gui-output-events.c (revision 4992) +++ trunk/src_plugins/hid_gtk/gui-output-events.c (revision 4993) @@ -314,7 +314,7 @@ if (type == PCB_TYPE_PIN || type == PCB_TYPE_PAD) elename = (char *) PCB_UNKNOWN(NAMEONPCB_NAME((pcb_element_t *) ptr1)); - pinname = ConnectionName(type, ptr1, ptr2); + pinname = pcb_connection_name(type, ptr1, ptr2); if (pinname == NULL) return NULL; Index: trunk/src_plugins/hid_lesstif/netlist.c =================================================================== --- trunk/src_plugins/hid_lesstif/netlist.c (revision 4992) +++ trunk/src_plugins/hid_lesstif/netlist.c (revision 4993) @@ -119,7 +119,7 @@ pcb_reset_conns(pcb_true); for (i = net->EntryN, entry = net->Entry; i; i--, entry++) - if (SeekPad(entry, &conn, pcb_false)) + if (pcb_rat_seek_pad(entry, &conn, pcb_false)) pcb_rat_find_hook(conn.type, conn.ptr1, conn.ptr2, conn.ptr2, pcb_true, pcb_true); SelectConnection(select_flag); Index: trunk/src_plugins/import_sch/import_sch.c =================================================================== --- trunk/src_plugins/import_sch/import_sch.c (revision 4992) +++ trunk/src_plugins/import_sch/import_sch.c (revision 4993) @@ -435,7 +435,7 @@ } pcb_rats_destroy(pcb_false); - AddAllRats(pcb_false, NULL); + pcb_rat_add_all(pcb_false, NULL); #ifdef DEBUG printf("ActionImport: =========== Leaving ActionImport ============\n"); Index: trunk/src_plugins/report/report.c =================================================================== --- trunk/src_plugins/report/report.c (revision 4992) +++ trunk/src_plugins/report/report.c (revision 4993) @@ -764,7 +764,7 @@ continue; } - if (SeekPad(net->Entry, &conn, pcb_false)) { + if (pcb_rat_seek_pad(net->Entry, &conn, pcb_false)) { switch (conn.type) { case PCB_TYPE_PIN: x = ((pcb_pin_t *) (conn.ptr2))->X; Index: trunk/src_plugins/smartdisperse/smartdisperse.c =================================================================== --- trunk/src_plugins/smartdisperse/smartdisperse.c (revision 4992) +++ trunk/src_plugins/smartdisperse/smartdisperse.c (revision 4993) @@ -159,7 +159,7 @@ PCB_AFAIL(smartdisperse); } - Nets = ProcNetlist(&PCB->NetlistLib[0]); + Nets = pcb_rat_proc_netlist(&PCB->NetlistLib[0]); if (!Nets) { pcb_message(PCB_MSG_ERROR, _("Can't use SmartDisperse because no netlist is loaded.\n")); return 0; @@ -226,7 +226,7 @@ /* Place larger nets, still grouping by net */ PCB_NET_LOOP(Nets); { - CONNECTION_LOOP(net); + PCB_CONNECTION_LOOP(net); { pcb_element_t *element; Index: trunk/src_plugins/toporouter/toporouter.c =================================================================== --- trunk/src_plugins/toporouter/toporouter.c (revision 4992) +++ trunk/src_plugins/toporouter/toporouter.c (revision 4993) @@ -2699,7 +2699,7 @@ { pcb_netlist_list_t nets; pcb_reset_conns(pcb_false); - nets = CollectSubnets(pcb_false); + nets = pcb_rat_collect_subnets(pcb_false); PCB_NETLIST_LOOP(&nets); { if (netlist->NetN > 0) { @@ -2712,7 +2712,7 @@ #ifdef DEBUG_MERGING printf("NET:\n"); #endif - CONNECTION_LOOP(net); + PCB_CONNECTION_LOOP(net); { if (connection->type == PCB_TYPE_LINE) { @@ -8064,13 +8064,13 @@ void acquire_twonets(toporouter_t * r) { - RAT_LOOP(PCB->Data); + PCB_RAT_LOOP(PCB->Data); if (PCB_FLAG_TEST(PCB_FLAG_SELECTED, line)) import_route(r, line); END_LOOP; if (!r->routes->len) { - RAT_LOOP(PCB->Data); + PCB_RAT_LOOP(PCB->Data); import_route(r, line); END_LOOP; } @@ -8126,7 +8126,7 @@ SaveUndoSerialNumber(); pcb_rats_destroy(pcb_false); RestoreUndoSerialNumber(); - AddAllRats(pcb_false, NULL); + pcb_rat_add_all(pcb_false, NULL); RestoreUndoSerialNumber(); IncrementUndoSerialNumber(); pcb_redraw();