Index: trunk/doc-rnd/hacking/renames =================================================================== --- trunk/doc-rnd/hacking/renames (revision 4847) +++ trunk/doc-rnd/hacking/renames (revision 4848) @@ -183,3 +183,43 @@ GetInfoString -> pcb_get_infostr ChangeLayoutName -> pcb_board_change_name ChangeLayerName -> pcb_layer_change_name +ChangeSelectedSize -> pcb_chg_selected_size +ChangeSelectedClearSize -> pcb_chg_selected_clear_size +ChangeSelected2ndSize -> pcb_chg_selected_2nd_size +ChangeSelectedMaskSize -> pcb_chg_selected_mask_size +ChangeSelectedJoin -> pcb_chg_selected_join +SetSelectedJoin -> pcb_set_selected_join +ClrSelectedJoin -> pcb_clr_selected_join +ChangeSelectedNonetlist -> pcb_chg_selected_nonetlist +ChangeSelectedSquare -> pcb_chg_selected_square +SetSelectedSquare -> pcb_set_selected_square +ClrSelectedSquare -> pcb_clr_selected_square +ChangeSelectedThermals -> pcb_chg_selected_thermals +ChangeSelectedHole -> pcb_chg_selected_hole +ChangeSelectedPaste -> pcb_chg_selected_paste +ChangeSelectedOctagon -> pcb_chg_selected_octagon +SetSelectedOctagon -> pcb_set_selected_octagon +ClrSelectedOctagon -> pcb_clr_selected_octagon +ChangeObjectSize -> pcb_chg_obj_size +ChangeObject1stSize -> pcb_chg_obj_1st_size +ChangeObjectThermal -> pcb_chg_obj_thermal +ChangeObjectClearSize -> pcb_chg_obj_clear_size +ChangeObject2ndSize -> pcb_chg_obj_2nd_size +ChangeObjectMaskSize -> pcb_chg_obj_mask_size +ChangeObjectJoin -> pcb_chg_obj_join +SetObjectJoin -> pcb_set_obj_join +ClrObjectJoin -> pcb_clr_obj_join +ChangeObjectNonetlist -> pcb_chg_obj_nonetlist +ChangeObjectSquare -> pcb_chg_obj_square +SetObjectSquare -> pcb_set_obj_square +ClrObjectSquare -> pcb_clr_obj_square +ChangeObjectOctagon -> pcb_chg_obj_octagon +SetObjectOctagon -> pcb_set_obj_octagon +ClrObjectOctagon -> pcb_clr_obj_octagon +ChangeObjectName -> pcb_chg_obj_name +QueryInputAndChangeObjectName -> pcb_chg_obj_name_query +ChangeObjectPinnum -> pcb_chg_obj_pinnum +ChangeObjectRadius -> pcb_chg_obj_radius +ChangeObjectAngle -> pcb_chg_obj_angle +ChangeSelectedAngle -> pcb_chg_selected_angle +ChangeSelectedRadius -> pcb_chg_selected_radius Index: trunk/src/action_helper.c =================================================================== --- trunk/src/action_helper.c (revision 4847) +++ trunk/src/action_helper.c (revision 4848) @@ -604,7 +604,7 @@ 0, conf_core.design.via_drilling_hole, NULL, NoFlags())) != NULL) { AddObjectToCreateUndoList(PCB_TYPE_VIA, via, via, via); if (gui->shift_is_pressed()) - ChangeObjectThermal(PCB_TYPE_VIA, via, via, via, PCB->ThermStyle); + pcb_chg_obj_thermal(PCB_TYPE_VIA, via, via, via, PCB->ThermStyle); IncrementUndoSerialNumber(); DrawVia(via); Draw(); @@ -728,12 +728,12 @@ tstyle++; if (tstyle > 5) tstyle = 1; - ChangeObjectThermal(type, ptr1, ptr2, ptr3, tstyle); + pcb_chg_obj_thermal(type, ptr1, ptr2, ptr3, tstyle); } else if (GET_THERM(INDEXOFCURRENT, (pcb_pin_t *) ptr3)) - ChangeObjectThermal(type, ptr1, ptr2, ptr3, 0); + pcb_chg_obj_thermal(type, ptr1, ptr2, ptr3, 0); else - ChangeObjectThermal(type, ptr1, ptr2, ptr3, PCB->ThermStyle); + pcb_chg_obj_thermal(type, ptr1, ptr2, ptr3, PCB->ThermStyle); } break; } Index: trunk/src/change.c =================================================================== --- trunk/src/change.c (revision 4847) +++ trunk/src/change.c (revision 4848) @@ -352,7 +352,7 @@ * changes the thermals on all selected and visible pins * and/or vias. Returns pcb_true if anything has changed */ -pcb_bool ChangeSelectedThermals(int types, int therm_style) +pcb_bool pcb_chg_selected_thermals(int types, int therm_style) { pcb_bool change = pcb_false; pcb_opctx_t ctx; @@ -372,7 +372,7 @@ * changes the size of all selected and visible object types * returns pcb_true if anything has changed */ -pcb_bool ChangeSelectedSize(int types, pcb_coord_t Difference, pcb_bool fixIt) +pcb_bool pcb_chg_selected_size(int types, pcb_coord_t Difference, pcb_bool fixIt) { pcb_bool change = pcb_false; pcb_opctx_t ctx; @@ -394,7 +394,7 @@ * changes the clearance size of all selected and visible objects * returns pcb_true if anything has changed */ -pcb_bool ChangeSelectedClearSize(int types, pcb_coord_t Difference, pcb_bool fixIt) +pcb_bool pcb_chg_selected_clear_size(int types, pcb_coord_t Difference, pcb_bool fixIt) { pcb_bool change = pcb_false; pcb_opctx_t ctx; @@ -419,7 +419,7 @@ * changes the 2nd size (drilling hole) of all selected and visible objects * returns pcb_true if anything has changed */ -pcb_bool ChangeSelected2ndSize(int types, pcb_coord_t Difference, pcb_bool fixIt) +pcb_bool pcb_chg_selected_2nd_size(int types, pcb_coord_t Difference, pcb_bool fixIt) { pcb_bool change = pcb_false; pcb_opctx_t ctx; @@ -441,7 +441,7 @@ * changes the clearance flag (join) of all selected and visible lines * and/or arcs. Returns pcb_true if anything has changed */ -pcb_bool ChangeSelectedJoin(int types) +pcb_bool pcb_chg_selected_join(int types) { pcb_bool change = pcb_false; pcb_opctx_t ctx; @@ -460,7 +460,7 @@ * changes the clearance flag (join) of all selected and visible lines * and/or arcs. Returns pcb_true if anything has changed */ -pcb_bool SetSelectedJoin(int types) +pcb_bool pcb_set_selected_join(int types) { pcb_bool change = pcb_false; pcb_opctx_t ctx; @@ -479,7 +479,7 @@ * changes the clearance flag (join) of all selected and visible lines * and/or arcs. Returns pcb_true if anything has changed */ -pcb_bool ClrSelectedJoin(int types) +pcb_bool pcb_clr_selected_join(int types) { pcb_bool change = pcb_false; pcb_opctx_t ctx; @@ -498,7 +498,7 @@ * changes the nonetlist-flag of all selected and visible elements * returns pcb_true if anything has changed */ -pcb_bool ChangeSelectedNonetlist(int types) +pcb_bool pcb_chg_selected_nonetlist(int types) { pcb_bool change = pcb_false; pcb_opctx_t ctx; @@ -557,7 +557,7 @@ * changes the square-flag of all selected and visible pins or pads * returns pcb_true if anything has changed */ -pcb_bool ChangeSelectedSquare(int types) +pcb_bool pcb_chg_selected_square(int types) { pcb_bool change = pcb_false; pcb_opctx_t ctx; @@ -576,7 +576,7 @@ * changes the angle of all selected and visible object types * returns pcb_true if anything has changed */ -pcb_bool ChangeSelectedAngle(int types, int is_start, pcb_angle_t Difference, pcb_bool fixIt) +pcb_bool pcb_chg_selected_angle(int types, int is_start, pcb_angle_t Difference, pcb_bool fixIt) { pcb_bool change = pcb_false; pcb_opctx_t ctx; @@ -598,7 +598,7 @@ * changes the radius of all selected and visible object types * returns pcb_true if anything has changed */ -pcb_bool ChangeSelectedRadius(int types, int is_start, pcb_angle_t Difference, pcb_bool fixIt) +pcb_bool pcb_chg_selected_radius(int types, int is_start, pcb_angle_t Difference, pcb_bool fixIt) { pcb_bool change = pcb_false; pcb_opctx_t ctx; @@ -621,7 +621,7 @@ * sets the square-flag of all selected and visible pins or pads * returns pcb_true if anything has changed */ -pcb_bool SetSelectedSquare(int types) +pcb_bool pcb_set_selected_square(int types) { pcb_bool change = pcb_false; pcb_opctx_t ctx; @@ -640,7 +640,7 @@ * clears the square-flag of all selected and visible pins or pads * returns pcb_true if anything has changed */ -pcb_bool ClrSelectedSquare(int types) +pcb_bool pcb_clr_selected_square(int types) { pcb_bool change = pcb_false; pcb_opctx_t ctx; @@ -659,7 +659,7 @@ * changes the octagon-flag of all selected and visible pins and vias * returns pcb_true if anything has changed */ -pcb_bool ChangeSelectedOctagon(int types) +pcb_bool pcb_chg_selected_octagon(int types) { pcb_bool change = pcb_false; pcb_opctx_t ctx; @@ -678,7 +678,7 @@ * sets the octagon-flag of all selected and visible pins and vias * returns pcb_true if anything has changed */ -pcb_bool SetSelectedOctagon(int types) +pcb_bool pcb_set_selected_octagon(int types) { pcb_bool change = pcb_false; pcb_opctx_t ctx; @@ -697,7 +697,7 @@ * clears the octagon-flag of all selected and visible pins and vias * returns pcb_true if anything has changed */ -pcb_bool ClrSelectedOctagon(int types) +pcb_bool pcb_clr_selected_octagon(int types) { pcb_bool change = pcb_false; pcb_opctx_t ctx; @@ -716,7 +716,7 @@ * changes the hole-flag of all selected and visible vias * returns pcb_true if anything has changed */ -pcb_bool ChangeSelectedHole(void) +pcb_bool pcb_chg_selected_hole(void) { pcb_bool change = pcb_false; @@ -738,7 +738,7 @@ * changes the no paste-flag of all selected and visible pads * returns pcb_true if anything has changed */ -pcb_bool ChangeSelectedPaste(void) +pcb_bool pcb_chg_selected_paste(void) { pcb_bool change = pcb_false; @@ -760,7 +760,7 @@ * changes the size of the passed object; element size is silk size * Returns pcb_true if anything is changed */ -pcb_bool ChangeObjectSize(int Type, void *Ptr1, void *Ptr2, void *Ptr3, pcb_coord_t Difference, pcb_bool fixIt) +pcb_bool pcb_chg_obj_size(int Type, void *Ptr1, void *Ptr2, void *Ptr3, pcb_coord_t Difference, pcb_bool fixIt) { pcb_bool change; pcb_opctx_t ctx; @@ -782,7 +782,7 @@ * changes the size of the passed object; element size is pin ring sizes * Returns pcb_true if anything is changed */ -pcb_bool ChangeObject1stSize(int Type, void *Ptr1, void *Ptr2, void *Ptr3, pcb_coord_t Difference, pcb_bool fixIt) +pcb_bool pcb_chg_obj_1st_size(int Type, void *Ptr1, void *Ptr2, void *Ptr3, pcb_coord_t Difference, pcb_bool fixIt) { pcb_bool change; pcb_opctx_t ctx; @@ -804,7 +804,7 @@ * changes the radius of the passed object (e.g. arc width/height) * Returns pcb_true if anything is changed */ -pcb_bool ChangeObjectRadius(int Type, void *Ptr1, void *Ptr2, void *Ptr3, int is_x, pcb_coord_t r, pcb_bool fixIt) +pcb_bool pcb_chg_obj_radius(int Type, void *Ptr1, void *Ptr2, void *Ptr3, int is_x, pcb_coord_t r, pcb_bool fixIt) { pcb_bool change; pcb_opctx_t ctx; @@ -826,7 +826,7 @@ * changes the angles of the passed object (e.g. arc start/ctx->chgsize.delta) * Returns pcb_true if anything is changed */ -pcb_bool ChangeObjectAngle(int Type, void *Ptr1, void *Ptr2, void *Ptr3, int is_start, pcb_angle_t a, pcb_bool fixIt) +pcb_bool pcb_chg_obj_angle(int Type, void *Ptr1, void *Ptr2, void *Ptr3, int is_start, pcb_angle_t a, pcb_bool fixIt) { pcb_bool change; pcb_opctx_t ctx; @@ -849,7 +849,7 @@ * changes the clearance size of the passed object * Returns pcb_true if anything is changed */ -pcb_bool ChangeObjectClearSize(int Type, void *Ptr1, void *Ptr2, void *Ptr3, pcb_coord_t Difference, pcb_bool fixIt) +pcb_bool pcb_chg_obj_clear_size(int Type, void *Ptr1, void *Ptr2, void *Ptr3, pcb_coord_t Difference, pcb_bool fixIt) { pcb_bool change; pcb_opctx_t ctx; @@ -875,7 +875,7 @@ * Returns pcb_true if anything is changed * */ -pcb_bool ChangeObjectThermal(int Type, void *Ptr1, void *Ptr2, void *Ptr3, int therm_type) +pcb_bool pcb_chg_obj_thermal(int Type, void *Ptr1, void *Ptr2, void *Ptr3, int therm_type) { pcb_bool change; pcb_opctx_t ctx; @@ -895,7 +895,7 @@ * changes the 2nd size of the passed object * Returns pcb_true if anything is changed */ -pcb_bool ChangeObject2ndSize(int Type, void *Ptr1, void *Ptr2, void *Ptr3, pcb_coord_t Difference, pcb_bool fixIt, pcb_bool incundo) +pcb_bool pcb_chg_obj_2nd_size(int Type, void *Ptr1, void *Ptr2, void *Ptr3, pcb_coord_t Difference, pcb_bool fixIt, pcb_bool incundo) { pcb_bool change; pcb_opctx_t ctx; @@ -918,7 +918,7 @@ * changes the mask size of the passed object * Returns pcb_true if anything is changed */ -pcb_bool ChangeObjectMaskSize(int Type, void *Ptr1, void *Ptr2, void *Ptr3, pcb_coord_t Difference, pcb_bool fixIt) +pcb_bool pcb_chg_obj_mask_size(int Type, void *Ptr1, void *Ptr2, void *Ptr3, pcb_coord_t Difference, pcb_bool fixIt) { pcb_bool change; pcb_opctx_t ctx; @@ -943,7 +943,7 @@ * The allocated memory isn't freed because the old string is used * by the undo module. */ -void *ChangeObjectName(int Type, void *Ptr1, void *Ptr2, void *Ptr3, char *Name) +void *pcb_chg_obj_name(int Type, void *Ptr1, void *Ptr2, void *Ptr3, char *Name) { void *result; pcb_opctx_t ctx; @@ -963,7 +963,7 @@ * The allocated memory isn't freed because the old string is used * by the undo module. */ -void *ChangeObjectPinnum(int Type, void *Ptr1, void *Ptr2, void *Ptr3, char *Name) +void *pcb_chg_obj_pinnum(int Type, void *Ptr1, void *Ptr2, void *Ptr3, char *Name) { void *result; pcb_opctx_t ctx; @@ -980,7 +980,7 @@ * changes the clearance-flag of the passed object * Returns pcb_true if anything is changed */ -pcb_bool ChangeObjectJoin(int Type, void *Ptr1, void *Ptr2, void *Ptr3) +pcb_bool pcb_chg_obj_join(int Type, void *Ptr1, void *Ptr2, void *Ptr3) { pcb_opctx_t ctx; @@ -998,7 +998,7 @@ * sets the clearance-flag of the passed object * Returns pcb_true if anything is changed */ -pcb_bool SetObjectJoin(int Type, void *Ptr1, void *Ptr2, void *Ptr3) +pcb_bool pcb_set_obj_join(int Type, void *Ptr1, void *Ptr2, void *Ptr3) { pcb_opctx_t ctx; @@ -1016,7 +1016,7 @@ * clears the clearance-flag of the passed object * Returns pcb_true if anything is changed */ -pcb_bool ClrObjectJoin(int Type, void *Ptr1, void *Ptr2, void *Ptr3) +pcb_bool pcb_clr_obj_join(int Type, void *Ptr1, void *Ptr2, void *Ptr3) { pcb_opctx_t ctx; @@ -1034,7 +1034,7 @@ * changes the square-flag of the passed object * Returns pcb_true if anything is changed */ -pcb_bool ChangeObjectNonetlist(int Type, void *Ptr1, void *Ptr2, void *Ptr3) +pcb_bool pcb_chg_obj_nonetlist(int Type, void *Ptr1, void *Ptr2, void *Ptr3) { pcb_opctx_t ctx; @@ -1052,7 +1052,7 @@ * changes the square-flag of the passed object * Returns pcb_true if anything is changed */ -pcb_bool ChangeObjectSquare(int Type, void *Ptr1, void *Ptr2, void *Ptr3, int style) +pcb_bool pcb_chg_obj_square(int Type, void *Ptr1, void *Ptr2, void *Ptr3, int style) { pcb_opctx_t ctx; @@ -1071,7 +1071,7 @@ * sets the square-flag of the passed object * Returns pcb_true if anything is changed */ -pcb_bool SetObjectSquare(int Type, void *Ptr1, void *Ptr2, void *Ptr3) +pcb_bool pcb_set_obj_square(int Type, void *Ptr1, void *Ptr2, void *Ptr3) { pcb_opctx_t ctx; @@ -1089,7 +1089,7 @@ * clears the square-flag of the passed object * Returns pcb_true if anything is changed */ -pcb_bool ClrObjectSquare(int Type, void *Ptr1, void *Ptr2, void *Ptr3) +pcb_bool pcb_clr_obj_square(int Type, void *Ptr1, void *Ptr2, void *Ptr3) { pcb_opctx_t ctx; @@ -1107,7 +1107,7 @@ * changes the octagon-flag of the passed object * Returns pcb_true if anything is changed */ -pcb_bool ChangeObjectOctagon(int Type, void *Ptr1, void *Ptr2, void *Ptr3) +pcb_bool pcb_chg_obj_octagon(int Type, void *Ptr1, void *Ptr2, void *Ptr3) { pcb_opctx_t ctx; @@ -1125,7 +1125,7 @@ * sets the octagon-flag of the passed object * Returns pcb_true if anything is changed */ -pcb_bool SetObjectOctagon(int Type, void *Ptr1, void *Ptr2, void *Ptr3) +pcb_bool pcb_set_obj_octagon(int Type, void *Ptr1, void *Ptr2, void *Ptr3) { pcb_opctx_t ctx; @@ -1143,7 +1143,7 @@ * clears the octagon-flag of the passed object * Returns pcb_true if anything is changed */ -pcb_bool ClrObjectOctagon(int Type, void *Ptr1, void *Ptr2, void *Ptr3) +pcb_bool pcb_clr_obj_octagon(int Type, void *Ptr1, void *Ptr2, void *Ptr3) { pcb_opctx_t ctx; @@ -1163,7 +1163,7 @@ * The allocated memory isn't freed because the old string is used * by the undo module. */ -void *QueryInputAndChangeObjectName(int Type, void *Ptr1, void *Ptr2, void *Ptr3, int pinnum) +void *QueryInputAndpcb_chg_obj_name(int Type, void *Ptr1, void *Ptr2, void *Ptr3, int pinnum) { char *name = NULL; char msg[513]; @@ -1211,9 +1211,9 @@ /* NB: ChangeObjectName takes ownership of the passed memory */ char *old; if (pinnum) - old = (char *) ChangeObjectPinnum(Type, Ptr1, Ptr2, Ptr3, name); + old = (char *) pcb_chg_obj_pinnum(Type, Ptr1, Ptr2, Ptr3, name); else - old = (char *) ChangeObjectName(Type, Ptr1, Ptr2, Ptr3, name); + old = (char *) pcb_chg_obj_name(Type, Ptr1, Ptr2, Ptr3, name); if (old != (char *) -1) { if (pinnum) Index: trunk/src/change.h =================================================================== --- trunk/src/change.h (revision 4847) +++ trunk/src/change.h (revision 4848) @@ -66,46 +66,46 @@ #define CHANGEMASKSIZE_TYPES \ (PCB_TYPE_PIN | PCB_TYPE_VIA | PCB_TYPE_PAD) -pcb_bool ChangeSelectedSize(int, pcb_coord_t, pcb_bool); -pcb_bool ChangeSelectedClearSize(int, pcb_coord_t, pcb_bool); -pcb_bool ChangeSelected2ndSize(int, pcb_coord_t, pcb_bool); -pcb_bool ChangeSelectedMaskSize(int, pcb_coord_t, pcb_bool); -pcb_bool ChangeSelectedJoin(int); -pcb_bool SetSelectedJoin(int); -pcb_bool ClrSelectedJoin(int); -pcb_bool ChangeSelectedNonetlist(int); -pcb_bool ChangeSelectedSquare(int); -pcb_bool SetSelectedSquare(int); -pcb_bool ClrSelectedSquare(int); -pcb_bool ChangeSelectedThermals(int, int); -pcb_bool ChangeSelectedHole(void); -pcb_bool ChangeSelectedPaste(void); -pcb_bool ChangeSelectedOctagon(int); -pcb_bool SetSelectedOctagon(int); -pcb_bool ClrSelectedOctagon(int); -pcb_bool ChangeObjectSize(int, void *, void *, void *, pcb_coord_t, pcb_bool); -pcb_bool ChangeObject1stSize(int, void *, void *, void *, pcb_coord_t, pcb_bool); -pcb_bool ChangeObjectThermal(int, void *, void *, void *, int); -pcb_bool ChangeObjectClearSize(int, void *, void *, void *, pcb_coord_t, pcb_bool); -pcb_bool ChangeObject2ndSize(int, void *, void *, void *, pcb_coord_t, pcb_bool, pcb_bool); -pcb_bool ChangeObjectMaskSize(int, void *, void *, void *, pcb_coord_t, pcb_bool); -pcb_bool ChangeObjectJoin(int, void *, void *, void *); -pcb_bool SetObjectJoin(int, void *, void *, void *); -pcb_bool ClrObjectJoin(int, void *, void *, void *); -pcb_bool ChangeObjectNonetlist(int Type, void *Ptr1, void *Ptr2, void *Ptr3); -pcb_bool ChangeObjectSquare(int, void *, void *, void *, int); -pcb_bool SetObjectSquare(int, void *, void *, void *); -pcb_bool ClrObjectSquare(int, void *, void *, void *); -pcb_bool ChangeObjectOctagon(int, void *, void *, void *); -pcb_bool SetObjectOctagon(int, void *, void *, void *); -pcb_bool ClrObjectOctagon(int, void *, void *, void *); -void *ChangeObjectName(int, void *, void *, void *, char *); -void *QueryInputAndChangeObjectName(int, void *, void *, void *, int); +pcb_bool pcb_chg_selected_size(int, pcb_coord_t, pcb_bool); +pcb_bool pcb_chg_selected_clear_size(int, pcb_coord_t, pcb_bool); +pcb_bool pcb_chg_selected_2nd_size(int, pcb_coord_t, pcb_bool); +pcb_bool pcb_chg_selected_mask_size(int, pcb_coord_t, pcb_bool); +pcb_bool pcb_chg_selected_join(int); +pcb_bool pcb_set_selected_join(int); +pcb_bool pcb_clr_selected_join(int); +pcb_bool pcb_chg_selected_nonetlist(int); +pcb_bool pcb_chg_selected_square(int); +pcb_bool pcb_set_selected_square(int); +pcb_bool pcb_clr_selected_square(int); +pcb_bool pcb_chg_selected_thermals(int, int); +pcb_bool pcb_chg_selected_hole(void); +pcb_bool pcb_chg_selected_paste(void); +pcb_bool pcb_chg_selected_octagon(int); +pcb_bool pcb_set_selected_octagon(int); +pcb_bool pcb_clr_selected_octagon(int); +pcb_bool pcb_chg_obj_size(int, void *, void *, void *, pcb_coord_t, pcb_bool); +pcb_bool pcb_chg_obj_1st_size(int, void *, void *, void *, pcb_coord_t, pcb_bool); +pcb_bool pcb_chg_obj_thermal(int, void *, void *, void *, int); +pcb_bool pcb_chg_obj_clear_size(int, void *, void *, void *, pcb_coord_t, pcb_bool); +pcb_bool pcb_chg_obj_2nd_size(int, void *, void *, void *, pcb_coord_t, pcb_bool, pcb_bool); +pcb_bool pcb_chg_obj_mask_size(int, void *, void *, void *, pcb_coord_t, pcb_bool); +pcb_bool pcb_chg_obj_join(int, void *, void *, void *); +pcb_bool pcb_set_obj_join(int, void *, void *, void *); +pcb_bool pcb_clr_obj_join(int, void *, void *, void *); +pcb_bool pcb_chg_obj_nonetlist(int Type, void *Ptr1, void *Ptr2, void *Ptr3); +pcb_bool pcb_chg_obj_square(int, void *, void *, void *, int); +pcb_bool pcb_set_obj_square(int, void *, void *, void *); +pcb_bool pcb_clr_obj_square(int, void *, void *, void *); +pcb_bool pcb_chg_obj_octagon(int, void *, void *, void *); +pcb_bool pcb_set_obj_octagon(int, void *, void *, void *); +pcb_bool pcb_clr_obj_octagon(int, void *, void *, void *); +void *pcb_chg_obj_name(int, void *, void *, void *, char *); +void *QueryInputAndpcb_chg_obj_name(int, void *, void *, void *, int); void ChangePCBSize(pcb_coord_t, pcb_coord_t); -void *ChangeObjectPinnum(int Type, void *Ptr1, void *Ptr2, void *Ptr3, char *Name); -pcb_bool ChangeObjectRadius(int Type, void *Ptr1, void *Ptr2, void *Ptr3, int is_x, pcb_coord_t r, pcb_bool absolute); -pcb_bool ChangeObjectAngle(int Type, void *Ptr1, void *Ptr2, void *Ptr3, int is_start, pcb_angle_t a, pcb_bool absolute); -pcb_bool ChangeSelectedAngle(int types, int is_start, pcb_angle_t Difference, pcb_bool fixIt); -pcb_bool ChangeSelectedRadius(int types, int is_start, pcb_angle_t Difference, pcb_bool fixIt); +void *pcb_chg_obj_pinnum(int Type, void *Ptr1, void *Ptr2, void *Ptr3, char *Name); +pcb_bool pcb_chg_obj_radius(int Type, void *Ptr1, void *Ptr2, void *Ptr3, int is_x, pcb_coord_t r, pcb_bool absolute); +pcb_bool pcb_chg_obj_angle(int Type, void *Ptr1, void *Ptr2, void *Ptr3, int is_start, pcb_angle_t a, pcb_bool absolute); +pcb_bool pcb_chg_selected_angle(int types, int is_start, pcb_angle_t Difference, pcb_bool fixIt); +pcb_bool pcb_chg_selected_radius(int types, int is_start, pcb_angle_t Difference, pcb_bool fixIt); #endif Index: trunk/src/change_act.c =================================================================== --- trunk/src/change_act.c (revision 4847) +++ trunk/src/change_act.c (revision 4848) @@ -99,33 +99,33 @@ case F_Object: { if (type != PCB_TYPE_NONE) - if (ChangeObjectClearSize(type, ptr1, ptr2, ptr3, value, absolute)) + if (pcb_chg_obj_clear_size(type, ptr1, ptr2, ptr3, value, absolute)) SetChangedFlag(pcb_true); break; } case F_SelectedVias: - if (ChangeSelectedClearSize(PCB_TYPE_VIA, value, absolute)) + if (pcb_chg_selected_clear_size(PCB_TYPE_VIA, value, absolute)) SetChangedFlag(pcb_true); break; case F_SelectedPads: - if (ChangeSelectedClearSize(PCB_TYPE_PAD, value, absolute)) + if (pcb_chg_selected_clear_size(PCB_TYPE_PAD, value, absolute)) SetChangedFlag(pcb_true); break; case F_SelectedPins: - if (ChangeSelectedClearSize(PCB_TYPE_PIN, value, absolute)) + if (pcb_chg_selected_clear_size(PCB_TYPE_PIN, value, absolute)) SetChangedFlag(pcb_true); break; case F_SelectedLines: - if (ChangeSelectedClearSize(PCB_TYPE_LINE, value, absolute)) + if (pcb_chg_selected_clear_size(PCB_TYPE_LINE, value, absolute)) SetChangedFlag(pcb_true); break; case F_SelectedArcs: - if (ChangeSelectedClearSize(PCB_TYPE_ARC, value, absolute)) + if (pcb_chg_selected_clear_size(PCB_TYPE_ARC, value, absolute)) SetChangedFlag(pcb_true); break; case F_Selected: case F_SelectedObjects: - if (ChangeSelectedClearSize(CHANGECLEARSIZE_TYPES, value, absolute)) + if (pcb_chg_selected_clear_size(CHANGECLEARSIZE_TYPES, value, absolute)) SetChangedFlag(pcb_true); break; } @@ -172,18 +172,18 @@ pcb_bool(*set_selected) (int); if (NSTRCMP(flag_name, "square") == 0) { - set_object = value ? SetObjectSquare : ClrObjectSquare; - set_selected = value ? SetSelectedSquare : ClrSelectedSquare; + set_object = value ? pcb_set_obj_square : pcb_clr_obj_square; + set_selected = value ? pcb_set_selected_square : pcb_clr_selected_square; } else if (NSTRCMP(flag_name, "octagon") == 0) { - set_object = value ? SetObjectOctagon : ClrObjectOctagon; - set_selected = value ? SetSelectedOctagon : ClrSelectedOctagon; + set_object = value ? pcb_set_obj_octagon : pcb_clr_obj_octagon; + set_selected = value ? pcb_set_selected_octagon : pcb_clr_selected_octagon; } else if (NSTRCMP(flag_name, "join") == 0) { /* Note: these are backwards, because the flag is "clear" but the command is "join". */ - set_object = value ? ClrObjectJoin : SetObjectJoin; - set_selected = value ? ClrSelectedJoin : SetSelectedJoin; + set_object = value ? pcb_clr_obj_join : pcb_set_obj_join; + set_selected = value ? pcb_clr_selected_join : pcb_set_selected_join; } else { Message(PCB_MSG_DEFAULT, _("%s(): Flag \"%s\" is not valid\n"), cmd_name, flag_name); @@ -279,7 +279,7 @@ case F_SelectedVias: case F_Selected: - if (ChangeSelectedHole()) + if (pcb_chg_selected_hole()) SetChangedFlag(pcb_true); break; } @@ -321,7 +321,7 @@ case F_SelectedPads: case F_Selected: - if (ChangeSelectedPaste()) + if (pcb_chg_selected_paste()) SetChangedFlag(pcb_true); break; } @@ -412,58 +412,58 @@ if (TEST_FLAG(PCB_FLAG_LOCK, (pcb_pin_t *) ptr2)) Message(PCB_MSG_DEFAULT, _("Sorry, the object is locked\n")); if (tostyle) { - if (ChangeObject1stSize(type, ptr1, ptr2, ptr3, value, absolute)) + if (pcb_chg_obj_1st_size(type, ptr1, ptr2, ptr3, value, absolute)) SetChangedFlag(pcb_true); } else { - if (ChangeObjectSize(type, ptr1, ptr2, ptr3, value, absolute)) + if (pcb_chg_obj_size(type, ptr1, ptr2, ptr3, value, absolute)) SetChangedFlag(pcb_true); } break; } case F_SelectedVias: - if (ChangeSelectedSize(PCB_TYPE_VIA, value, absolute)) + if (pcb_chg_selected_size(PCB_TYPE_VIA, value, absolute)) SetChangedFlag(pcb_true); break; case F_SelectedPins: - if (ChangeSelectedSize(PCB_TYPE_PIN, value, absolute)) + if (pcb_chg_selected_size(PCB_TYPE_PIN, value, absolute)) SetChangedFlag(pcb_true); break; case F_SelectedPads: - if (ChangeSelectedSize(PCB_TYPE_PAD, value, absolute)) + if (pcb_chg_selected_size(PCB_TYPE_PAD, value, absolute)) SetChangedFlag(pcb_true); break; case F_SelectedArcs: - if (ChangeSelectedSize(PCB_TYPE_ARC, value, absolute)) + if (pcb_chg_selected_size(PCB_TYPE_ARC, value, absolute)) SetChangedFlag(pcb_true); break; case F_SelectedLines: - if (ChangeSelectedSize(PCB_TYPE_LINE, value, absolute)) + if (pcb_chg_selected_size(PCB_TYPE_LINE, value, absolute)) SetChangedFlag(pcb_true); break; case F_SelectedTexts: - if (ChangeSelectedSize(PCB_TYPE_TEXT, value, absolute)) + if (pcb_chg_selected_size(PCB_TYPE_TEXT, value, absolute)) SetChangedFlag(pcb_true); break; case F_SelectedNames: - if (ChangeSelectedSize(PCB_TYPE_ELEMENT_NAME, value, absolute)) + if (pcb_chg_selected_size(PCB_TYPE_ELEMENT_NAME, value, absolute)) SetChangedFlag(pcb_true); break; case F_SelectedElements: - if (ChangeSelectedSize(PCB_TYPE_ELEMENT, value, absolute)) + if (pcb_chg_selected_size(PCB_TYPE_ELEMENT, value, absolute)) SetChangedFlag(pcb_true); break; case F_Selected: case F_SelectedObjects: - if (ChangeSelectedSize(CHANGESIZE_TYPES, value, absolute)) + if (pcb_chg_selected_size(CHANGESIZE_TYPES, value, absolute)) SetChangedFlag(pcb_true); break; } @@ -514,23 +514,23 @@ { if (type != PCB_TYPE_NONE) - if (ChangeObject2ndSize(type, ptr1, ptr2, ptr3, value, absolute, pcb_true)) + if (pcb_chg_obj_2nd_size(type, ptr1, ptr2, ptr3, value, absolute, pcb_true)) SetChangedFlag(pcb_true); break; } case F_SelectedVias: - if (ChangeSelected2ndSize(PCB_TYPE_VIA, value, absolute)) + if (pcb_chg_selected_2nd_size(PCB_TYPE_VIA, value, absolute)) SetChangedFlag(pcb_true); break; case F_SelectedPins: - if (ChangeSelected2ndSize(PCB_TYPE_PIN, value, absolute)) + if (pcb_chg_selected_2nd_size(PCB_TYPE_PIN, value, absolute)) SetChangedFlag(pcb_true); break; case F_Selected: case F_SelectedObjects: - if (ChangeSelected2ndSize(PCB_TYPEMASK_PIN, value, absolute)) + if (pcb_chg_selected_2nd_size(PCB_TYPEMASK_PIN, value, absolute)) SetChangedFlag(pcb_true); break; } @@ -665,7 +665,7 @@ pinnum = 1; else pinnum = 0; - if (QueryInputAndChangeObjectName(type, ptr1, ptr2, ptr3, pinnum)) { + if (QueryInputAndpcb_chg_obj_name(type, ptr1, ptr2, ptr3, pinnum)) { SetChangedFlag(pcb_true); if (type == PCB_TYPE_ELEMENT) { pcb_rubberband_t *ptr; @@ -737,24 +737,24 @@ gui->get_coords(_("Select an Object"), &x, &y); if ((type = SearchScreen(x, y, CHANGEJOIN_TYPES, &ptr1, &ptr2, &ptr3)) != PCB_TYPE_NONE) - if (ChangeObjectJoin(type, ptr1, ptr2, ptr3)) + if (pcb_chg_obj_join(type, ptr1, ptr2, ptr3)) SetChangedFlag(pcb_true); break; } case F_SelectedLines: - if (ChangeSelectedJoin(PCB_TYPE_LINE)) + if (pcb_chg_selected_join(PCB_TYPE_LINE)) SetChangedFlag(pcb_true); break; case F_SelectedArcs: - if (ChangeSelectedJoin(PCB_TYPE_ARC)) + if (pcb_chg_selected_join(PCB_TYPE_ARC)) SetChangedFlag(pcb_true); break; case F_Selected: case F_SelectedObjects: - if (ChangeSelectedJoin(CHANGEJOIN_TYPES)) + if (pcb_chg_selected_join(CHANGEJOIN_TYPES)) SetChangedFlag(pcb_true); break; } @@ -792,7 +792,7 @@ ptr3 = NULL; type = SearchScreen(x, y, CHANGENONETLIST_TYPES, &ptr1, &ptr2, &ptr3); - if (ChangeObjectNonetlist(type, ptr1, ptr2, ptr3)) + if (pcb_chg_obj_nonetlist(type, ptr1, ptr2, ptr3)) SetChangedFlag(pcb_true); break; } @@ -799,7 +799,7 @@ case F_SelectedElements: case F_Selected: case F_SelectedObjects: - if (ChangeSelectedNonetlist(PCB_TYPE_ELEMENT)) + if (pcb_chg_selected_nonetlist(PCB_TYPE_ELEMENT)) SetChangedFlag(pcb_true); break; } @@ -845,7 +845,7 @@ if (qstyle > 17) qstyle = 0; if (type != PCB_TYPE_NONE) - if (ChangeObjectSquare(type, ptr1, ptr2, ptr3, qstyle)) + if (pcb_chg_obj_square(type, ptr1, ptr2, ptr3, qstyle)) SetChangedFlag(pcb_true); } break; @@ -852,18 +852,18 @@ } case F_SelectedElements: - if (ChangeSelectedSquare(PCB_TYPE_ELEMENT)) + if (pcb_chg_selected_square(PCB_TYPE_ELEMENT)) SetChangedFlag(pcb_true); break; case F_SelectedPins: - if (ChangeSelectedSquare(PCB_TYPE_PIN | PCB_TYPE_PAD)) + if (pcb_chg_selected_square(PCB_TYPE_PIN | PCB_TYPE_PAD)) SetChangedFlag(pcb_true); break; case F_Selected: case F_SelectedObjects: - if (ChangeSelectedSquare(PCB_TYPE_PIN | PCB_TYPE_PAD)) + if (pcb_chg_selected_square(PCB_TYPE_PIN | PCB_TYPE_PAD)) SetChangedFlag(pcb_true); break; } @@ -898,24 +898,24 @@ gui->get_coords(_("Select an Object"), &x, &y); if ((type = SearchScreen(x, y, CHANGESQUARE_TYPES, &ptr1, &ptr2, &ptr3)) != PCB_TYPE_NONE) - if (SetObjectSquare(type, ptr1, ptr2, ptr3)) + if (pcb_set_obj_square(type, ptr1, ptr2, ptr3)) SetChangedFlag(pcb_true); break; } case F_SelectedElements: - if (SetSelectedSquare(PCB_TYPE_ELEMENT)) + if (pcb_set_selected_square(PCB_TYPE_ELEMENT)) SetChangedFlag(pcb_true); break; case F_SelectedPins: - if (SetSelectedSquare(PCB_TYPE_PIN | PCB_TYPE_PAD)) + if (pcb_set_selected_square(PCB_TYPE_PIN | PCB_TYPE_PAD)) SetChangedFlag(pcb_true); break; case F_Selected: case F_SelectedObjects: - if (SetSelectedSquare(PCB_TYPE_PIN | PCB_TYPE_PAD)) + if (pcb_set_selected_square(PCB_TYPE_PIN | PCB_TYPE_PAD)) SetChangedFlag(pcb_true); break; } @@ -950,24 +950,24 @@ gui->get_coords(_("Select an Object"), &x, &y); if ((type = SearchScreen(x, y, CHANGESQUARE_TYPES, &ptr1, &ptr2, &ptr3)) != PCB_TYPE_NONE) - if (ClrObjectSquare(type, ptr1, ptr2, ptr3)) + if (pcb_clr_obj_square(type, ptr1, ptr2, ptr3)) SetChangedFlag(pcb_true); break; } case F_SelectedElements: - if (ClrSelectedSquare(PCB_TYPE_ELEMENT)) + if (pcb_clr_selected_square(PCB_TYPE_ELEMENT)) SetChangedFlag(pcb_true); break; case F_SelectedPins: - if (ClrSelectedSquare(PCB_TYPE_PIN | PCB_TYPE_PAD)) + if (pcb_clr_selected_square(PCB_TYPE_PIN | PCB_TYPE_PAD)) SetChangedFlag(pcb_true); break; case F_Selected: case F_SelectedObjects: - if (ClrSelectedSquare(PCB_TYPE_PIN | PCB_TYPE_PAD)) + if (pcb_clr_selected_square(PCB_TYPE_PIN | PCB_TYPE_PAD)) SetChangedFlag(pcb_true); break; } @@ -1001,29 +1001,29 @@ gui->get_coords(_("Select an Object"), &x, &y); if ((type = SearchScreen(x, y, CHANGEOCTAGON_TYPES, &ptr1, &ptr2, &ptr3)) != PCB_TYPE_NONE) - if (ChangeObjectOctagon(type, ptr1, ptr2, ptr3)) + if (pcb_chg_obj_octagon(type, ptr1, ptr2, ptr3)) SetChangedFlag(pcb_true); break; } case F_SelectedElements: - if (ChangeSelectedOctagon(PCB_TYPE_ELEMENT)) + if (pcb_chg_selected_octagon(PCB_TYPE_ELEMENT)) SetChangedFlag(pcb_true); break; case F_SelectedPins: - if (ChangeSelectedOctagon(PCB_TYPE_PIN)) + if (pcb_chg_selected_octagon(PCB_TYPE_PIN)) SetChangedFlag(pcb_true); break; case F_SelectedVias: - if (ChangeSelectedOctagon(PCB_TYPE_VIA)) + if (pcb_chg_selected_octagon(PCB_TYPE_VIA)) SetChangedFlag(pcb_true); break; case F_Selected: case F_SelectedObjects: - if (ChangeSelectedOctagon(PCB_TYPEMASK_PIN)) + if (pcb_chg_selected_octagon(PCB_TYPEMASK_PIN)) SetChangedFlag(pcb_true); break; } @@ -1056,29 +1056,29 @@ gui->get_coords(_("Select an Object"), &x, &y); if ((type = SearchScreen(x, y, CHANGEOCTAGON_TYPES, &ptr1, &ptr2, &ptr3)) != PCB_TYPE_NONE) - if (SetObjectOctagon(type, ptr1, ptr2, ptr3)) + if (pcb_set_obj_octagon(type, ptr1, ptr2, ptr3)) SetChangedFlag(pcb_true); break; } case F_SelectedElements: - if (SetSelectedOctagon(PCB_TYPE_ELEMENT)) + if (pcb_set_selected_octagon(PCB_TYPE_ELEMENT)) SetChangedFlag(pcb_true); break; case F_SelectedPins: - if (SetSelectedOctagon(PCB_TYPE_PIN)) + if (pcb_set_selected_octagon(PCB_TYPE_PIN)) SetChangedFlag(pcb_true); break; case F_SelectedVias: - if (SetSelectedOctagon(PCB_TYPE_VIA)) + if (pcb_set_selected_octagon(PCB_TYPE_VIA)) SetChangedFlag(pcb_true); break; case F_Selected: case F_SelectedObjects: - if (SetSelectedOctagon(PCB_TYPEMASK_PIN)) + if (pcb_set_selected_octagon(PCB_TYPEMASK_PIN)) SetChangedFlag(pcb_true); break; } @@ -1112,29 +1112,29 @@ gui->get_coords(_("Select an Object"), &x, &y); if ((type = SearchScreen(Crosshair.X, Crosshair.Y, CHANGEOCTAGON_TYPES, &ptr1, &ptr2, &ptr3)) != PCB_TYPE_NONE) - if (ClrObjectOctagon(type, ptr1, ptr2, ptr3)) + if (pcb_clr_obj_octagon(type, ptr1, ptr2, ptr3)) SetChangedFlag(pcb_true); break; } case F_SelectedElements: - if (ClrSelectedOctagon(PCB_TYPE_ELEMENT)) + if (pcb_clr_selected_octagon(PCB_TYPE_ELEMENT)) SetChangedFlag(pcb_true); break; case F_SelectedPins: - if (ClrSelectedOctagon(PCB_TYPE_PIN)) + if (pcb_clr_selected_octagon(PCB_TYPE_PIN)) SetChangedFlag(pcb_true); break; case F_SelectedVias: - if (ClrSelectedOctagon(PCB_TYPE_VIA)) + if (pcb_clr_selected_octagon(PCB_TYPE_VIA)) SetChangedFlag(pcb_true); break; case F_Selected: case F_SelectedObjects: - if (ClrSelectedOctagon(PCB_TYPEMASK_PIN)) + if (pcb_clr_selected_octagon(PCB_TYPEMASK_PIN)) SetChangedFlag(pcb_true); break; } @@ -1188,20 +1188,20 @@ switch (funchash_get(function, NULL)) { case F_Object: if ((type = SearchScreen(Crosshair.X, Crosshair.Y, CHANGETHERMAL_TYPES, &ptr1, &ptr2, &ptr3)) != PCB_TYPE_NONE) { - ChangeObjectThermal(type, ptr1, ptr2, ptr3, kind); + pcb_chg_obj_thermal(type, ptr1, ptr2, ptr3, kind); IncrementUndoSerialNumber(); Draw(); } break; case F_SelectedPins: - ChangeSelectedThermals(PCB_TYPE_PIN, kind); + pcb_chg_selected_thermals(PCB_TYPE_PIN, kind); break; case F_SelectedVias: - ChangeSelectedThermals(PCB_TYPE_VIA, kind); + pcb_chg_selected_thermals(PCB_TYPE_VIA, kind); break; case F_Selected: case F_SelectedElements: - ChangeSelectedThermals(CHANGETHERMAL_TYPES, kind); + pcb_chg_selected_thermals(CHANGETHERMAL_TYPES, kind); break; default: err = 1; @@ -1416,7 +1416,7 @@ if (TEST_FLAG(PCB_FLAG_LOCK, (pcb_pin_t *) ptr2)) Message(PCB_MSG_DEFAULT, _("Sorry, the object is locked\n")); else { - if (ChangeObjectAngle(type, ptr1, ptr2, ptr3, which, value, absolute)) + if (pcb_chg_obj_angle(type, ptr1, ptr2, ptr3, which, value, absolute)) SetChangedFlag(pcb_true); } } @@ -1424,13 +1424,13 @@ } case F_SelectedArcs: - if (ChangeSelectedAngle(PCB_TYPE_ARC, which, value, absolute)) + if (pcb_chg_selected_angle(PCB_TYPE_ARC, which, value, absolute)) SetChangedFlag(pcb_true); break; case F_Selected: case F_SelectedObjects: - if (ChangeSelectedAngle(CHANGESIZE_TYPES, which, value, absolute)) + if (pcb_chg_selected_angle(CHANGESIZE_TYPES, which, value, absolute)) SetChangedFlag(pcb_true); break; } @@ -1479,7 +1479,7 @@ if (TEST_FLAG(PCB_FLAG_LOCK, (pcb_pin_t *) ptr2)) Message(PCB_MSG_DEFAULT, _("Sorry, the object is locked\n")); else { - if (ChangeObjectRadius(type, ptr1, ptr2, ptr3, which, value, absolute)) + if (pcb_chg_obj_radius(type, ptr1, ptr2, ptr3, which, value, absolute)) SetChangedFlag(pcb_true); } } @@ -1487,13 +1487,13 @@ } case F_SelectedArcs: - if (ChangeSelectedRadius(PCB_TYPE_ARC, which, value, absolute)) + if (pcb_chg_selected_radius(PCB_TYPE_ARC, which, value, absolute)) SetChangedFlag(pcb_true); break; case F_Selected: case F_SelectedObjects: - if (ChangeSelectedRadius(CHANGESIZE_TYPES, which, value, absolute)) + if (pcb_chg_selected_radius(CHANGESIZE_TYPES, which, value, absolute)) SetChangedFlag(pcb_true); break; } Index: trunk/src/object_act.c =================================================================== --- trunk/src/object_act.c (revision 4847) +++ trunk/src/object_act.c (revision 4848) @@ -855,7 +855,7 @@ if (!TEST_FLAGS(flags, pin)) continue; if (pin->Mask < pin->Thickness + value) { - ChangeObjectMaskSize(PCB_TYPE_PIN, element, pin, 0, pin->Thickness + value, 1); + pcb_chg_obj_mask_size(PCB_TYPE_PIN, element, pin, 0, pin->Thickness + value, 1); RestoreUndoSerialNumber(); } } @@ -865,7 +865,7 @@ if (!TEST_FLAGS(flags, pad)) continue; if (pad->Mask < pad->Thickness + value) { - ChangeObjectMaskSize(PCB_TYPE_PAD, element, pad, 0, pad->Thickness + value, 1); + pcb_chg_obj_mask_size(PCB_TYPE_PAD, element, pad, 0, pad->Thickness + value, 1); RestoreUndoSerialNumber(); } } @@ -877,7 +877,7 @@ if (!TEST_FLAGS(flags, via)) continue; if (via->Mask && via->Mask < via->Thickness + value) { - ChangeObjectMaskSize(PCB_TYPE_VIA, via, 0, 0, via->Thickness + value, 1); + pcb_chg_obj_mask_size(PCB_TYPE_VIA, via, 0, 0, via->Thickness + value, 1); RestoreUndoSerialNumber(); } } @@ -929,7 +929,7 @@ if (!TEST_FLAGS(flags, pin)) continue; if (pin->Clearance < value) { - ChangeObjectClearSize(PCB_TYPE_PIN, element, pin, 0, value, 1); + pcb_chg_obj_clear_size(PCB_TYPE_PIN, element, pin, 0, value, 1); RestoreUndoSerialNumber(); } } @@ -939,7 +939,7 @@ if (!TEST_FLAGS(flags, pad)) continue; if (pad->Clearance < value) { - ChangeObjectClearSize(PCB_TYPE_PAD, element, pad, 0, value, 1); + pcb_chg_obj_clear_size(PCB_TYPE_PAD, element, pad, 0, value, 1); RestoreUndoSerialNumber(); } } @@ -951,7 +951,7 @@ if (!TEST_FLAGS(flags, via)) continue; if (via->Clearance < value) { - ChangeObjectClearSize(PCB_TYPE_VIA, via, 0, 0, value, 1); + pcb_chg_obj_clear_size(PCB_TYPE_VIA, via, 0, 0, value, 1); RestoreUndoSerialNumber(); } } @@ -961,7 +961,7 @@ if (!TEST_FLAGS(flags, line)) continue; if (line->Clearance < value) { - ChangeObjectClearSize(PCB_TYPE_LINE, layer, line, 0, value, 1); + pcb_chg_obj_clear_size(PCB_TYPE_LINE, layer, line, 0, value, 1); RestoreUndoSerialNumber(); } } @@ -971,7 +971,7 @@ if (!TEST_FLAGS(flags, arc)) continue; if (arc->Clearance < value) { - ChangeObjectClearSize(PCB_TYPE_ARC, layer, arc, 0, value, 1); + pcb_chg_obj_clear_size(PCB_TYPE_ARC, layer, arc, 0, value, 1); RestoreUndoSerialNumber(); } } Index: trunk/src/undo.c =================================================================== --- trunk/src/undo.c (revision 4847) +++ trunk/src/undo.c (revision 4848) @@ -308,7 +308,7 @@ /* lookup entry by it's ID */ type = SearchObjectByID(PCB->Data, &ptr1, &ptr2, &ptr3, Entry->ID, Entry->Kind); if (type != PCB_TYPE_NONE) { - Entry->Data.ChangeName.Name = (char *) (ChangeObjectName(type, ptr1, ptr2, ptr3, Entry->Data.ChangeName.Name)); + Entry->Data.ChangeName.Name = (char *) (pcb_chg_obj_name(type, ptr1, ptr2, ptr3, Entry->Data.ChangeName.Name)); return (pcb_true); } return (pcb_false); @@ -326,7 +326,7 @@ /* lookup entry by it's ID */ type = SearchObjectByID(PCB->Data, &ptr1, &ptr2, &ptr3, Entry->ID, Entry->Kind); if (type != PCB_TYPE_NONE) { - Entry->Data.ChangeName.Name = (char *) (ChangeObjectPinnum(type, ptr1, ptr2, ptr3, Entry->Data.ChangeName.Name)); + Entry->Data.ChangeName.Name = (char *) (pcb_chg_obj_pinnum(type, ptr1, ptr2, ptr3, Entry->Data.ChangeName.Name)); return (pcb_true); } return (pcb_false); Index: trunk/src_plugins/propedit/propsel.c =================================================================== --- trunk/src_plugins/propedit/propsel.c (revision 4847) +++ trunk/src_plugins/propedit/propsel.c (revision 4848) @@ -229,10 +229,10 @@ } if (st->is_trace && st->c_valid && (strcmp(pn, "thickness") == 0) && - ChangeObject1stSize(PCB_TYPE_LINE, layer, line, NULL, st->c, st->c_absolute)) DONE; + pcb_chg_obj_1st_size(PCB_TYPE_LINE, layer, line, NULL, st->c, st->c_absolute)) DONE; if (st->is_trace && st->c_valid && (strcmp(pn, "clearance") == 0) && - ChangeObjectClearSize(PCB_TYPE_LINE, layer, line, NULL, st->c, st->c_absolute)) DONE; + pcb_chg_obj_clear_size(PCB_TYPE_LINE, layer, line, NULL, st->c, st->c_absolute)) DONE; } static void set_arc_cb(void *ctx, pcb_board_t *pcb, pcb_layer_t *layer, pcb_arc_t *arc) @@ -248,24 +248,24 @@ } if (st->is_trace && st->c_valid && (strcmp(pn, "thickness") == 0) && - ChangeObject1stSize(PCB_TYPE_ARC, layer, arc, NULL, st->c, st->c_absolute)) DONE; + pcb_chg_obj_1st_size(PCB_TYPE_ARC, layer, arc, NULL, st->c, st->c_absolute)) DONE; if (st->is_trace && st->c_valid && (strcmp(pn, "clearance") == 0) && - ChangeObjectClearSize(PCB_TYPE_ARC, layer, arc, NULL, st->c, st->c_absolute)) DONE; + pcb_chg_obj_clear_size(PCB_TYPE_ARC, layer, arc, NULL, st->c, st->c_absolute)) DONE; pn = st->name + 6; if (!st->is_trace && st->c_valid && (strcmp(pn, "width") == 0) && - ChangeObjectRadius(PCB_TYPE_ARC, layer, arc, NULL, 0, st->c, st->c_absolute)) DONE; + pcb_chg_obj_radius(PCB_TYPE_ARC, layer, arc, NULL, 0, st->c, st->c_absolute)) DONE; if (!st->is_trace && st->c_valid && (strcmp(pn, "height") == 0) && - ChangeObjectRadius(PCB_TYPE_ARC, layer, arc, NULL, 1, st->c, st->c_absolute)) DONE; + pcb_chg_obj_radius(PCB_TYPE_ARC, layer, arc, NULL, 1, st->c, st->c_absolute)) DONE; if (!st->is_trace && st->d_valid && (strcmp(pn, "angle/start") == 0) && - ChangeObjectAngle(PCB_TYPE_ARC, layer, arc, NULL, 0, st->d, st->d_absolute)) DONE; + pcb_chg_obj_angle(PCB_TYPE_ARC, layer, arc, NULL, 0, st->d, st->d_absolute)) DONE; if (!st->is_trace && st->d_valid && (strcmp(pn, "angle/delta") == 0) && - ChangeObjectAngle(PCB_TYPE_ARC, layer, arc, NULL, 1, st->d, st->d_absolute)) DONE; + pcb_chg_obj_angle(PCB_TYPE_ARC, layer, arc, NULL, 1, st->d, st->d_absolute)) DONE; } static void set_text_cb_any(void *ctx, pcb_board_t *pcb, int type, void *layer_or_element, pcb_text_t *text) @@ -282,10 +282,10 @@ } if (st->d_valid && (strcmp(pn, "scale") == 0) && - ChangeObjectSize(type, layer_or_element, text, text, PCB_MIL_TO_COORD(st->d), st->d_absolute)) DONE; + pcb_chg_obj_size(type, layer_or_element, text, text, PCB_MIL_TO_COORD(st->d), st->d_absolute)) DONE; if ((strcmp(pn, "string") == 0) && - (old = ChangeObjectName(type, layer_or_element, text, NULL, pcb_strdup(st->value)))) { + (old = pcb_chg_obj_name(type, layer_or_element, text, NULL, pcb_strdup(st->value)))) { free(old); DONE; } @@ -365,16 +365,16 @@ } if (st->c_valid && (strcmp(pn, "thickness") == 0) && - ChangeObject1stSize(PCB_TYPE_PIN, pin->Element, pin, NULL, st->c, st->c_absolute)) DONE; + pcb_chg_obj_1st_size(PCB_TYPE_PIN, pin->Element, pin, NULL, st->c, st->c_absolute)) DONE; if (st->c_valid && (strcmp(pn, "clearance") == 0) && - ChangeObjectClearSize(PCB_TYPE_PIN, pin->Element, pin, NULL, st->c, st->c_absolute)) DONE; + pcb_chg_obj_clear_size(PCB_TYPE_PIN, pin->Element, pin, NULL, st->c, st->c_absolute)) DONE; if (st->c_valid && (strcmp(pn, "mask") == 0) && - ChangeObjectMaskSize(PCB_TYPE_PIN, pin->Element, pin, NULL, st->c, st->c_absolute)) DONE; + pcb_chg_obj_mask_size(PCB_TYPE_PIN, pin->Element, pin, NULL, st->c, st->c_absolute)) DONE; if (st->c_valid && (strcmp(pn, "hole") == 0) && - ChangeObject2ndSize(PCB_TYPE_PIN, pin->Element, pin, NULL, st->c, st->c_absolute, pcb_false)) DONE; + pcb_chg_obj_2nd_size(PCB_TYPE_PIN, pin->Element, pin, NULL, st->c, st->c_absolute, pcb_false)) DONE; } static void set_epad_cb(void *ctx, pcb_board_t *pcb, pcb_element_t *element, pcb_pad_t *pad) @@ -390,7 +390,7 @@ } if (st->c_valid && (strcmp(pn, "mask") == 0) && - ChangeObjectMaskSize(PCB_TYPE_PAD, pad->Element, pad, NULL, st->c, st->c_absolute)) DONE; + pcb_chg_obj_mask_size(PCB_TYPE_PAD, pad->Element, pad, NULL, st->c, st->c_absolute)) DONE; } static void set_via_cb(void *ctx, pcb_board_t *pcb, pcb_pin_t *via) @@ -406,16 +406,16 @@ } if (st->c_valid && (strcmp(pn, "thickness") == 0) && - ChangeObject1stSize(PCB_TYPE_VIA, via, via, NULL, st->c, st->c_absolute)) DONE; + pcb_chg_obj_1st_size(PCB_TYPE_VIA, via, via, NULL, st->c, st->c_absolute)) DONE; if (st->c_valid && (strcmp(pn, "clearance") == 0) && - ChangeObjectClearSize(PCB_TYPE_VIA, via, via, NULL, st->c, st->c_absolute)) DONE; + pcb_chg_obj_clear_size(PCB_TYPE_VIA, via, via, NULL, st->c, st->c_absolute)) DONE; if (st->c_valid && (strcmp(pn, "mask") == 0) && - ChangeObjectMaskSize(PCB_TYPE_VIA, via, via, NULL, st->c, st->c_absolute)) DONE; + pcb_chg_obj_mask_size(PCB_TYPE_VIA, via, via, NULL, st->c, st->c_absolute)) DONE; if (st->c_valid && (strcmp(pn, "hole") == 0) && - ChangeObject2ndSize(PCB_TYPE_VIA, via, via, NULL, st->c, st->c_absolute, pcb_false)) DONE; + pcb_chg_obj_2nd_size(PCB_TYPE_VIA, via, via, NULL, st->c, st->c_absolute, pcb_false)) DONE; } /* use the callback if trc is true or prop matches a prefix or we are setting attributes, else NULL */ Index: trunk/src_plugins/renumber/renumber.c =================================================================== --- trunk/src_plugins/renumber/renumber.c (revision 4847) +++ trunk/src_plugins/renumber/renumber.c (revision 4848) @@ -281,7 +281,7 @@ AddObjectToChangeNameUndoList(PCB_TYPE_ELEMENT, NULL, NULL, element_list[i], NAMEONPCB_NAME(element_list[i])); - ChangeObjectName(PCB_TYPE_ELEMENT, element_list[i], NULL, NULL, tmps); + pcb_chg_obj_name(PCB_TYPE_ELEMENT, element_list[i], NULL, NULL, tmps); changed = pcb_true; /* we don't free tmps in this case because it is used */ Index: trunk/src_plugins/renumber/renumberblock.c =================================================================== --- trunk/src_plugins/renumber/renumberblock.c (revision 4847) +++ trunk/src_plugins/renumber/renumberblock.c (revision 4848) @@ -72,7 +72,7 @@ AddObjectToChangeNameUndoList(PCB_TYPE_ELEMENT, NULL, NULL, element, NAMEONPCB_NAME(element)); - ChangeObjectName(PCB_TYPE_ELEMENT, element, NULL, NULL, new_ref); + pcb_chg_obj_name(PCB_TYPE_ELEMENT, element, NULL, NULL, new_ref); } END_LOOP; IncrementUndoSerialNumber(); @@ -112,7 +112,7 @@ memcpy(new_ref, old_ref, refdes_split - old_ref); strcpy(new_ref + (refdes_split - old_ref), num_buf); - ChangeObjectName(PCB_TYPE_ELEMENT, element, NULL, NULL, new_ref); + pcb_chg_obj_name(PCB_TYPE_ELEMENT, element, NULL, NULL, new_ref); } END_LOOP; return 0; Index: trunk/src_plugins/toporouter/toporouter.c =================================================================== --- trunk/src_plugins/toporouter/toporouter.c (revision 4847) +++ trunk/src_plugins/toporouter/toporouter.c (revision 4848) @@ -8203,7 +8203,7 @@ 0, Settings.ViaDrillingHole, NULL, NoFlags())) != NULL) { AddObjectToCreateUndoList(PCB_TYPE_VIA, via, via, via); /* if (gui->shift_is_pressed ()) - ChangeObjectThermal (PCB_TYPE_VIA, via, via, via, PCB->ThermStyle);*/ + pcb_chg_obj_thermal(PCB_TYPE_VIA, via, via, via, PCB->ThermStyle);*/ DrawVia(via); if ((line = CreateDrawnLineOnLayer(CURRENT, pad->Point1.X + 1., pad->Point1.Y + 1., viax + 1., viay + 1., Settings.LineThickness, 2 * Settings.Clearance, NoFlags()))) { Index: trunk/src_plugins/vendordrill/vendor.c =================================================================== --- trunk/src_plugins/vendordrill/vendor.c (revision 4847) +++ trunk/src_plugins/vendordrill/vendor.c (revision 4848) @@ -322,7 +322,7 @@ if (via->DrillingHole != vendorDrillMap(via->DrillingHole)) { /* only change unlocked vias */ if (!TEST_FLAG(PCB_FLAG_LOCK, via)) { - if (ChangeObject2ndSize(PCB_TYPE_VIA, via, NULL, NULL, vendorDrillMap(via->DrillingHole), pcb_true, pcb_false)) + if (pcb_chg_obj_2nd_size(PCB_TYPE_VIA, via, NULL, NULL, vendorDrillMap(via->DrillingHole), pcb_true, pcb_false)) changed++; else { Message(PCB_MSG_DEFAULT, _ @@ -352,7 +352,7 @@ tot++; if (pin->DrillingHole != vendorDrillMap(pin->DrillingHole)) { if (!TEST_FLAG(PCB_FLAG_LOCK, pin)) { - if (ChangeObject2ndSize(PCB_TYPE_PIN, element, pin, NULL, vendorDrillMap(pin->DrillingHole), pcb_true, pcb_false)) + if (pcb_chg_obj_2nd_size(PCB_TYPE_PIN, element, pin, NULL, vendorDrillMap(pin->DrillingHole), pcb_true, pcb_false)) changed++; else { Message(PCB_MSG_DEFAULT, _