Index: trunk/doc-rnd/hacking/renames =================================================================== --- trunk/doc-rnd/hacking/renames (revision 4901) +++ trunk/doc-rnd/hacking/renames (revision 4902) @@ -429,3 +429,5 @@ hid_parse_command_line -> pcb_hid_parse_command_line hid_register_hid -> pcb_hid_register_hid hid_remove_hid -> pcb_hid_remove_hid +common_nogui_init -> pcb_hid_nogui_init +hid_nogui_get_hid -> pcb_hid_nogui_get_hid Index: trunk/src/hid_init.c =================================================================== --- trunk/src/hid_init.c (revision 4901) +++ trunk/src/hid_init.c (revision 4902) @@ -97,7 +97,7 @@ pcb_hid_actions_init(); /* Setup a "nogui" default HID */ - gui = hid_nogui_get_hid(); + gui = pcb_hid_nogui_get_hid(); #warning TODO: make this configurable hid_load_dir(Concat(conf_core.rc.path.exec_prefix, PCB_DIR_SEPARATOR_S, "lib", Index: trunk/src/hid_nogui.c =================================================================== --- trunk/src/hid_nogui.c (revision 4901) +++ trunk/src/hid_nogui.c (revision 4902) @@ -393,7 +393,7 @@ { } -void common_nogui_init(pcb_hid_t * hid) +void pcb_hid_nogui_init(pcb_hid_t * hid) { hid->get_export_options = nogui_get_export_options; hid->do_export = nogui_do_export; @@ -452,7 +452,7 @@ static pcb_hid_t nogui_hid; -pcb_hid_t *hid_nogui_get_hid(void) +pcb_hid_t *pcb_hid_nogui_get_hid(void) { memset(&nogui_hid, 0, sizeof(pcb_hid_t)); @@ -460,7 +460,7 @@ nogui_hid.name = "nogui"; nogui_hid.description = "Default GUI when no other GUI is present. " "Does nothing."; - common_nogui_init(&nogui_hid); + pcb_hid_nogui_init(&nogui_hid); return &nogui_hid; } Index: trunk/src/hid_nogui.h =================================================================== --- trunk/src/hid_nogui.h (revision 4901) +++ trunk/src/hid_nogui.h (revision 4902) @@ -1,7 +1,7 @@ #ifndef PCB_HID_COMMON_HIDNOGUI_H #define PCB_HID_COMMON_HIDNOGUI_H -void common_nogui_init(pcb_hid_t * hid); -pcb_hid_t *hid_nogui_get_hid(void); +void pcb_hid_nogui_init(pcb_hid_t * hid); +pcb_hid_t *pcb_hid_nogui_get_hid(void); #endif Index: trunk/src_plugins/export_bboard/bboard.c =================================================================== --- trunk/src_plugins/export_bboard/bboard.c (revision 4901) +++ trunk/src_plugins/export_bboard/bboard.c (revision 4902) @@ -593,7 +593,7 @@ { memset(&bboard_hid, 0, sizeof(bboard_hid)); - common_nogui_init(&bboard_hid); + pcb_hid_nogui_init(&bboard_hid); bboard_hid.struct_size = sizeof(bboard_hid); bboard_hid.name = "bboard"; Index: trunk/src_plugins/export_bom/bom.c =================================================================== --- trunk/src_plugins/export_bom/bom.c (revision 4901) +++ trunk/src_plugins/export_bom/bom.c (revision 4902) @@ -307,7 +307,7 @@ { memset(&bom_hid, 0, sizeof(pcb_hid_t)); - common_nogui_init(&bom_hid); + pcb_hid_nogui_init(&bom_hid); bom_hid.struct_size = sizeof(pcb_hid_t); bom_hid.name = "bom"; Index: trunk/src_plugins/export_dsn/dsn.c =================================================================== --- trunk/src_plugins/export_dsn/dsn.c (revision 4901) +++ trunk/src_plugins/export_dsn/dsn.c (revision 4902) @@ -572,7 +572,7 @@ pcb_uninit_t hid_export_dsn_init() { memset(&dsn_hid, 0, sizeof(pcb_hid_t)); - common_nogui_init(&dsn_hid); + pcb_hid_nogui_init(&dsn_hid); dsn_hid.struct_size = sizeof(pcb_hid_t); dsn_hid.name = "dsn"; Index: trunk/src_plugins/export_dxf/dxf.c =================================================================== --- trunk/src_plugins/export_dxf/dxf.c (revision 4901) +++ trunk/src_plugins/export_dxf/dxf.c (revision 4902) @@ -5932,7 +5932,7 @@ { memset(&dxf_hid, 0, sizeof(pcb_hid_t)); - common_nogui_init(&dxf_hid); + pcb_hid_nogui_init(&dxf_hid); pcb_dhlp_draw_helpers_init(&dxf_hid); dxf_hid.struct_size = sizeof(pcb_hid_t); dxf_hid.name = "dxf"; Index: trunk/src_plugins/export_gcode/gcode.c =================================================================== --- trunk/src_plugins/export_gcode/gcode.c (revision 4901) +++ trunk/src_plugins/export_gcode/gcode.c (revision 4902) @@ -879,7 +879,7 @@ { memset(&gcode_hid, 0, sizeof(pcb_hid_t)); - common_nogui_init(&gcode_hid); + pcb_hid_nogui_init(&gcode_hid); pcb_dhlp_draw_helpers_init(&gcode_hid); gcode_hid.struct_size = sizeof(pcb_hid_t); Index: trunk/src_plugins/export_gerber/gerber.c =================================================================== --- trunk/src_plugins/export_gerber/gerber.c (revision 4901) +++ trunk/src_plugins/export_gerber/gerber.c (revision 4902) @@ -1167,7 +1167,7 @@ { memset(&gerber_hid, 0, sizeof(gerber_hid)); - common_nogui_init(&gerber_hid); + pcb_hid_nogui_init(&gerber_hid); pcb_dhlp_draw_helpers_init(&gerber_hid); gerber_hid.struct_size = sizeof(gerber_hid); Index: trunk/src_plugins/export_ipcd356/ipcd356.c =================================================================== --- trunk/src_plugins/export_ipcd356/ipcd356.c (revision 4901) +++ trunk/src_plugins/export_ipcd356/ipcd356.c (revision 4902) @@ -607,7 +607,7 @@ { memset(&IPCD356_hid, 0, sizeof(pcb_hid_t)); - common_nogui_init(&IPCD356_hid); + pcb_hid_nogui_init(&IPCD356_hid); IPCD356_hid.struct_size = sizeof(pcb_hid_t); IPCD356_hid.name = "IPC-D-356"; Index: trunk/src_plugins/export_lpr/lpr.c =================================================================== --- trunk/src_plugins/export_lpr/lpr.c (revision 4901) +++ trunk/src_plugins/export_lpr/lpr.c (revision 4902) @@ -127,7 +127,7 @@ { memset(&lpr_hid, 0, sizeof(pcb_hid_t)); - common_nogui_init(&lpr_hid); + pcb_hid_nogui_init(&lpr_hid); ps_ps_init(&lpr_hid); lpr_hid.struct_size = sizeof(pcb_hid_t); Index: trunk/src_plugins/export_nelma/nelma.c =================================================================== --- trunk/src_plugins/export_nelma/nelma.c (revision 4901) +++ trunk/src_plugins/export_nelma/nelma.c (revision 4902) @@ -988,7 +988,7 @@ { memset(&nelma_hid, 0, sizeof(pcb_hid_t)); - common_nogui_init(&nelma_hid); + pcb_hid_nogui_init(&nelma_hid); pcb_dhlp_draw_helpers_init(&nelma_hid); nelma_hid.struct_size = sizeof(pcb_hid_t); Index: trunk/src_plugins/export_openscad/scad.c =================================================================== --- trunk/src_plugins/export_openscad/scad.c (revision 4901) +++ trunk/src_plugins/export_openscad/scad.c (revision 4902) @@ -1138,7 +1138,7 @@ { memset(&scad_hid, 0, sizeof(scad_hid)); - common_nogui_init(&scad_hid); + pcb_hid_nogui_init(&scad_hid); pcb_dhlp_draw_helpers_init(&scad_hid); scad_hid.struct_size = sizeof(scad_hid); Index: trunk/src_plugins/export_png/png.c =================================================================== --- trunk/src_plugins/export_png/png.c (revision 4901) +++ trunk/src_plugins/export_png/png.c (revision 4902) @@ -1493,7 +1493,7 @@ { memset(&png_hid, 0, sizeof(pcb_hid_t)); - common_nogui_init(&png_hid); + pcb_hid_nogui_init(&png_hid); pcb_dhlp_draw_helpers_init(&png_hid); png_hid.struct_size = sizeof(pcb_hid_t); Index: trunk/src_plugins/export_ps/eps.c =================================================================== --- trunk/src_plugins/export_ps/eps.c (revision 4901) +++ trunk/src_plugins/export_ps/eps.c (revision 4902) @@ -603,7 +603,7 @@ { memset(&eps_hid, 0, sizeof(pcb_hid_t)); - common_nogui_init(&eps_hid); + pcb_hid_nogui_init(&eps_hid); pcb_dhlp_draw_helpers_init(&eps_hid); eps_hid.struct_size = sizeof(pcb_hid_t); Index: trunk/src_plugins/export_ps/ps.c =================================================================== --- trunk/src_plugins/export_ps/ps.c (revision 4901) +++ trunk/src_plugins/export_ps/ps.c (revision 4902) @@ -1612,7 +1612,7 @@ { memset(&ps_hid, 0, sizeof(pcb_hid_t)); - common_nogui_init(&ps_hid); + pcb_hid_nogui_init(&ps_hid); pcb_dhlp_draw_helpers_init(&ps_hid); ps_ps_init(&ps_hid); Index: trunk/src_plugins/export_svg/svg.c =================================================================== --- trunk/src_plugins/export_svg/svg.c (revision 4901) +++ trunk/src_plugins/export_svg/svg.c (revision 4902) @@ -697,7 +697,7 @@ { memset(&svg_hid, 0, sizeof(pcb_hid_t)); - common_nogui_init(&svg_hid); + pcb_hid_nogui_init(&svg_hid); pcb_dhlp_draw_helpers_init(&svg_hid); svg_hid.struct_size = sizeof(pcb_hid_t); Index: trunk/src_plugins/export_test/export_test.c =================================================================== --- trunk/src_plugins/export_test/export_test.c (revision 4901) +++ trunk/src_plugins/export_test/export_test.c (revision 4902) @@ -334,7 +334,7 @@ { memset(&export_test_hid, 0, sizeof(pcb_hid_t)); - common_nogui_init(&export_test_hid); + pcb_hid_nogui_init(&export_test_hid); export_test_hid.struct_size = sizeof(pcb_hid_t); export_test_hid.name = "export_test"; Index: trunk/src_plugins/export_xy/xy.c =================================================================== --- trunk/src_plugins/export_xy/xy.c (revision 4901) +++ trunk/src_plugins/export_xy/xy.c (revision 4902) @@ -368,7 +368,7 @@ { memset(&xy_hid, 0, sizeof(pcb_hid_t)); - common_nogui_init(&xy_hid); + pcb_hid_nogui_init(&xy_hid); xy_hid.struct_size = sizeof(pcb_hid_t); xy_hid.name = "XY"; Index: trunk/src_plugins/gpmi/pcb-gpmi/gpmi_plugin/gpmi_pkg/hid/hid.c =================================================================== --- trunk/src_plugins/gpmi/pcb-gpmi/gpmi_plugin/gpmi_pkg/hid/hid.c (revision 4901) +++ trunk/src_plugins/gpmi/pcb-gpmi/gpmi_plugin/gpmi_pkg/hid/hid.c (revision 4902) @@ -35,7 +35,7 @@ h = calloc(sizeof(gpmi_hid_t), 1); h->hid = calloc(sizeof(pcb_hid_t), 1); - common_nogui_init (h->hid); + pcb_hid_nogui_init(h->hid); h->module = gpmi_get_current_module(); Index: trunk/src_plugins/hid_batch/batch.c =================================================================== --- trunk/src_plugins/hid_batch/batch.c (revision 4901) +++ trunk/src_plugins/hid_batch/batch.c (revision 4902) @@ -343,7 +343,7 @@ { memset(&batch_hid, 0, sizeof(pcb_hid_t)); - common_nogui_init(&batch_hid); + pcb_hid_nogui_init(&batch_hid); pcb_dhlp_draw_helpers_init(&batch_hid); batch_hid.struct_size = sizeof(pcb_hid_t); Index: trunk/src_plugins/hid_gtk/gtkhid-main.c =================================================================== --- trunk/src_plugins/hid_gtk/gtkhid-main.c (revision 4901) +++ trunk/src_plugins/hid_gtk/gtkhid-main.c (revision 4902) @@ -2045,7 +2045,7 @@ memset(&ghid_hid, 0, sizeof(pcb_hid_t)); - common_nogui_init(&ghid_hid); + pcb_hid_nogui_init(&ghid_hid); pcb_dhlp_draw_helpers_init(&ghid_hid); ghid_hid.struct_size = sizeof(pcb_hid_t); Index: trunk/src_plugins/hid_lesstif/main.c =================================================================== --- trunk/src_plugins/hid_lesstif/main.c (revision 4901) +++ trunk/src_plugins/hid_lesstif/main.c (revision 4902) @@ -3764,7 +3764,7 @@ { memset(&lesstif_hid, 0, sizeof(pcb_hid_t)); - common_nogui_init(&lesstif_hid); + pcb_hid_nogui_init(&lesstif_hid); pcb_dhlp_draw_helpers_init(&lesstif_hid); lesstif_hid.struct_size = sizeof(pcb_hid_t); Index: trunk/src_plugins/hid_remote/remote.c =================================================================== --- trunk/src_plugins/hid_remote/remote.c (revision 4901) +++ trunk/src_plugins/hid_remote/remote.c (revision 4902) @@ -377,7 +377,7 @@ { memset(&remote_hid, 0, sizeof(pcb_hid_t)); - common_nogui_init(&remote_hid); + pcb_hid_nogui_init(&remote_hid); pcb_dhlp_draw_helpers_init(&remote_hid); remote_hid.struct_size = sizeof(pcb_hid_t);