Index: trunk/doc/developer/renames =================================================================== --- trunk/doc/developer/renames (revision 9324) +++ trunk/doc/developer/renames (revision 9325) @@ -1571,3 +1571,25 @@ RemoveArcPoint_op -> pcb_arcop_remove_point Rotate90Arc -> pcb_arcop_rotate90 ChgFlagArc -> pcb_arcop_change_flag +AddElementToBuffer -> pcb_elemop_add_to_buffer +MoveElementToBuffer -> pcb_elemop_move_to_buffer +ClrElementOctagon -> pcb_elemop_clear_octagon +SetElementOctagon -> pcb_elemop_set_octagon +ChangeElementOctagon -> pcb_elemop_change_octagon +ClrElementSquare -> pcb_elemop_clear_square +SetElementSquare -> pcb_elemop_set_square +ChangeElementSquare -> pcb_elemop_change_square +ChangeElementNonetlist -> pcb_elemop_change_nonetlist +ChangeElementName -> pcb_elemop_change_name +ChangeElementNameSize -> pcb_elemop_change_name_size +ChangeElementSize -> pcb_elemop_change_size +ChangeElementClearSize -> pcb_elemop_change_clear_size +ChangeElement1stSize -> pcb_elemop_change_1st_size +ChangeElement2ndSize -> pcb_elemop_change_2nd_size +CopyElement -> pcb_elemop_copy +MoveElementName -> pcb_elemop_move_name +MoveElement -> pcb_elemop_move +DestroyElement -> pcb_elemop_destroy +RemoveElement_op -> pcb_elemop_remove +Rotate90Element -> pcb_elemop_rotate90 +Rotate90ElementName -> pcb_elemop_rotate90_name Index: trunk/src/buffer.c =================================================================== --- trunk/src/buffer.c (revision 9324) +++ trunk/src/buffer.c (revision 9325) @@ -57,7 +57,7 @@ AddTextToBuffer, AddPolygonToBuffer, AddViaToBuffer, - AddElementToBuffer, + pcb_elemop_add_to_buffer, NULL, NULL, NULL, @@ -74,7 +74,7 @@ MoveTextToBuffer, MovePolygonToBuffer, MoveViaToBuffer, - MoveElementToBuffer, + pcb_elemop_move_to_buffer, NULL, NULL, NULL, @@ -656,7 +656,7 @@ printf("In CopyPastebufferToLayout, pasting element %s\n", element->Name[1].TextString); #endif if (PCB_FRONT(element) || pcb->InvisibleObjectsOn) { - CopyElement(&ctx, element); + pcb_elemop_copy(&ctx, element); changed = pcb_true; } } Index: trunk/src/change.c =================================================================== --- trunk/src/change.c (revision 9324) +++ trunk/src/change.c (revision 9325) @@ -49,8 +49,8 @@ ChangeTextSize, ChangePolyClear, ChangeViaSize, - ChangeElementSize, /* changes silk screen line width */ - ChangeElementNameSize, + pcb_elemop_change_size, /* changes silk screen line width */ + pcb_elemop_change_name_size, ChangePinSize, ChangePadSize, NULL, @@ -66,8 +66,8 @@ ChangeTextSize, ChangePolyClear, ChangeViaSize, - ChangeElement1stSize, - ChangeElementNameSize, + pcb_elemop_change_1st_size, + pcb_elemop_change_name_size, ChangePinSize, ChangePadSize, NULL, @@ -83,7 +83,7 @@ NULL, NULL, ChangeVia2ndSize, - ChangeElement2ndSize, + pcb_elemop_change_2nd_size, NULL, ChangePin2ndSize, NULL, @@ -117,7 +117,7 @@ NULL, ChangePolygonClearSize, /* just to tell the user not to :-) */ ChangeViaClearSize, - ChangeElementClearSize, + pcb_elemop_change_clear_size, NULL, ChangePinClearSize, ChangePadClearSize, @@ -134,7 +134,7 @@ ChangeTextName, NULL, ChangeViaName, - ChangeElementName, + pcb_elemop_change_name, NULL, ChangePinName, ChangePadName, @@ -168,7 +168,7 @@ NULL, NULL, ChangeViaSquare, - ChangeElementSquare, + pcb_elemop_change_square, NULL, ChangePinSquare, ChangePadSquare, @@ -185,7 +185,7 @@ NULL, NULL, NULL, - ChangeElementNonetlist, + pcb_elemop_change_nonetlist, NULL, NULL, NULL, @@ -219,7 +219,7 @@ NULL, NULL, ChangeViaOctagon, - ChangeElementOctagon, + pcb_elemop_change_octagon, NULL, ChangePinOctagon, NULL, @@ -257,7 +257,7 @@ NULL, NULL, NULL, - SetElementSquare, + pcb_elemop_set_square, NULL, SetPinSquare, SetPadSquare, @@ -291,7 +291,7 @@ NULL, NULL, SetViaOctagon, - SetElementOctagon, + pcb_elemop_set_octagon, NULL, SetPinOctagon, NULL, @@ -308,7 +308,7 @@ NULL, NULL, NULL, - ClrElementSquare, + pcb_elemop_clear_square, NULL, ClrPinSquare, ClrPadSquare, @@ -342,7 +342,7 @@ NULL, NULL, ClrViaOctagon, - ClrElementOctagon, + pcb_elemop_clear_octagon, NULL, ClrPinOctagon, NULL, Index: trunk/src/copy.c =================================================================== --- trunk/src/copy.c (revision 9324) +++ trunk/src/copy.c (revision 9325) @@ -47,7 +47,7 @@ CopyText, CopyPolygon, CopyVia, - CopyElement, + pcb_elemop_copy, NULL, NULL, NULL, Index: trunk/src/move.c =================================================================== --- trunk/src/move.c (revision 9324) +++ trunk/src/move.c (revision 9325) @@ -53,8 +53,8 @@ MoveText, MovePolygon, MoveVia, - MoveElement, - MoveElementName, + pcb_elemop_move, + pcb_elemop_move_name, NULL, NULL, pcb_lineop_move_point, Index: trunk/src/obj_elem.c =================================================================== --- trunk/src/obj_elem.c (revision 9324) +++ trunk/src/obj_elem.c (revision 9325) @@ -1101,7 +1101,7 @@ ctx.remove.destroy_target = NULL; PCB_CLEAR_PARENT(Element); - return RemoveElement_op(&ctx, Element); + return pcb_elemop_remove(&ctx, Element); } /* rotate an element in 90 degree steps */ @@ -1256,7 +1256,7 @@ /*** ops ***/ /* copies a element to buffer */ -void *AddElementToBuffer(pcb_opctx_t *ctx, pcb_element_t *Element) +void *pcb_elemop_add_to_buffer(pcb_opctx_t *ctx, pcb_element_t *Element) { pcb_element_t *element; @@ -1284,7 +1284,7 @@ } /* moves a element to buffer without allocating memory for pins/names */ -void *MoveElementToBuffer(pcb_opctx_t *ctx, pcb_element_t * element) +void *pcb_elemop_move_to_buffer(pcb_opctx_t *ctx, pcb_element_t * element) { /* * Delete the element from the source (remove it from trees, @@ -1329,7 +1329,7 @@ /* changes the drilling hole of all pins of an element; returns pcb_true if changed */ -void *ChangeElement2ndSize(pcb_opctx_t *ctx, pcb_element_t *Element) +void *pcb_elemop_change_2nd_size(pcb_opctx_t *ctx, pcb_element_t *Element) { pcb_bool changed = pcb_false; pcb_coord_t value; @@ -1363,7 +1363,7 @@ } /* changes ring dia of all pins of an element; returns pcb_true if changed */ -void *ChangeElement1stSize(pcb_opctx_t *ctx, pcb_element_t *Element) +void *pcb_elemop_change_1st_size(pcb_opctx_t *ctx, pcb_element_t *Element) { pcb_bool changed = pcb_false; pcb_coord_t value; @@ -1395,7 +1395,7 @@ } /* changes the clearance of all pins of an element; returns pcb_true if changed */ -void *ChangeElementClearSize(pcb_opctx_t *ctx, pcb_element_t *Element) +void *pcb_elemop_change_clear_size(pcb_opctx_t *ctx, pcb_element_t *Element) { pcb_bool changed = pcb_false; pcb_coord_t value; @@ -1453,7 +1453,7 @@ } /* changes the scaling factor of an element's outline; returns pcb_true if changed */ -void *ChangeElementSize(pcb_opctx_t *ctx, pcb_element_t *Element) +void *pcb_elemop_change_size(pcb_opctx_t *ctx, pcb_element_t *Element) { pcb_coord_t value; pcb_bool changed = pcb_false; @@ -1491,7 +1491,7 @@ } /* changes the scaling factor of a elementname object; returns pcb_true if changed */ -void *ChangeElementNameSize(pcb_opctx_t *ctx, pcb_element_t *Element) +void *pcb_elemop_change_name_size(pcb_opctx_t *ctx, pcb_element_t *Element) { int value = ctx->chgsize.absolute ? PCB_COORD_TO_MIL(ctx->chgsize.absolute) : PCB_ELEM_TEXT_DESCRIPTION(Element).Scale + PCB_COORD_TO_MIL(ctx->chgsize.delta); @@ -1516,7 +1516,7 @@ } -void *ChangeElementName(pcb_opctx_t *ctx, pcb_element_t *Element) +void *pcb_elemop_change_name(pcb_opctx_t *ctx, pcb_element_t *Element) { if (PCB_FLAG_TEST(PCB_FLAG_LOCK, &Element->Name[0])) return (NULL); @@ -1530,7 +1530,7 @@ return pcb_element_text_change(PCB, PCB->Data, Element, PCB_ELEMNAME_IDX_VISIBLE(), ctx->chgname.new_name); } -void *ChangeElementNonetlist(pcb_opctx_t *ctx, pcb_element_t *Element) +void *pcb_elemop_change_nonetlist(pcb_opctx_t *ctx, pcb_element_t *Element) { if (PCB_FLAG_TEST(PCB_FLAG_LOCK, Element)) return (NULL); @@ -1540,7 +1540,7 @@ /* changes the square flag of all pins on an element */ -void *ChangeElementSquare(pcb_opctx_t *ctx, pcb_element_t *Element) +void *pcb_elemop_change_square(pcb_opctx_t *ctx, pcb_element_t *Element) { void *ans = NULL; @@ -1560,7 +1560,7 @@ } /* sets the square flag of all pins on an element */ -void *SetElementSquare(pcb_opctx_t *ctx, pcb_element_t *Element) +void *pcb_elemop_set_square(pcb_opctx_t *ctx, pcb_element_t *Element) { void *ans = NULL; @@ -1580,7 +1580,7 @@ } /* clears the square flag of all pins on an element */ -void *ClrElementSquare(pcb_opctx_t *ctx, pcb_element_t *Element) +void *pcb_elemop_clear_square(pcb_opctx_t *ctx, pcb_element_t *Element) { void *ans = NULL; @@ -1600,7 +1600,7 @@ } /* changes the octagon flags of all pins of an element */ -void *ChangeElementOctagon(pcb_opctx_t *ctx, pcb_element_t *Element) +void *pcb_elemop_change_octagon(pcb_opctx_t *ctx, pcb_element_t *Element) { void *result = NULL; @@ -1616,7 +1616,7 @@ } /* sets the octagon flags of all pins of an element */ -void *SetElementOctagon(pcb_opctx_t *ctx, pcb_element_t *Element) +void *pcb_elemop_set_octagon(pcb_opctx_t *ctx, pcb_element_t *Element) { void *result = NULL; @@ -1632,7 +1632,7 @@ } /* clears the octagon flags of all pins of an element */ -void *ClrElementOctagon(pcb_opctx_t *ctx, pcb_element_t *Element) +void *pcb_elemop_clear_octagon(pcb_opctx_t *ctx, pcb_element_t *Element) { void *result = NULL; @@ -1648,11 +1648,11 @@ } /* copies an element onto the PCB. Then does a draw. */ -void *CopyElement(pcb_opctx_t *ctx, pcb_element_t *Element) +void *pcb_elemop_copy(pcb_opctx_t *ctx, pcb_element_t *Element) { #ifdef DEBUG - printf("Entered CopyElement, trying to copy element %s\n", Element->Name[1].TextString); + printf("Entered pcb_elemop_copy, trying to copy element %s\n", Element->Name[1].TextString); #endif pcb_element_t *element = pcb_element_copy(PCB->Data, @@ -1670,13 +1670,13 @@ DrawElementPinsAndPads(element); } #ifdef DEBUG - printf(" ... Leaving CopyElement.\n"); + printf(" ... Leaving pcb_elemop_copy.\n"); #endif return (element); } /* moves all names of an element to a new position */ -void *MoveElementName(pcb_opctx_t *ctx, pcb_element_t *Element) +void *pcb_elemop_move_name(pcb_opctx_t *ctx, pcb_element_t *Element) { if (pcb_silk_on(PCB) && (PCB_FRONT(Element) || PCB->InvisibleObjectsOn)) { EraseElementName(Element); @@ -1707,7 +1707,7 @@ } /* moves an element */ -void *MoveElement(pcb_opctx_t *ctx, pcb_element_t *Element) +void *pcb_elemop_move(pcb_opctx_t *ctx, pcb_element_t *Element) { pcb_bool didDraw = pcb_false; @@ -1733,7 +1733,7 @@ } /* destroys a element */ -void *DestroyElement(pcb_opctx_t *ctx, pcb_element_t *Element) +void *pcb_elemop_destroy(pcb_opctx_t *ctx, pcb_element_t *Element) { if (ctx->remove.destroy_target->element_tree) pcb_r_delete_entry(ctx->remove.destroy_target->element_tree, (pcb_box_t *) Element); @@ -1765,7 +1765,7 @@ } /* removes an element */ -void *RemoveElement_op(pcb_opctx_t *ctx, pcb_element_t *Element) +void *pcb_elemop_remove(pcb_opctx_t *ctx, pcb_element_t *Element) { /* erase from screen */ if ((pcb_silk_on(PCB) || PCB->PinOn) && (PCB_FRONT(Element) || PCB->InvisibleObjectsOn)) { @@ -1779,7 +1779,7 @@ } /* rotates an element */ -void *Rotate90Element(pcb_opctx_t *ctx, pcb_element_t *Element) +void *pcb_elemop_rotate90(pcb_opctx_t *ctx, pcb_element_t *Element) { EraseElement(Element); pcb_element_rotate90(PCB->Data, Element, ctx->rotate.center_x, ctx->rotate.center_y, ctx->rotate.number); @@ -1791,7 +1791,7 @@ /* ---------------------------------------------------------------------- * rotates the name of an element */ -void *Rotate90ElementName(pcb_opctx_t *ctx, pcb_element_t *Element) +void *pcb_elemop_rotate90_name(pcb_opctx_t *ctx, pcb_element_t *Element) { EraseElementName(Element); PCB_ELEMENT_PCB_TEXT_LOOP(Element); Index: trunk/src/obj_elem_op.h =================================================================== --- trunk/src/obj_elem_op.h (revision 9324) +++ trunk/src/obj_elem_op.h (revision 9325) @@ -28,26 +28,26 @@ #include "operation.h" -void *AddElementToBuffer(pcb_opctx_t *ctx, pcb_element_t *Element); -void *MoveElementToBuffer(pcb_opctx_t *ctx, pcb_element_t * element); -void *ClrElementOctagon(pcb_opctx_t *ctx, pcb_element_t *Element); -void *SetElementOctagon(pcb_opctx_t *ctx, pcb_element_t *Element); -void *ChangeElementOctagon(pcb_opctx_t *ctx, pcb_element_t *Element); -void *ClrElementSquare(pcb_opctx_t *ctx, pcb_element_t *Element); -void *SetElementSquare(pcb_opctx_t *ctx, pcb_element_t *Element); -void *ChangeElementSquare(pcb_opctx_t *ctx, pcb_element_t *Element); -void *ChangeElementNonetlist(pcb_opctx_t *ctx, pcb_element_t *Element); -void *ChangeElementName(pcb_opctx_t *ctx, pcb_element_t *Element); -void *ChangeElementNameSize(pcb_opctx_t *ctx, pcb_element_t *Element); -void *ChangeElementSize(pcb_opctx_t *ctx, pcb_element_t *Element); -void *ChangeElementClearSize(pcb_opctx_t *ctx, pcb_element_t *Element); -void *ChangeElement1stSize(pcb_opctx_t *ctx, pcb_element_t *Element); -void *ChangeElement2ndSize(pcb_opctx_t *ctx, pcb_element_t *Element); -void *CopyElement(pcb_opctx_t *ctx, pcb_element_t *Element); -void *MoveElementName(pcb_opctx_t *ctx, pcb_element_t *Element); -void *MoveElement(pcb_opctx_t *ctx, pcb_element_t *Element); -void *DestroyElement(pcb_opctx_t *ctx, pcb_element_t *Element); -void *RemoveElement_op(pcb_opctx_t *ctx, pcb_element_t *Element); -void *Rotate90Element(pcb_opctx_t *ctx, pcb_element_t *Element); -void *Rotate90ElementName(pcb_opctx_t *ctx, pcb_element_t *Element); +void *pcb_elemop_add_to_buffer(pcb_opctx_t *ctx, pcb_element_t *Element); +void *pcb_elemop_move_to_buffer(pcb_opctx_t *ctx, pcb_element_t * element); +void *pcb_elemop_clear_octagon(pcb_opctx_t *ctx, pcb_element_t *Element); +void *pcb_elemop_set_octagon(pcb_opctx_t *ctx, pcb_element_t *Element); +void *pcb_elemop_change_octagon(pcb_opctx_t *ctx, pcb_element_t *Element); +void *pcb_elemop_clear_square(pcb_opctx_t *ctx, pcb_element_t *Element); +void *pcb_elemop_set_square(pcb_opctx_t *ctx, pcb_element_t *Element); +void *pcb_elemop_change_square(pcb_opctx_t *ctx, pcb_element_t *Element); +void *pcb_elemop_change_nonetlist(pcb_opctx_t *ctx, pcb_element_t *Element); +void *pcb_elemop_change_name(pcb_opctx_t *ctx, pcb_element_t *Element); +void *pcb_elemop_change_name_size(pcb_opctx_t *ctx, pcb_element_t *Element); +void *pcb_elemop_change_size(pcb_opctx_t *ctx, pcb_element_t *Element); +void *pcb_elemop_change_clear_size(pcb_opctx_t *ctx, pcb_element_t *Element); +void *pcb_elemop_change_1st_size(pcb_opctx_t *ctx, pcb_element_t *Element); +void *pcb_elemop_change_2nd_size(pcb_opctx_t *ctx, pcb_element_t *Element); +void *pcb_elemop_copy(pcb_opctx_t *ctx, pcb_element_t *Element); +void *pcb_elemop_move_name(pcb_opctx_t *ctx, pcb_element_t *Element); +void *pcb_elemop_move(pcb_opctx_t *ctx, pcb_element_t *Element); +void *pcb_elemop_destroy(pcb_opctx_t *ctx, pcb_element_t *Element); +void *pcb_elemop_remove(pcb_opctx_t *ctx, pcb_element_t *Element); +void *pcb_elemop_rotate90(pcb_opctx_t *ctx, pcb_element_t *Element); +void *pcb_elemop_rotate90_name(pcb_opctx_t *ctx, pcb_element_t *Element); Index: trunk/src/remove.c =================================================================== --- trunk/src/remove.c (revision 9324) +++ trunk/src/remove.c (revision 9325) @@ -44,7 +44,7 @@ RemoveText_op, RemovePolygon_op, RemoveVia, - RemoveElement_op, + pcb_elemop_remove, NULL, NULL, NULL, @@ -61,7 +61,7 @@ DestroyText, DestroyPolygon, DestroyVia, - DestroyElement, + pcb_elemop_destroy, NULL, NULL, NULL, Index: trunk/src/rotate.c =================================================================== --- trunk/src/rotate.c (revision 9324) +++ trunk/src/rotate.c (revision 9325) @@ -57,8 +57,8 @@ Rotate90Text, Rotate90Polygon, NULL, - Rotate90Element, - Rotate90ElementName, + pcb_elemop_rotate90, + pcb_elemop_rotate90_name, NULL, NULL, pcb_lineop_rotate90_point, Index: trunk/src_plugins/export_openscad/scadcomp.c =================================================================== --- trunk/src_plugins/export_openscad/scadcomp.c (revision 9324) +++ trunk/src_plugins/export_openscad/scadcomp.c (revision 9325) @@ -361,7 +361,7 @@ element_buffer.Data = pcb_buffer_new(); -- Copy - AddElementToBuffer (pcb_element_t *Element) + pcb_elemop_add_to_buffer (pcb_element_t *Element) if (PCB_ON_SIDE(Element,(Settings.ShowBottomSide)?BOTTOM_SIDE:TOP_SIDE)) pcb_element_mirror(element_buffer.Data, element, 0); Index: trunk/src_plugins/fp_board/fp_board.c =================================================================== --- trunk/src_plugins/fp_board/fp_board.c (revision 9324) +++ trunk/src_plugins/fp_board/fp_board.c (revision 9325) @@ -117,7 +117,7 @@ memset(&op, 0, sizeof(op)); op.buffer.dst = calloc(sizeof(pcb_data_t), 1); pcb_data_set_layer_parents(op.buffer.dst); - AddElementToBuffer(&op, element); + pcb_elemop_add_to_buffer(&op, element); f = fopen(tmp_name, "w"); memset(&buff2, 0, sizeof(buff2));