Index: trunk/src/librnd/core/hid_attrib.c =================================================================== --- trunk/src/librnd/core/hid_attrib.c (revision 30982) +++ trunk/src/librnd/core/hid_attrib.c (revision 30983) @@ -247,12 +247,12 @@ return 0; } -void pcb_hid_usage_option(const char *name, const char *help) +void rnd_hid_usage_option(const char *name, const char *help) { fprintf(stderr, "--%-20s %s\n", name, help); } -void pcb_hid_usage(rnd_export_opt_t *a, int numa) +void rnd_hid_usage(rnd_export_opt_t *a, int numa) { for (; numa > 0; numa--,a++) { const char *help; @@ -259,12 +259,12 @@ if (a->help_text == NULL) help = ""; else help = a->help_text; if (RND_HATT_IS_COMPOSITE(a->type)) { - pcb_hid_export_opt_func_t fnc = a->default_val.func; + rnd_hid_export_opt_func_t fnc = a->default_val.func; if (fnc != NULL) - fnc(PCB_HIDEOF_USAGE, stderr, a); + fnc(RND_HIDEOF_USAGE, stderr, a); } else - pcb_hid_usage_option(a->name, help); + rnd_hid_usage_option(a->name, help); } } Index: trunk/src/librnd/core/hid_attrib.h =================================================================== --- trunk/src/librnd/core/hid_attrib.h (revision 30982) +++ trunk/src/librnd/core/hid_attrib.h (revision 30983) @@ -140,29 +140,29 @@ extern rnd_hid_attr_node_t *rnd_hid_attr_nodes; -void pcb_hid_usage(rnd_export_opt_t *a, int numa); -void pcb_hid_usage_option(const char *name, const char *help); +void rnd_hid_usage(rnd_export_opt_t *a, int numa); +void rnd_hid_usage_option(const char *name, const char *help); /* Count the number of direct children, start_from the first children */ -int pcb_hid_attrdlg_num_children(rnd_hid_attribute_t *attrs, int start_from, int n_attrs); +int rnd_hid_attrdlg_num_children(rnd_hid_attribute_t *attrs, int start_from, int n_attrs); /* Invoke a simple modal attribute dialog if GUI is available */ -int pcb_attribute_dialog_(const char *id, rnd_hid_attribute_t *attrs, int n_attrs, const char *title, void *caller_data, void **retovr, int defx, int defy, int minx, int miny, void **hid_ctx_out); -int pcb_attribute_dialog(const char *id, rnd_hid_attribute_t *attrs, int n_attrs, const char *title, void *caller_data); +int rnd_attribute_dialog_(const char *id, rnd_hid_attribute_t *attrs, int n_attrs, const char *title, void *caller_data, void **retovr, int defx, int defy, int minx, int miny, void **hid_ctx_out); +int rnd_attribute_dialog(const char *id, rnd_hid_attribute_t *attrs, int n_attrs, const char *title, void *caller_data); /* Convert between compflag bit value and name */ -const char *pcb_hid_compflag_bit2name(rnd_hatt_compflags_t bit); -rnd_hatt_compflags_t pcb_hid_compflag_name2bit(const char *name); +const char *rnd_hid_compflag_bit2name(rnd_hatt_compflags_t bit); +rnd_hatt_compflags_t rnd_hid_compflag_name2bit(const char *name); /*** When an rnd_export_opt_t item is a box, the following function is called from its ->func ***/ -typedef enum pcb_hid_export_opt_func_action_e { - PCB_HIDEOF_USAGE, /* call_ctx is a FILE * */ - PCB_HIDEOF_DAD /* call_ctx is a pcb_hid_export_opt_func_dad_t */ -} pcb_hid_export_opt_func_action_t; +typedef enum rnd_hid_export_opt_func_action_e { + RND_HIDEOF_USAGE, /* call_ctx is a FILE * */ + RND_HIDEOF_DAD /* call_ctx is a pcb_hid_export_opt_func_dad_t */ +} rnd_hid_export_opt_func_action_t; -typedef void (*pcb_hid_export_opt_func_t)(pcb_hid_export_opt_func_action_t act, void *call_ctx, rnd_export_opt_t *opt); +typedef void (*rnd_hid_export_opt_func_t)(rnd_hid_export_opt_func_action_t act, void *call_ctx, rnd_export_opt_t *opt); #endif Index: trunk/src/librnd/core/hid_dad.c =================================================================== --- trunk/src/librnd/core/hid_dad.c (revision 30982) +++ trunk/src/librnd/core/hid_dad.c (revision 30983) @@ -47,7 +47,7 @@ {0, NULL} }; -const char *pcb_hid_compflag_bit2name(rnd_hatt_compflags_t bit) +const char *rnd_hid_compflag_bit2name(rnd_hatt_compflags_t bit) { comflag_name_t *n; for(n = compflag_names; n->flag != 0; n++) @@ -56,7 +56,7 @@ return NULL; } -rnd_hatt_compflags_t pcb_hid_compflag_name2bit(const char *name) +rnd_hatt_compflags_t rnd_hid_compflag_name2bit(const char *name) { comflag_name_t *n; for(n = compflag_names; n->flag != 0; n++) @@ -91,7 +91,7 @@ return ret; } -int pcb_hid_attrdlg_num_children(rnd_hid_attribute_t *attrs, int start_from, int n_attrs) +int rnd_hid_attrdlg_num_children(rnd_hid_attribute_t *attrs, int start_from, int n_attrs) { int n, level = 1, cnt = 0; @@ -117,7 +117,7 @@ return cnt; } -int pcb_attribute_dialog_(const char *id, rnd_hid_attribute_t *attrs, int n_attrs, const char *title, void *caller_data, void **retovr, int defx, int defy, int minx, int miny, void **hid_ctx_out) +int rnd_attribute_dialog_(const char *id, rnd_hid_attribute_t *attrs, int n_attrs, const char *title, void *caller_data, void **retovr, int defx, int defy, int minx, int miny, void **hid_ctx_out) { int rv; void *hid_ctx; @@ -135,9 +135,9 @@ return rv ? 0 : 1; } -int pcb_attribute_dialog(const char *id, rnd_hid_attribute_t *attrs, int n_attrs, const char *title, void *caller_data) +int rnd_attribute_dialog(const char *id, rnd_hid_attribute_t *attrs, int n_attrs, const char *title, void *caller_data) { - return pcb_attribute_dialog_(id, attrs, n_attrs, title, caller_data, NULL, 0, 0, 0, 0, NULL); + return rnd_attribute_dialog_(id, attrs, n_attrs, title, caller_data, NULL, 0, 0, 0, 0, NULL); } int rnd_hid_dock_enter(rnd_hid_dad_subdialog_t *sub, rnd_hid_dock_t where, const char *id) Index: trunk/src/librnd/core/hid_dad.h =================================================================== --- trunk/src/librnd/core/hid_dad.h (revision 30982) +++ trunk/src/librnd/core/hid_dad.h (revision 30983) @@ -224,7 +224,7 @@ table ## _ret_override->dont_free++; \ table ## _ret_override->valid = 0; \ table ## _append_lock = 1; \ - __ok__ = pcb_attribute_dialog_(id,table, table ## _len, title, caller_data, (void **)&(table ## _ret_override), table ## _defx, table ## _defy, table ## _minx, table ## _miny, &table ## _hid_ctx); \ + __ok__ = rnd_attribute_dialog_(id,table, table ## _len, title, caller_data, (void **)&(table ## _ret_override), table ## _defx, table ## _defy, table ## _minx, table ## _miny, &table ## _hid_ctx); \ failed = (__ok__ == 0) ? -1 : 0; \ if (table ## _ret_override->valid) \ failed = table ## _ret_override->value; \ Index: trunk/src/librnd/pcb_compat.h =================================================================== --- trunk/src/librnd/pcb_compat.h (revision 30982) +++ trunk/src/librnd/pcb_compat.h (revision 30983) @@ -669,3 +669,15 @@ #define pcb_hid_attr_node_s rnd_hid_attr_node_s #define pcb_hid_attr_node_t rnd_hid_attr_node_t #define hid_attr_nodes rnd_hid_attr_nodes +#define pcb_hid_usage rnd_hid_usage +#define pcb_hid_usage_option rnd_hid_usage_option +#define pcb_hid_attrdlg_num_children rnd_hid_attrdlg_num_children +#define pcb_attribute_dialog_ rnd_attribute_dialog_ +#define pcb_attribute_dialog rnd_attribute_dialog +#define pcb_hid_compflag_bit2name rnd_hid_compflag_bit2name +#define pcb_hid_compflag_name2bit rnd_hid_compflag_name2bit +#define pcb_hid_export_opt_func_action_e rnd_hid_export_opt_func_action_e +#define pcb_hid_export_opt_func_action_t rnd_hid_export_opt_func_action_t +#define PCB_HIDEOF_USAGE RND_HIDEOF_USAGE +#define PCB_HIDEOF_DAD RND_HIDEOF_DAD +#define pcb_hid_export_opt_func_t rnd_hid_export_opt_func_t Index: trunk/src_plugins/dialogs/dlg_export.c =================================================================== --- trunk/src_plugins/dialogs/dlg_export.c (revision 30982) +++ trunk/src_plugins/dialogs/dlg_export.c (revision 30983) @@ -220,9 +220,9 @@ break; default: if (RND_HATT_IS_COMPOSITE(opts[i].type)) { - pcb_hid_export_opt_func_t fnc = opts[i].default_val.func; + rnd_hid_export_opt_func_t fnc = opts[i].default_val.func; if (fnc != NULL) - fnc(PCB_HIDEOF_DAD, &export_ctx, &opts[i]); + fnc(RND_HIDEOF_DAD, &export_ctx, &opts[i]); } else PCB_DAD_DUP_EXPOPT(export_ctx.dlg, &(opts[i])); Index: trunk/src_plugins/dialogs/dlg_printcalib.c =================================================================== --- trunk/src_plugins/dialogs/dlg_printcalib.c (revision 30982) +++ trunk/src_plugins/dialogs/dlg_printcalib.c (revision 30983) @@ -51,7 +51,7 @@ } printer->calibrate(printer, 0.0, 0.0); - if (pcb_attribute_dialog("printer_calibrate", printer_calibrate_attrs, 3, "Printer Calibration Values", NULL)) + if (rnd_attribute_dialog("printer_calibrate", printer_calibrate_attrs, 3, "Printer Calibration Values", NULL)) return 1; printer->calibrate(printer, printer_calibrate_attrs[1].val.dbl, printer_calibrate_attrs[2].val.dbl); RND_ACT_IRES(0); Index: trunk/src_plugins/export_bom/bom.c =================================================================== --- trunk/src_plugins/export_bom/bom.c (revision 30982) +++ trunk/src_plugins/export_bom/bom.c (revision 30983) @@ -246,7 +246,7 @@ static int bom_usage(rnd_hid_t *hid, const char *topic) { fprintf(stderr, "\nbom exporter command line arguments:\n\n"); - pcb_hid_usage(bom_options, sizeof(bom_options) / sizeof(bom_options[0])); + rnd_hid_usage(bom_options, sizeof(bom_options) / sizeof(bom_options[0])); fprintf(stderr, "\nUsage: pcb-rnd [generic_options] -x bom [bom_options] foo.pcb\n\n"); return 0; } Index: trunk/src_plugins/export_dxf/dxf.c =================================================================== --- trunk/src_plugins/export_dxf/dxf.c (revision 30982) +++ trunk/src_plugins/export_dxf/dxf.c (revision 30983) @@ -519,7 +519,7 @@ static int dxf_usage(rnd_hid_t *hid, const char *topic) { fprintf(stderr, "\ndxf exporter command line arguments:\n\n"); - pcb_hid_usage(dxf_attribute_list, sizeof(dxf_attribute_list) / sizeof(dxf_attribute_list[0])); + rnd_hid_usage(dxf_attribute_list, sizeof(dxf_attribute_list) / sizeof(dxf_attribute_list[0])); fprintf(stderr, "\nUsage: pcb-rnd [generic_options] -x dxf [dxf options] foo.pcb\n\n"); return 0; } Index: trunk/src_plugins/export_excellon/excellon.c =================================================================== --- trunk/src_plugins/export_excellon/excellon.c (revision 30982) +++ trunk/src_plugins/export_excellon/excellon.c (revision 30983) @@ -466,7 +466,7 @@ static int excellon_usage(rnd_hid_t *hid, const char *topic) { fprintf(stderr, "\nexcellon exporter command line arguments:\n\n"); - pcb_hid_usage(excellon_options, sizeof(excellon_options) / sizeof(excellon_options[0])); + rnd_hid_usage(excellon_options, sizeof(excellon_options) / sizeof(excellon_options[0])); fprintf(stderr, "\nUsage: pcb-rnd [generic_options] -x excellon [excellon options] foo.pcb\n\n"); return 0; } Index: trunk/src_plugins/export_fidocadj/fidocadj.c =================================================================== --- trunk/src_plugins/export_fidocadj/fidocadj.c (revision 30982) +++ trunk/src_plugins/export_fidocadj/fidocadj.c (revision 30983) @@ -349,7 +349,7 @@ static int fidocadj_usage(rnd_hid_t *hid, const char *topic) { fprintf(stderr, "\nfidocadj exporter command line arguments:\n\n"); - pcb_hid_usage(fidocadj_attribute_list, sizeof(fidocadj_attribute_list) / sizeof(fidocadj_attribute_list[0])); + rnd_hid_usage(fidocadj_attribute_list, sizeof(fidocadj_attribute_list) / sizeof(fidocadj_attribute_list[0])); fprintf(stderr, "\nUsage: pcb-rnd [generic_options] -x fidocadj [fidocadj options] foo.pcb\n\n"); return 0; } Index: trunk/src_plugins/export_gcode/gcode.c =================================================================== --- trunk/src_plugins/export_gcode/gcode.c (revision 30982) +++ trunk/src_plugins/export_gcode/gcode.c (revision 30983) @@ -387,7 +387,7 @@ static int gcode_usage(rnd_hid_t *hid, const char *topic) { fprintf(stderr, "\ngcode exporter command line arguments:\n\n"); - pcb_hid_usage(gcode_attribute_list, sizeof(gcode_attribute_list) / sizeof(gcode_attribute_list[0])); + rnd_hid_usage(gcode_attribute_list, sizeof(gcode_attribute_list) / sizeof(gcode_attribute_list[0])); fprintf(stderr, "\nUsage: pcb-rnd [generic_options] -x gcode [gcode options] foo.pcb\n\n"); return 0; } Index: trunk/src_plugins/export_gerber/gerber.c =================================================================== --- trunk/src_plugins/export_gerber/gerber.c (revision 30982) +++ trunk/src_plugins/export_gerber/gerber.c (revision 30983) @@ -195,7 +195,7 @@ NULL }; -static void gerber_warning(pcb_hid_export_opt_func_action_t act, void *call_ctx, rnd_export_opt_t *opt); +static void gerber_warning(rnd_hid_export_opt_func_action_t act, void *call_ctx, rnd_export_opt_t *opt); static rnd_export_opt_t gerber_options[] = { {"", "WARNING", @@ -1002,7 +1002,7 @@ static int gerber_usage(rnd_hid_t *hid, const char *topic) { fprintf(stderr, "\ngerber exporter command line arguments:\n\n"); - pcb_hid_usage(gerber_options, sizeof(gerber_options) / sizeof(gerber_options[0])); + rnd_hid_usage(gerber_options, sizeof(gerber_options) / sizeof(gerber_options[0])); fprintf(stderr, "\nUsage: pcb-rnd [generic_options] -x gerber [gerber options] foo.pcb\n\n"); return 0; } @@ -1015,7 +1015,7 @@ } -static void gerber_warning(pcb_hid_export_opt_func_action_t act, void *call_ctx, rnd_export_opt_t *opt) +static void gerber_warning(rnd_hid_export_opt_func_action_t act, void *call_ctx, rnd_export_opt_t *opt) { const char warn_txt[] = "WARNING: direct gerber export is most probably NOT what\n" @@ -1026,7 +1026,7 @@ pcb_hid_export_opt_func_dad_t *dad = call_ctx; switch(act) { - case PCB_HIDEOF_USAGE: + case RND_HIDEOF_USAGE: fprintf((FILE *)call_ctx, "******************************************************************************\n"); fprintf((FILE *)call_ctx, warn_txt); fprintf((FILE *)call_ctx, "For the cam export, try --help cam\n"); @@ -1033,7 +1033,7 @@ fprintf((FILE *)call_ctx, "Command line would look like pcb-rnd -x cam gerber:fixed filename\n"); fprintf((FILE *)call_ctx, "******************************************************************************\n\n"); break; - case PCB_HIDEOF_DAD: + case RND_HIDEOF_DAD: PCB_DAD_BEGIN_VBOX(dad->dlg); PCB_DAD_COMPFLAG(dad->dlg, RND_HATF_EXPFILL | RND_HATF_FRAME); PCB_DAD_BEGIN_HBOX(dad->dlg); Index: trunk/src_plugins/export_lpr/lpr.c =================================================================== --- trunk/src_plugins/export_lpr/lpr.c (revision 30982) +++ trunk/src_plugins/export_lpr/lpr.c (revision 30983) @@ -110,7 +110,7 @@ static int lpr_usage(rnd_hid_t *hid, const char *topic) { fprintf(stderr, "\nlpr exporter command line arguments:\n\n"); - pcb_hid_usage(base_lpr_options, sizeof(base_lpr_options) / sizeof(base_lpr_options[0])); + rnd_hid_usage(base_lpr_options, sizeof(base_lpr_options) / sizeof(base_lpr_options[0])); fprintf(stderr, "\nUsage: pcb-rnd [generic_options] -x lpr [lpr options] foo.pcb\n\n"); return 0; } Index: trunk/src_plugins/export_openems/export_openems.c =================================================================== --- trunk/src_plugins/export_openems/export_openems.c (revision 30982) +++ trunk/src_plugins/export_openems/export_openems.c (revision 30983) @@ -819,7 +819,7 @@ static int openems_usage(rnd_hid_t *hid, const char *topic) { fprintf(stderr, "\nopenems exporter command line arguments:\n\n"); - pcb_hid_usage(openems_attribute_list, sizeof(openems_attribute_list) / sizeof(openems_attribute_list[0])); + rnd_hid_usage(openems_attribute_list, sizeof(openems_attribute_list) / sizeof(openems_attribute_list[0])); fprintf(stderr, "\nUsage: pcb-rnd [generic_options] -x openems [openems options] foo.pcb\n\n"); return 0; } Index: trunk/src_plugins/export_openscad/export_openscad.c =================================================================== --- trunk/src_plugins/export_openscad/export_openscad.c (revision 30982) +++ trunk/src_plugins/export_openscad/export_openscad.c (revision 30983) @@ -596,7 +596,7 @@ static int openscad_usage(rnd_hid_t *hid, const char *topic) { fprintf(stderr, "\nopenscad exporter command line arguments:\n\n"); - pcb_hid_usage(openscad_attribute_list, sizeof(openscad_attribute_list) / sizeof(openscad_attribute_list[0])); + rnd_hid_usage(openscad_attribute_list, sizeof(openscad_attribute_list) / sizeof(openscad_attribute_list[0])); fprintf(stderr, "\nUsage: pcb-rnd [generic_options] -x openscad [openscad options] foo.pcb\n\n"); return 0; } Index: trunk/src_plugins/export_png/png.c =================================================================== --- trunk/src_plugins/export_png/png.c (revision 30982) +++ trunk/src_plugins/export_png/png.c (revision 30983) @@ -1394,7 +1394,7 @@ static int png_usage(rnd_hid_t *hid, const char *topic) { fprintf(stderr, "\npng exporter command line arguments:\n\n"); - pcb_hid_usage(png_attribute_list, sizeof(png_attribute_list) / sizeof(png_attribute_list[0])); + rnd_hid_usage(png_attribute_list, sizeof(png_attribute_list) / sizeof(png_attribute_list[0])); fprintf(stderr, "\nUsage: pcb-rnd [generic_options] -x png [png options] foo.pcb\n\n"); return 0; } Index: trunk/src_plugins/export_ps/eps.c =================================================================== --- trunk/src_plugins/export_ps/eps.c (revision 30982) +++ trunk/src_plugins/export_ps/eps.c (revision 30983) @@ -643,7 +643,7 @@ static int eps_usage(rnd_hid_t *hid, const char *topic) { fprintf(stderr, "\neps exporter command line arguments:\n\n"); - pcb_hid_usage(eps_attribute_list, sizeof(eps_attribute_list) / sizeof(eps_attribute_list[0])); + rnd_hid_usage(eps_attribute_list, sizeof(eps_attribute_list) / sizeof(eps_attribute_list[0])); fprintf(stderr, "\nUsage: pcb-rnd [generic_options] -x eps [eps options] foo.pcb\n\n"); return 0; } Index: trunk/src_plugins/export_ps/ps.c =================================================================== --- trunk/src_plugins/export_ps/ps.c (revision 30982) +++ trunk/src_plugins/export_ps/ps.c (revision 30983) @@ -1368,7 +1368,7 @@ ps_calib_attribute_list[0].val.str = rnd_strdup("lpr"); } - if (pcb_attribute_dialog("ps_calibrate", ps_calib_attribute_list, 1, "Print Calibration Page", NULL)) + if (rnd_attribute_dialog("ps_calibrate", ps_calib_attribute_list, 1, "Print Calibration Page", NULL)) return; if (ps_calib_attribute_list[0].val.str == NULL) @@ -1462,7 +1462,7 @@ static int ps_usage(rnd_hid_t *hid, const char *topic) { fprintf(stderr, "\nps exporter command line arguments:\n\n"); - pcb_hid_usage(ps_attribute_list, sizeof(ps_attribute_list) / sizeof(ps_attribute_list[0])); + rnd_hid_usage(ps_attribute_list, sizeof(ps_attribute_list) / sizeof(ps_attribute_list[0])); fprintf(stderr, "\nUsage: pcb-rnd [generic_options] -x ps [ps options] foo.pcb\n\n"); return 0; } Index: trunk/src_plugins/export_stat/stat.c =================================================================== --- trunk/src_plugins/export_stat/stat.c (revision 30982) +++ trunk/src_plugins/export_stat/stat.c (revision 30983) @@ -380,7 +380,7 @@ static int stat_usage(rnd_hid_t *hid, const char *topic) { fprintf(stderr, "\nstat exporter command line arguments:\n\n"); - pcb_hid_usage(stat_attribute_list, sizeof(stat_attribute_list) / sizeof(stat_attribute_list[0])); + rnd_hid_usage(stat_attribute_list, sizeof(stat_attribute_list) / sizeof(stat_attribute_list[0])); fprintf(stderr, "\nUsage: pcb-rnd [generic_options] -x stat [stat options] foo.pcb\n\n"); return 0; } Index: trunk/src_plugins/export_stl/export_stl.c =================================================================== --- trunk/src_plugins/export_stl/export_stl.c (revision 30982) +++ trunk/src_plugins/export_stl/export_stl.c (revision 30983) @@ -235,7 +235,7 @@ static int stl_usage(rnd_hid_t *hid, const char *topic) { fprintf(stderr, "\nstl exporter command line arguments:\n\n"); - pcb_hid_usage(stl_attribute_list, sizeof(stl_attribute_list) / sizeof(stl_attribute_list[0])); + rnd_hid_usage(stl_attribute_list, sizeof(stl_attribute_list) / sizeof(stl_attribute_list[0])); fprintf(stderr, "\nUsage: pcb-rnd [generic_options] -x stl [stl options] foo.pcb\n\n"); return 0; } Index: trunk/src_plugins/export_svg/svg.c =================================================================== --- trunk/src_plugins/export_svg/svg.c (revision 30982) +++ trunk/src_plugins/export_svg/svg.c (revision 30983) @@ -877,7 +877,7 @@ static int svg_usage(rnd_hid_t *hid, const char *topic) { fprintf(stderr, "\nsvg exporter command line arguments:\n\n"); - pcb_hid_usage(svg_attribute_list, sizeof(svg_attribute_list) / sizeof(svg_attribute_list[0])); + rnd_hid_usage(svg_attribute_list, sizeof(svg_attribute_list) / sizeof(svg_attribute_list[0])); fprintf(stderr, "\nUsage: pcb-rnd [generic_options] -x svg [svg options] foo.pcb\n\n"); return 0; } Index: trunk/src_plugins/export_test/export_test.c =================================================================== --- trunk/src_plugins/export_test/export_test.c (revision 30982) +++ trunk/src_plugins/export_test/export_test.c (revision 30983) @@ -80,7 +80,7 @@ static int export_test_usage(rnd_hid_t *hid, const char *topic) { fprintf(stderr, "\nexport_test exporter command line arguments:\n\n"); - pcb_hid_usage(export_test_options, sizeof(export_test_options) / sizeof(export_test_options[0])); + rnd_hid_usage(export_test_options, sizeof(export_test_options) / sizeof(export_test_options[0])); fprintf(stderr, "\nUsage: pcb-rnd [generic_options] -x export_test [export_test_options] foo.pcb\n\n"); return 0; } Index: trunk/src_plugins/export_vfs_mc/export_vfs_mc.c =================================================================== --- trunk/src_plugins/export_vfs_mc/export_vfs_mc.c (revision 30982) +++ trunk/src_plugins/export_vfs_mc/export_vfs_mc.c (revision 30983) @@ -127,7 +127,7 @@ static int export_vfs_mc_usage(rnd_hid_t *hid, const char *topic) { fprintf(stderr, "\nexport_vfs_mc exporter command line arguments:\n\n"); - pcb_hid_usage(export_vfs_mc_options, sizeof(export_vfs_mc_options) / sizeof(export_vfs_mc_options[0])); + rnd_hid_usage(export_vfs_mc_options, sizeof(export_vfs_mc_options) / sizeof(export_vfs_mc_options[0])); fprintf(stderr, "\nUsage: pcb-rnd [generic_options] -x export_vfs_mc [export_vfs_mc_options] foo.pcb\n\n"); return 0; } Index: trunk/src_plugins/export_xy/xy.c =================================================================== --- trunk/src_plugins/export_xy/xy.c (revision 30982) +++ trunk/src_plugins/export_xy/xy.c (revision 30983) @@ -833,7 +833,7 @@ static int xy_usage(rnd_hid_t *hid, const char *topic) { fprintf(stderr, "\nXY exporter command line arguments:\n\n"); - pcb_hid_usage(xy_options, sizeof(xy_options) / sizeof(xy_options[0])); + rnd_hid_usage(xy_options, sizeof(xy_options) / sizeof(xy_options[0])); fprintf(stderr, "\nUsage: pcb-rnd [generic_options] -x xy [xy_options] foo.pcb\n\n"); return 0; } Index: trunk/src_plugins/hid_lesstif/dialogs.c =================================================================== --- trunk/src_plugins/hid_lesstif/dialogs.c (revision 30982) +++ trunk/src_plugins/hid_lesstif/dialogs.c (revision 30983) @@ -335,7 +335,7 @@ case RND_HATT_BEGIN_TABLE: /* create content table */ numcol = ctx->attrs[i].rnd_hatt_table_cols; - len = pcb_hid_attrdlg_num_children(ctx->attrs, i+1, ctx->n_attrs); + len = rnd_hid_attrdlg_num_children(ctx->attrs, i+1, ctx->n_attrs); numch = len / numcol + !!(len % numcol); w = pcb_motif_box(parent, XmStrCast(ctx->attrs[i].name), 't', numch, (ctx->attrs[i].rnd_hatt_flags & RND_HATF_FRAME), (ctx->attrs[i].rnd_hatt_flags & RND_HATF_SCROLL)); @@ -668,7 +668,7 @@ if (!RND_HATT_IS_COMPOSITE(attrs[0].type)) { stdarg_n = 0; - main_tbl = pcb_motif_box(topform, XmStrCast("layout"), 't', pcb_hid_attrdlg_num_children(ctx->attrs, 0, ctx->n_attrs), 0, 0); + main_tbl = pcb_motif_box(topform, XmStrCast("layout"), 't', rnd_hid_attrdlg_num_children(ctx->attrs, 0, ctx->n_attrs), 0, 0); XtManageChild(main_tbl); attribute_dialog_add(ctx, main_tbl, 0); } Index: trunk/src_plugins/hid_lesstif/main.c =================================================================== --- trunk/src_plugins/hid_lesstif/main.c (revision 30982) +++ trunk/src_plugins/hid_lesstif/main.c (revision 30983) @@ -2764,7 +2764,7 @@ static int lesstif_usage(rnd_hid_t *hid, const char *topic) { fprintf(stderr, "\nLesstif GUI command line arguments:\n\n"); - pcb_hid_usage(lesstif_attribute_list, sizeof(lesstif_attribute_list) / sizeof(lesstif_attribute_list[0])); + rnd_hid_usage(lesstif_attribute_list, sizeof(lesstif_attribute_list) / sizeof(lesstif_attribute_list[0])); fprintf(stderr, "\nInvocation: pcb-rnd --gui lesstif [options]\n"); return 0; } Index: trunk/src_plugins/io_tedax/tetest.c =================================================================== --- trunk/src_plugins/io_tedax/tetest.c (revision 30982) +++ trunk/src_plugins/io_tedax/tetest.c (revision 30983) @@ -229,7 +229,7 @@ static int tedax_etest_usage(rnd_hid_t *hid, const char *topic) { fprintf(stderr, "\ntEDAx etest exporter command line arguments:\n\n"); - pcb_hid_usage(tedax_etest_options, sizeof(tedax_etest_options) / sizeof(tedax_etest_options[0])); + rnd_hid_usage(tedax_etest_options, sizeof(tedax_etest_options) / sizeof(tedax_etest_options[0])); fprintf(stderr, "\nUsage: pcb-rnd [generic_options] -x tedax-etest [tedax_etest_options] foo.pcb\n\n"); return 0; } Index: trunk/src_plugins/lib_gtk_common/dlg_attribute.c =================================================================== --- trunk/src_plugins/lib_gtk_common/dlg_attribute.c (revision 30982) +++ trunk/src_plugins/lib_gtk_common/dlg_attribute.c (revision 30983) @@ -352,7 +352,7 @@ bparent = frame_scroll(parent, ctx->attrs[j].rnd_hatt_flags, &ctx->wltop[j]); ts.type = TB_TABLE; ts.val.table.cols = ctx->attrs[j].rnd_hatt_table_cols; - ts.val.table.rows = pcb_hid_attrdlg_num_children(ctx->attrs, j+1, ctx->n_attrs) / ts.val.table.cols; + ts.val.table.rows = rnd_hid_attrdlg_num_children(ctx->attrs, j+1, ctx->n_attrs) / ts.val.table.cols; ts.val.table.col = 0; ts.val.table.row = 0; tbl = gtkc_table_static(ts.val.table.rows, ts.val.table.cols, 1); Index: trunk/src_plugins/lib_gtk_common/glue_hid.c =================================================================== --- trunk/src_plugins/lib_gtk_common/glue_hid.c (revision 30982) +++ trunk/src_plugins/lib_gtk_common/glue_hid.c (revision 30983) @@ -350,7 +350,7 @@ static int ghid_usage(rnd_hid_t *hid, const char *topic) { fprintf(stderr, "\nGTK GUI command line arguments:\n\n"); - rnd_conf_usage("plugins/hid_gtk", pcb_hid_usage_option); + rnd_conf_usage("plugins/hid_gtk", rnd_hid_usage_option); fprintf(stderr, "\nInvocation:\n"); fprintf(stderr, " pcb-rnd --gui gtk2_gdk [options]\n"); fprintf(stderr, " pcb-rnd --gui gtk2_gl [options]\n"); Index: trunk/src_plugins/lib_hid_common/act_dad.c =================================================================== --- trunk/src_plugins/lib_hid_common/act_dad.c (revision 30982) +++ trunk/src_plugins/lib_hid_common/act_dad.c (revision 30983) @@ -428,7 +428,7 @@ RND_PCB_ACT_CONVARG(n, FGW_STR, dad, txt = argv[n].val.str); if ((*txt == '\0') || (*txt == '0')) continue; - tmp = pcb_hid_compflag_name2bit(txt); + tmp = rnd_hid_compflag_name2bit(txt); if (tmp == 0) rnd_message(RND_MSG_ERROR, "Invalid DAD flag: %s (ignored)\n", txt); flg |= tmp; Index: trunk/src_plugins/loghid/loghid.c =================================================================== --- trunk/src_plugins/loghid/loghid.c (revision 30982) +++ trunk/src_plugins/loghid/loghid.c (revision 30983) @@ -92,7 +92,7 @@ static int loghid_usage(rnd_hid_t *hid, const char *topic) { fprintf(stderr, "\nloghid command line arguments:\n\n"); - pcb_hid_usage(loghid_attribute_list, NUM_OPTIONS); + rnd_hid_usage(loghid_attribute_list, NUM_OPTIONS); fprintf(stderr, "\n"); fprintf(stderr, "Usage: pcb-rnd [generic_options] --gui loghid-gui --target-hid gtk2_gdk foo.pcb\n"); fprintf(stderr, "Usage: pcb-rnd [generic_options] --x loghid-exp --target-hid png foo.pcb\n");