Index: trunk/src/change.c =================================================================== --- trunk/src/change.c (revision 15592) +++ trunk/src/change.c (revision 15593) @@ -124,19 +124,6 @@ NULL /* padstack */ }; -static pcb_opfunc_t ChangePinnumFunctions = { - NULL, - NULL, - NULL, - NULL, - NULL, - NULL, - NULL, - NULL, - NULL, - NULL /* padstack */ -}; - pcb_opfunc_t ChangeSquareFunctions = { NULL, NULL, @@ -947,26 +934,6 @@ } /* --------------------------------------------------------------------------- - * changes the pin number of the passed object - * returns the old name - * - * The allocated memory isn't freed because the old string is used - * by the undo module. - */ -void *pcb_chg_obj_pinnum(int Type, void *Ptr1, void *Ptr2, void *Ptr3, char *Name) -{ - void *result; - pcb_opctx_t ctx; - - ctx.chgname.pcb = PCB; - ctx.chgname.new_name = Name; - - result = pcb_object_operation(&ChangePinnumFunctions, &ctx, Type, Ptr1, Ptr2, Ptr3); - pcb_draw(); - return result; -} - -/* --------------------------------------------------------------------------- * changes the clearance-flag of the passed object * Returns pcb_true if anything is changed */ @@ -1153,7 +1120,7 @@ * The allocated memory isn't freed because the old string is used * by the undo module. */ -void *pcb_chg_obj_name_query(int Type, void *Ptr1, void *Ptr2, void *Ptr3, int pinnum) +void *pcb_chg_obj_name_query(int Type, void *Ptr1, void *Ptr2, void *Ptr3) { char *name = NULL; char msg[513]; @@ -1186,16 +1153,10 @@ if (name) { /* NB: ChangeObjectName takes ownership of the passed memory */ char *old; - if (pinnum) - old = (char *) pcb_chg_obj_pinnum(Type, Ptr1, Ptr2, Ptr3, name); - else - old = (char *) pcb_chg_obj_name(Type, Ptr1, Ptr2, Ptr3, name); + old = (char *) pcb_chg_obj_name(Type, Ptr1, Ptr2, Ptr3, name); if (old != (char *) -1) { - if (pinnum) - pcb_undo_add_obj_to_change_pinnum(Type, Ptr1, Ptr2, Ptr3, old); - else - pcb_undo_add_obj_to_change_name(Type, Ptr1, Ptr2, Ptr3, old); + pcb_undo_add_obj_to_change_name(Type, Ptr1, Ptr2, Ptr3, old); pcb_undo_inc_serial(); } pcb_draw(); Index: trunk/src/change.h =================================================================== --- trunk/src/change.h (revision 15592) +++ trunk/src/change.h (revision 15593) @@ -103,8 +103,7 @@ 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 *pcb_chg_obj_name_query(int, void *, void *, void *, int); -void *pcb_chg_obj_pinnum(int Type, void *Ptr1, void *Ptr2, void *Ptr3, char *Name); +void *pcb_chg_obj_name_query(int, void *, void *, void *); 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); Index: trunk/src/change_act.c =================================================================== --- trunk/src/change_act.c (revision 15592) +++ trunk/src/change_act.c (revision 15593) @@ -644,11 +644,8 @@ pcb_gui->get_coords(_("Select an Object"), &x, &y); if ((type = pcb_search_screen(x, y, PCB_CHANGENAME_TYPES, &ptr1, &ptr2, &ptr3)) != PCB_TYPE_NONE) { pcb_undo_save_serial(); - if ((pinnums != NULL) && (pcb_strcasecmp(pinnums, "Number") == 0)) - pinnum = 1; - else - pinnum = 0; - if (pcb_chg_obj_name_query(type, ptr1, ptr2, ptr3, pinnum)) { + pinnum = 0; + if (pcb_chg_obj_name_query(type, ptr1, ptr2, ptr3)) { pcb_redraw(); pcb_board_set_changed_flag(pcb_true); pcb_event(PCB_EVENT_RUBBER_RENAME, "ipppi", type, ptr1, ptr2, ptr3, pinnum); Index: trunk/src/obj_pinvia.c =================================================================== --- trunk/src/obj_pinvia.c (revision 15592) +++ trunk/src/obj_pinvia.c (revision 15593) @@ -602,23 +602,6 @@ return old; } -/* changes the number of a pin */ -void *pcb_pinop_change_num(pcb_opctx_t *ctx, pcb_element_t *Element, pcb_pin_t *Pin) -{ - char *old = Pin->Number; - - Element = Element; /* get rid of 'unused...' warnings */ - if (PCB_FLAG_TEST(PCB_FLAG_TERMNAME, Pin)) { - pcb_pin_name_invalidate_erase(Pin); - Pin->Number = ctx->chgname.new_name; - pcb_pin_name_invalidate_draw(Pin); - } - else - Pin->Number = ctx->chgname.new_name; - return old; -} - - /* changes the square flag of a via */ void *pcb_viaop_change_square(pcb_opctx_t *ctx, pcb_pin_t *Via) { Index: trunk/src/obj_pinvia_op.h =================================================================== --- trunk/src/obj_pinvia_op.h (revision 15592) +++ trunk/src/obj_pinvia_op.h (revision 15593) @@ -42,7 +42,6 @@ void *pcb_pinop_change_clear_size(pcb_opctx_t *ctx, pcb_element_t *Element, pcb_pin_t *Pin); void *pcb_viaop_change_name(pcb_opctx_t *ctx, pcb_pin_t *Via); void *pcb_pinop_change_name(pcb_opctx_t *ctx, pcb_element_t *Element, pcb_pin_t *Pin); -void *pcb_pinop_change_num(pcb_opctx_t *ctx, pcb_element_t *Element, pcb_pin_t *Pin); void *pcb_viaop_change_square(pcb_opctx_t *ctx, pcb_pin_t *Via); void *pcb_pinop_change_square(pcb_opctx_t *ctx, pcb_element_t *Element, pcb_pin_t *Pin); void *pcb_pinop_set_square(pcb_opctx_t *ctx, pcb_element_t *Element, pcb_pin_t *Pin); Index: trunk/src/undo_old.c =================================================================== --- trunk/src/undo_old.c (revision 15592) +++ trunk/src/undo_old.c (revision 15593) @@ -220,24 +220,6 @@ } /* --------------------------------------------------------------------------- - * recovers an object from a 'change oinnum' operation - * returns pcb_true if anything has been recovered - */ -static pcb_bool UndoChangePinnum(UndoListTypePtr Entry) -{ - void *ptr1, *ptr2, *ptr3; - int type; - - /* lookup entry by it's ID */ - type = pcb_search_obj_by_id(PCB->Data, &ptr1, &ptr2, &ptr3, Entry->ID, Entry->Kind); - if (type != PCB_TYPE_NONE) { - Entry->Data.ChangeName.Name = (char *) (pcb_chg_obj_pinnum(type, ptr1, ptr2, ptr3, Entry->Data.ChangeName.Name)); - return pcb_true; - } - return pcb_false; -} - -/* --------------------------------------------------------------------------- * recovers an object from a ChangeAngles change operation */ static pcb_bool UndoChangeAngles(UndoListTypePtr Entry) @@ -743,11 +725,6 @@ return 0; break; - case PCB_UNDO_CHANGEPINNUM: - if (UndoChangePinnum(ptr)) - return 0; - break; - case PCB_UNDO_CREATE: if (UndoCopyOrCreate(ptr)) return 0; @@ -1059,19 +1036,6 @@ } /* --------------------------------------------------------------------------- - * adds an object to the list of objects with changed pinnums - */ -void pcb_undo_add_obj_to_change_pinnum(int Type, void *Ptr1, void *Ptr2, void *Ptr3, char *OldName) -{ - UndoListTypePtr undo; - - if (!Locked) { - undo = GetUndoSlot(PCB_UNDO_CHANGEPINNUM, PCB_OBJECT_ID(Ptr3), Type); - undo->Data.ChangeName.Name = OldName; - } -} - -/* --------------------------------------------------------------------------- * adds an object to the list of objects moved to another layer */ void pcb_undo_add_obj_to_move_to_layer(int Type, void *Ptr1, void *Ptr2, void *Ptr3) @@ -1287,7 +1251,6 @@ case PCB_UNDO_LAYERMOVE: return "layermove"; case PCB_UNDO_CLEAR: return "clear"; case PCB_UNDO_NETLISTCHANGE: return "netlistchange"; - case PCB_UNDO_CHANGEPINNUM: return "changepinnum"; } sprintf(buff, "Unknown %d", type); return buff; @@ -1303,7 +1266,6 @@ switch (ptr->Type) { case PCB_UNDO_CHANGENAME: - case PCB_UNDO_CHANGEPINNUM: free(ptr->Data.ChangeName.Name); break; case PCB_UNDO_REMOVE: Index: trunk/src/undo_old.h =================================================================== --- trunk/src/undo_old.h (revision 15592) +++ trunk/src/undo_old.h (revision 15593) @@ -82,7 +82,6 @@ PCB_UNDO_LAYERMOVE = 0x020000, /* layer new/delete/move */ PCB_UNDO_CLEAR = 0x040000, /* clear/restore to polygons */ PCB_UNDO_NETLISTCHANGE = 0x080000, /* netlist change */ - PCB_UNDO_CHANGEPINNUM = 0x100000, /* change of pin number */ PCB_UNDO_CHANGERADII = 0x200000, /* change arc radii */ PCB_UNDO_OTHERSIDE = 0x400000, /* change side of board (subcircuit) */ PCB_UNDO_ROTATE = 0x800000 /* rotations at arbitrary angle */