Index: trunk/src/gui_act.c =================================================================== --- trunk/src/gui_act.c (revision 4814) +++ trunk/src/gui_act.c (revision 4815) @@ -1014,7 +1014,7 @@ static int ActionRouteStyle(int argc, const char **argv, pcb_coord_t x, pcb_coord_t y) { const char *str = ACTION_ARG(0); - RouteStyleType *rts; + pcb_route_style_t *rts; int number; if (str) { Index: trunk/src/netlist.h =================================================================== --- trunk/src/netlist.h (revision 4814) +++ trunk/src/netlist.h (revision 4815) @@ -36,7 +36,7 @@ pcb_cardinal_t ConnectionN, /* the number of connections contained */ ConnectionMax; /* max connections from malloc */ pcb_connection_t *Connection; - RouteStyleTypePtr Style; + pcb_route_style_t *Style; }; typedef struct { /* holds a list of nets */ Index: trunk/src/rats.c =================================================================== --- trunk/src/rats.c (revision 4814) +++ trunk/src/rats.c (revision 4815) @@ -62,7 +62,7 @@ static pcb_bool FindPad(const char *, const char *, pcb_connection_t *, pcb_bool); static pcb_bool ParseConnection(const char *, char *, char *); static pcb_bool DrawShortestRats(pcb_netlist_t *, - void (*)(register pcb_connection_t *, register pcb_connection_t *, register RouteStyleTypePtr)); + void (*)(register pcb_connection_t *, register pcb_connection_t *, register pcb_route_style_t *)); static pcb_bool GatherSubnets(pcb_netlist_t *, pcb_bool, pcb_bool); static pcb_bool CheckShorts(pcb_lib_menu_t *); static void TransferNet(pcb_netlist_t *, pcb_net_t *, pcb_net_t *); @@ -492,7 +492,7 @@ static pcb_bool DrawShortestRats(pcb_netlist_t *Netl, - void (*funcp) (register pcb_connection_t *, register pcb_connection_t *, register RouteStyleTypePtr)) + void (*funcp) (register pcb_connection_t *, register pcb_connection_t *, register pcb_route_style_t *)) { pcb_rat_t *line; register float distance, temp; @@ -645,7 +645,7 @@ */ pcb_bool AddAllRats(pcb_bool SelectedOnly, - void (*funcp) (register pcb_connection_t *, register pcb_connection_t *, register RouteStyleTypePtr)) + void (*funcp) (register pcb_connection_t *, register pcb_connection_t *, register pcb_route_style_t *)) { pcb_netlist_t *Nets, *Wantlist; pcb_net_t *lonesome; Index: trunk/src/rats.h =================================================================== --- trunk/src/rats.h (revision 4814) +++ trunk/src/rats.h (revision 4815) @@ -50,7 +50,7 @@ pcb_rat_t *AddNet(void); char *ConnectionName(int, void *, void *); -pcb_bool AddAllRats(pcb_bool, void (*)(register pcb_connection_t *, register pcb_connection_t *, register RouteStyleTypePtr)); +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_netlist_t *ProcNetlist(pcb_lib_t *); Index: trunk/src/route_style.c =================================================================== --- trunk/src/route_style.c (revision 4814) +++ trunk/src/route_style.c (revision 4815) @@ -33,7 +33,7 @@ #include "conf.h" #include "misc_util.h" -RouteStyleType pcb_custom_route_style; +pcb_route_style_t pcb_custom_route_style; /*! \brief Serializes the route style list * \par Function Description @@ -62,7 +62,7 @@ * comma separated Name, Dimension, Dimension, Dimension, Dimension * e.g. Signal,20,40,20,10:Power,40,60,28,10:... */ -int ParseRoutingString1(char **str, RouteStyleTypePtr routeStyle, const char *default_unit) +int ParseRoutingString1(char **str, pcb_route_style_t *routeStyle, const char *default_unit) { char *s = *str; char Name[256]; @@ -148,7 +148,7 @@ return 0; } -void pcb_use_route_style(RouteStyleType * rst) +void pcb_use_route_style(pcb_route_style_t * rst) { conf_set_design("design/line_thickness", "%$mS", rst->Thick); conf_set_design("design/via_thickness", "%$mS", rst->Diameter); Index: trunk/src/route_style.h =================================================================== --- trunk/src/route_style.h (revision 4814) +++ trunk/src/route_style.h (revision 4815) @@ -27,8 +27,8 @@ #include "vtroutestyle.h" -/* Parse a single route string into one RouteStyleTypePtr slot. Returns 0 on success. */ -int ParseRoutingString1(char **str, RouteStyleTypePtr routeStyle, const char *default_unit); +/* Parse a single route string into one pcb_route_style_t *slot. Returns 0 on success. */ +int ParseRoutingString1(char **str, pcb_route_style_t *routeStyle, const char *default_unit); /* Parse a ':' separated list of route strings into a styles vector The vector is initialized before the call. On error the vector is left empty @@ -38,7 +38,7 @@ char *make_route_string(vtroutestyle_t *styles); /* Set design configuration (the pen we draw with) to a given route style */ -void pcb_use_route_style(RouteStyleType *rst); +void pcb_use_route_style(pcb_route_style_t *rst); /* Same as pcb_use_route_style() but uses one of the styles in a vector; returns -1 if idx is out of bounds, 0 on success. */ @@ -49,4 +49,4 @@ a style. Return -1 on no match. */ int pcb_route_style_lookup(vtroutestyle_t *styles, pcb_coord_t Thick, pcb_coord_t Diameter, pcb_coord_t Hole, pcb_coord_t Clearance, char *Name); -extern RouteStyleType pcb_custom_route_style; +extern pcb_route_style_t pcb_custom_route_style; Index: trunk/src/vtroutestyle.h =================================================================== --- trunk/src/vtroutestyle.h (revision 4814) +++ trunk/src/vtroutestyle.h (revision 4815) @@ -13,7 +13,7 @@ Clearance; /* min. separation from other nets */ char name[32]; /* fixed length name to save malloc/free */ /* int index;*/ -} RouteStyleType, *RouteStyleTypePtr; +} pcb_route_style_t; /* all public symbols are wrapped in GVT() - see vt_t(7) */ #define GVT(x) vtroutestyle_ ## x @@ -20,7 +20,7 @@ #define HAVE_VTROUTESTYLE_T /* Array elem type - see vt_t(7) */ -#define GVT_ELEM_TYPE RouteStyleType +#define GVT_ELEM_TYPE pcb_route_style_t /* Type that represents array lengths - see vt_t(7) */ #define GVT_SIZE_TYPE size_t Index: trunk/src_plugins/autoroute/autoroute.c =================================================================== --- trunk/src_plugins/autoroute/autoroute.c (revision 4814) +++ trunk/src_plugins/autoroute/autoroute.c (revision 4815) @@ -282,7 +282,7 @@ */ vector_t *conflicts_with; /* route style of the net associated with this routebox */ - RouteStyleType *style; + pcb_route_style_t *style; /* congestion values for the edges of an expansion box */ unsigned char n, e, s, w; /* what pass this this track was laid down on */ @@ -304,9 +304,9 @@ /* root pointer into connectivity information */ routebox_t *first_net; /* default routing style */ - RouteStyleType defaultstyle; + pcb_route_style_t defaultstyle; /* style structures */ - RouteStyleType **styles; /* [max_styles+1] */ + pcb_route_style_t **styles; /* [max_styles+1] */ /* what is the maximum bloat (clearance+line half-width or * clearance+via_radius) for any style we've seen? */ pcb_coord_t max_bloat; @@ -339,7 +339,7 @@ static struct { /* net style parameters */ - RouteStyleType *style; + pcb_route_style_t *style; /* the present bloat */ pcb_coord_t bloat; /* cost parameters */ @@ -584,7 +584,7 @@ * routedata initialization functions. */ -static routebox_t *AddPin(PointerListType layergroupboxes[], pcb_pin_t *pin, pcb_bool is_via, RouteStyleType * style) +static routebox_t *AddPin(PointerListType layergroupboxes[], pcb_pin_t *pin, pcb_bool is_via, pcb_route_style_t * style) { routebox_t **rbpp, *lastrb = NULL; int i, ht; @@ -626,7 +626,7 @@ return lastrb; } -static routebox_t *AddPad(PointerListType layergroupboxes[], pcb_element_t *element, pcb_pad_t *pad, RouteStyleType * style) +static routebox_t *AddPad(PointerListType layergroupboxes[], pcb_element_t *element, pcb_pad_t *pad, pcb_route_style_t * style) { pcb_coord_t halfthick; routebox_t **rbpp; @@ -661,7 +661,7 @@ } static routebox_t *AddLine(PointerListType layergroupboxes[], int layergroup, pcb_line_t *line, - pcb_line_t *ptr, RouteStyleType * style) + pcb_line_t *ptr, pcb_route_style_t * style) { routebox_t **rbpp; assert(layergroupboxes && line); @@ -703,7 +703,7 @@ static routebox_t *AddIrregularObstacle(PointerListType layergroupboxes[], pcb_coord_t X1, pcb_coord_t Y1, - pcb_coord_t X2, pcb_coord_t Y2, pcb_cardinal_t layergroup, void *parent, RouteStyleType * style) + pcb_coord_t X2, pcb_coord_t Y2, pcb_cardinal_t layergroup, void *parent, pcb_route_style_t * style) { routebox_t **rbpp; pcb_coord_t keep = style->Clearance; @@ -727,7 +727,7 @@ return *rbpp; } -static routebox_t *AddPolygon(PointerListType layergroupboxes[], pcb_cardinal_t layer, pcb_polygon_t *polygon, RouteStyleType * style) +static routebox_t *AddPolygon(PointerListType layergroupboxes[], pcb_cardinal_t layer, pcb_polygon_t *polygon, pcb_route_style_t * style) { int is_not_rectangle = 1; int layergroup = GetLayerGroupNumberByNumber(layer); @@ -758,7 +758,7 @@ return rb; } -static void AddText(PointerListType layergroupboxes[], pcb_cardinal_t layergroup, pcb_text_t *text, RouteStyleType * style) +static void AddText(PointerListType layergroupboxes[], pcb_cardinal_t layergroup, pcb_text_t *text, pcb_route_style_t * style) { AddIrregularObstacle(layergroupboxes, text->BoundingBox.X1, text->BoundingBox.Y1, @@ -765,7 +765,7 @@ text->BoundingBox.X2, text->BoundingBox.Y2, layergroup, text, style); } -static routebox_t *AddArc(PointerListType layergroupboxes[], pcb_cardinal_t layergroup, pcb_arc_t *arc, RouteStyleType * style) +static routebox_t *AddArc(PointerListType layergroupboxes[], pcb_cardinal_t layergroup, pcb_arc_t *arc, pcb_route_style_t * style) { return AddIrregularObstacle(layergroupboxes, arc->BoundingBox.X1, arc->BoundingBox.Y1, @@ -909,7 +909,7 @@ bbox.X2 = PCB->MaxWidth; bbox.Y2 = PCB->MaxHeight; for (i = 0; i < rd->max_styles + 1; i++) { - RouteStyleType *style = (i < rd->max_styles) ? &PCB->RouteStyle.array[i] : &rd->defaultstyle; + pcb_route_style_t *style = (i < rd->max_styles) ? &PCB->RouteStyle.array[i] : &rd->defaultstyle; rd->styles[i] = style; } @@ -4021,7 +4021,7 @@ return result; } -static void InitAutoRouteParameters(int pass, RouteStyleType * style, pcb_bool with_conflicts, pcb_bool is_smoothing, pcb_bool lastpass) +static void InitAutoRouteParameters(int pass, pcb_route_style_t * style, pcb_bool with_conflicts, pcb_bool is_smoothing, pcb_bool lastpass) { int i; /* routing style */ Index: trunk/src_plugins/hid_gtk/ghid-route-style-selector.c =================================================================== --- trunk/src_plugins/hid_gtk/ghid-route-style-selector.c (revision 4814) +++ trunk/src_plugins/hid_gtk/ghid-route-style-selector.c (revision 4815) @@ -22,7 +22,7 @@ /* Forward dec'ls */ struct _route_style; -struct _route_style *ghid_route_style_selector_real_add_route_style(GHidRouteStyleSelector *, RouteStyleType *, int); +struct _route_style *ghid_route_style_selector_real_add_route_style(GHidRouteStyleSelector *, pcb_route_style_t *, int); static void ghid_route_style_selector_finalize(GObject * object); static void add_new_iter(GHidRouteStyleSelector * rss); @@ -68,7 +68,7 @@ struct _GHidRouteStyleSelectorClass { GtkVBoxClass parent_class; - void (*select_style) (GHidRouteStyleSelector *, RouteStyleType *); + void (*select_style) (GHidRouteStyleSelector *, pcb_route_style_t *); void (*style_edited) (GHidRouteStyleSelector *, gboolean); }; @@ -77,7 +77,7 @@ GtkWidget *button; GtkWidget *menu_item; GtkTreeRowReference *rref; - RouteStyleType *rst; + pcb_route_style_t *rst; gulong sig_id; int hidden; }; @@ -264,7 +264,7 @@ gtk_widget_show_all(dialog); if (gtk_dialog_run(GTK_DIALOG(dialog)) == GTK_RESPONSE_OK) { int changed = 0; - RouteStyleType *rst; + pcb_route_style_t *rst; struct _route_style *style; gboolean save; if (!gtk_combo_box_get_active_iter(GTK_COMBO_BOX(select_box), &iter)) @@ -431,7 +431,7 @@ * \param [in] data PCB's route style object that will be edited */ struct _route_style *ghid_route_style_selector_real_add_route_style(GHidRouteStyleSelector * rss, - RouteStyleType * data, int hide) + pcb_route_style_t * data, int hide) { GtkTreeIter iter; GtkTreePath *path; @@ -438,7 +438,7 @@ gchar *action_name = g_strdup_printf("RouteStyle%d", action_count); struct _route_style *new_style = g_malloc(sizeof(*new_style)); - /* Key the route style data with the RouteStyleType it controls */ + /* Key the route style data with the pcb_route_style_t it controls */ new_style->hidden = hide; new_style->rst = data; new_style->action = gtk_radio_action_new(action_name, data->name, NULL, NULL, action_count); @@ -485,7 +485,7 @@ * \param [in] rss The selector to be acted on * \param [in] data PCB's route style object describing the style */ -void ghid_route_style_selector_add_route_style(GHidRouteStyleSelector * rss, RouteStyleType * data) +void ghid_route_style_selector_add_route_style(GHidRouteStyleSelector * rss, pcb_route_style_t * data) { if (!rss->hidden_button) { memset(&pcb_custom_route_style, 0, sizeof(pcb_custom_route_style)); @@ -542,7 +542,7 @@ * * \return TRUE if a style was selected, FALSE otherwise */ -gboolean ghid_route_style_selector_select_style(GHidRouteStyleSelector * rss, RouteStyleType * rst) +gboolean ghid_route_style_selector_select_style(GHidRouteStyleSelector * rss, pcb_route_style_t * rst) { GtkTreeIter iter; gtk_tree_model_get_iter_first(GTK_TREE_MODEL(rss->model), &iter); Index: trunk/src_plugins/hid_gtk/ghid-route-style-selector.h =================================================================== --- trunk/src_plugins/hid_gtk/ghid-route-style-selector.h (revision 4814) +++ trunk/src_plugins/hid_gtk/ghid-route-style-selector.h (revision 4815) @@ -22,8 +22,8 @@ gint ghid_route_style_selector_install_items(GHidRouteStyleSelector * rss, GtkMenuShell * shell, gint pos); -void ghid_route_style_selector_add_route_style(GHidRouteStyleSelector * rss, RouteStyleType * data); -gboolean ghid_route_style_selector_select_style(GHidRouteStyleSelector * rss, RouteStyleType * rst); +void ghid_route_style_selector_add_route_style(GHidRouteStyleSelector * rss, pcb_route_style_t * data); +gboolean ghid_route_style_selector_select_style(GHidRouteStyleSelector * rss, pcb_route_style_t * rst); void ghid_route_style_selector_edit_dialog(GHidRouteStyleSelector * rss); GtkAccelGroup *ghid_route_style_selector_get_accel_group(GHidRouteStyleSelector * rss); Index: trunk/src_plugins/hid_gtk/gui-top-window.c =================================================================== --- trunk/src_plugins/hid_gtk/gui-top-window.c (revision 4814) +++ trunk/src_plugins/hid_gtk/gui-top-window.c (revision 4815) @@ -720,7 +720,7 @@ } /*! \brief Called when a route style is selected */ -static void route_style_changed_cb(GHidRouteStyleSelector * rss, RouteStyleType * rst, gpointer data) +static void route_style_changed_cb(GHidRouteStyleSelector * rss, pcb_route_style_t * rst, gpointer data) { pcb_use_route_style(rst); ghid_set_status_line_label(); Index: trunk/src_plugins/hid_lesstif/styles.c =================================================================== --- trunk/src_plugins/hid_lesstif/styles.c (revision 4814) +++ trunk/src_plugins/hid_lesstif/styles.c (revision 4815) @@ -233,7 +233,7 @@ static void style_selected(Widget w, int i, XmToggleButtonCallbackStruct * cbs) { - RouteStyleType *style; + pcb_route_style_t *style; int j, n; if (cbs && cbs->set == 0) { XmToggleButtonSetState(w, 1, 0); Index: trunk/src_plugins/io_lihata/read.c =================================================================== --- trunk/src_plugins/io_lihata/read.c (revision 4814) +++ trunk/src_plugins/io_lihata/read.c (revision 4815) @@ -825,7 +825,7 @@ return -1; for(stn = lht_dom_first(&it, nd); stn != NULL; stn = lht_dom_next(&it)) { - RouteStyleType *s = vtroutestyle_alloc_append(styles, 1); + pcb_route_style_t *s = vtroutestyle_alloc_append(styles, 1); int name_len = strlen(stn->name); /* safe copy the name */ Index: trunk/src_plugins/io_lihata/write.c =================================================================== --- trunk/src_plugins/io_lihata/write.c (revision 4814) +++ trunk/src_plugins/io_lihata/write.c (revision 4815) @@ -571,7 +571,7 @@ stl = lht_dom_node_alloc(LHT_LIST, "styles"); for(n = 0; n < vtroutestyle_len(styles); n++) { - RouteStyleType *s = styles->array + n; + pcb_route_style_t *s = styles->array + n; sn = lht_dom_node_alloc(LHT_HASH, s->name); lht_dom_list_append(stl, sn); lht_dom_hash_put(sn, build_textf("thickness", CFMT, s->Thick));