Index: import_sch.c =================================================================== --- import_sch.c (revision 30948) +++ import_sch.c (revision 30949) @@ -64,8 +64,8 @@ sprintf(tmp, "import::src%d", n); src = rnd_attrib_get(PCB, tmp); if (src != NULL) { - pcb_conf_grow("plugins/import_sch/args", idx+1); - pcb_conf_set(RND_CFR_DESIGN, "plugins/import_sch/args", idx, src, RND_POL_OVERWRITE); + rnd_conf_grow("plugins/import_sch/args", idx+1); + rnd_conf_set(RND_CFR_DESIGN, "plugins/import_sch/args", idx, src, RND_POL_OVERWRITE); idx++; } } @@ -74,7 +74,7 @@ mode = "gnetlist"; else if (strcmp(mode, "make") == 0) mode = "cmd"; - pcb_conf_set(RND_CFR_DESIGN, "plugins/import_sch/import_fmt", 0, mode, RND_POL_OVERWRITE); + rnd_conf_set(RND_CFR_DESIGN, "plugins/import_sch/import_fmt", 0, mode, RND_POL_OVERWRITE); if (strcmp(mode, "cmd") == 0) { @@ -96,9 +96,9 @@ gds_append(&cmdline, ' '); gds_append_str(&cmdline, target); - pcb_conf_grow("plugins/import_sch/args", 2); - pcb_conf_set(RND_CFR_DESIGN, "plugins/import_sch/args", 0, outfile, RND_POL_OVERWRITE); - pcb_conf_set(RND_CFR_DESIGN, "plugins/import_sch/args", 1, cmdline.array, RND_POL_OVERWRITE); + rnd_conf_grow("plugins/import_sch/args", 2); + rnd_conf_set(RND_CFR_DESIGN, "plugins/import_sch/args", 0, outfile, RND_POL_OVERWRITE); + rnd_conf_set(RND_CFR_DESIGN, "plugins/import_sch/args", 1, cmdline.array, RND_POL_OVERWRITE); gds_uninit(&cmdline); } @@ -179,10 +179,10 @@ return -1; } - pcb_conf_set(RND_CFR_DESIGN, "plugins/import_sch/import_fmt", 0, argv[0].val.str, RND_POL_OVERWRITE); - pcb_conf_grow("plugins/import_sch/args", argc-1); + rnd_conf_set(RND_CFR_DESIGN, "plugins/import_sch/import_fmt", 0, argv[0].val.str, RND_POL_OVERWRITE); + rnd_conf_grow("plugins/import_sch/args", argc-1); for(n = 1; n < argc; n++) - pcb_conf_set(RND_CFR_DESIGN, "plugins/import_sch/args", n-1, argv[n].val.str, RND_POL_OVERWRITE); + rnd_conf_set(RND_CFR_DESIGN, "plugins/import_sch/args", n-1, argv[n].val.str, RND_POL_OVERWRITE); return 0; } @@ -227,7 +227,7 @@ void pplg_uninit_import_sch2(void) { rnd_remove_actions_by_cookie(import_sch_cookie); - pcb_conf_unreg_fields("plugins/import_sch/"); + rnd_conf_unreg_fields("plugins/import_sch/"); isch_dlg_uninit(); } @@ -236,7 +236,7 @@ PCB_API_CHK_VER; RND_REGISTER_ACTIONS(import_sch_action_list, import_sch_cookie) #define conf_reg(field,isarray,type_name,cpath,cname,desc,flags) \ - pcb_conf_reg_field(conf_import_sch, field,isarray,type_name,cpath,cname,desc,flags); + rnd_conf_reg_field(conf_import_sch, field,isarray,type_name,cpath,cname,desc,flags); #include "import_sch_conf_fields.h" isch_dlg_init(); Index: import_sch_dlg.c =================================================================== --- import_sch_dlg.c (revision 30948) +++ import_sch_dlg.c (revision 30949) @@ -52,7 +52,7 @@ if (newval == NULL) newval = ""; if (strcmp(ci->val.string[0], newval) != 0) { - pcb_conf_set(RND_CFR_DESIGN, "plugins/import_sch/args", n, newval, RND_POL_OVERWRITE); + rnd_conf_set(RND_CFR_DESIGN, "plugins/import_sch/args", n, newval, RND_POL_OVERWRITE); goto restart; /* elements may be deleted and added with different pointers... */ } } @@ -106,7 +106,7 @@ isch_conf_lock++; PCB_DAD_SET_VALUE(isch_ctx.dlg_hid_ctx, isch_ctx.wtab, lng, target); if (setconf && (p != NULL)) - pcb_conf_set(RND_CFR_DESIGN, "plugins/import_sch/import_fmt", 0, p->name, RND_POL_OVERWRITE); + rnd_conf_set(RND_CFR_DESIGN, "plugins/import_sch/import_fmt", 0, p->name, RND_POL_OVERWRITE); if (p == NULL) { len = 0; @@ -115,8 +115,8 @@ else if (p->single_arg) { len = pcb_conflist_length((pcb_conflist_t *)&conf_import_sch.plugins.import_sch.args); if (len < 1) { - pcb_conf_grow("plugins/import_sch/args", 1); - pcb_conf_set(RND_CFR_DESIGN, "plugins/import_sch/args", 0, "", RND_POL_OVERWRITE); + rnd_conf_grow("plugins/import_sch/args", 1); + rnd_conf_set(RND_CFR_DESIGN, "plugins/import_sch/args", 0, "", RND_POL_OVERWRITE); } len = 1; controllable = 0; @@ -171,7 +171,7 @@ { int len = pcb_conflist_length((pcb_conflist_t *)&conf_import_sch.plugins.import_sch.args); if (len > 0) { - pcb_conf_del(RND_CFR_DESIGN, "plugins/import_sch/args", len-1); + rnd_conf_del(RND_CFR_DESIGN, "plugins/import_sch/args", len-1); isch_pcb2dlg(); } } @@ -181,8 +181,8 @@ int len = pcb_conflist_length((pcb_conflist_t *)&conf_import_sch.plugins.import_sch.args); if (len < MAX_ARGS+1) { isch_conf_lock++; - pcb_conf_grow("plugins/import_sch/args", len+1); - pcb_conf_set(RND_CFR_DESIGN, "plugins/import_sch/args", len, "", RND_POL_OVERWRITE); + rnd_conf_grow("plugins/import_sch/args", len+1); + rnd_conf_set(RND_CFR_DESIGN, "plugins/import_sch/args", len, "", RND_POL_OVERWRITE); isch_pcb2dlg(); isch_conf_lock--; } @@ -211,7 +211,7 @@ return; isch_conf_lock++; - pcb_conf_set(RND_CFR_DESIGN, "plugins/import_sch/args", idx, name, RND_POL_OVERWRITE); + rnd_conf_set(RND_CFR_DESIGN, "plugins/import_sch/args", idx, name, RND_POL_OVERWRITE); isch_pcb2dlg(); free(name); isch_conf_lock--; @@ -240,7 +240,7 @@ { const char *nv = isch_ctx.dlg[isch_ctx.wverbose].val.lng ? "1" : "0"; isch_conf_lock++; - pcb_conf_set(RND_CFR_DESIGN, "plugins/import_sch/verbose", 0, nv, RND_POL_OVERWRITE); + rnd_conf_set(RND_CFR_DESIGN, "plugins/import_sch/verbose", 0, nv, RND_POL_OVERWRITE); isch_conf_lock--; } @@ -379,7 +379,7 @@ cbs.val_change_post = isch_cfg_chg; - pcb_conf_hid_set_cb(pcb_conf_get_field("plugins/import_sch/args"), cfgid, &cbs); - pcb_conf_hid_set_cb(pcb_conf_get_field("plugins/import_sch/import_fmt"), cfgid, &cbs); - pcb_conf_hid_set_cb(pcb_conf_get_field("plugins/import_sch/verbose"), cfgid, &cbs); + pcb_conf_hid_set_cb(rnd_conf_get_field("plugins/import_sch/args"), cfgid, &cbs); + pcb_conf_hid_set_cb(rnd_conf_get_field("plugins/import_sch/import_fmt"), cfgid, &cbs); + pcb_conf_hid_set_cb(rnd_conf_get_field("plugins/import_sch/verbose"), cfgid, &cbs); }