Index: trunk/src/buffer.c =================================================================== --- trunk/src/buffer.c (revision 14527) +++ trunk/src/buffer.c (revision 14528) @@ -74,21 +74,21 @@ #warning TODO: rename this; move_to_buffer is also used to move from buffer to pcb static pcb_opfunc_t MoveBufferFunctions = { - pcb_lineop_move_to_buffer, - pcb_textop_move_to_buffer, - pcb_polyop_move_to_buffer, - pcb_viaop_move_to_buffer, - pcb_elemop_move_to_buffer, + pcb_lineop_move_buffer, + pcb_textop_move_buffer, + pcb_polyop_move_buffer, + pcb_viaop_move_buffer, + pcb_elemop_move_buffer, NULL, NULL, NULL, NULL, NULL, - pcb_arcop_move_to_buffer, - pcb_ratop_move_to_buffer, + pcb_arcop_move_buffer, + pcb_ratop_move_buffer, NULL, - pcb_subcop_move_to_buffer, - pcb_pstkop_move_to_buffer, + pcb_subcop_move_buffer, + pcb_pstkop_move_buffer, }; int pcb_set_buffer_bbox(pcb_buffer_t *Buffer) Index: trunk/src/obj_arc.c =================================================================== --- trunk/src/obj_arc.c (revision 14527) +++ trunk/src/obj_arc.c (revision 14528) @@ -328,8 +328,8 @@ return a; } -/* moves an arc to buffer */ -void *pcb_arcop_move_to_buffer(pcb_opctx_t *ctx, pcb_layer_t * layer, pcb_arc_t * arc) +/* moves an arc between board and buffer */ +void *pcb_arcop_move_buffer(pcb_opctx_t *ctx, pcb_layer_t * layer, pcb_arc_t * arc) { pcb_layer_t *lay = &ctx->buffer.dst->Layer[pcb_layer_id(ctx->buffer.src, layer)]; Index: trunk/src/obj_arc_op.h =================================================================== --- trunk/src/obj_arc_op.h (revision 14527) +++ trunk/src/obj_arc_op.h (revision 14528) @@ -31,7 +31,7 @@ #include "operation.h" void *pcb_arcop_add_to_buffer(pcb_opctx_t *ctx, pcb_layer_t *Layer, pcb_arc_t *Arc); -void *pcb_arcop_move_to_buffer(pcb_opctx_t *ctx, pcb_layer_t *layer, pcb_arc_t *arc); +void *pcb_arcop_move_buffer(pcb_opctx_t *ctx, pcb_layer_t *layer, pcb_arc_t *arc); void *pcb_arcop_change_size(pcb_opctx_t *ctx, pcb_layer_t *Layer, pcb_arc_t *Arc); void *pcb_arcop_change_clear_size(pcb_opctx_t *ctx, pcb_layer_t *Layer, pcb_arc_t *Arc); void *pcb_arcop_change_radius(pcb_opctx_t *ctx, pcb_layer_t *Layer, pcb_arc_t *Arc); Index: trunk/src/obj_elem.c =================================================================== --- trunk/src/obj_elem.c (revision 14527) +++ trunk/src/obj_elem.c (revision 14528) @@ -1322,7 +1322,7 @@ } /* moves a element to buffer without allocating memory for pins/names */ -void *pcb_elemop_move_to_buffer(pcb_opctx_t *ctx, pcb_element_t * element) +void *pcb_elemop_move_buffer(pcb_opctx_t *ctx, pcb_element_t * element) { /* * Delete the element from the source (remove it from trees, Index: trunk/src/obj_elem_op.h =================================================================== --- trunk/src/obj_elem_op.h (revision 14527) +++ trunk/src/obj_elem_op.h (revision 14528) @@ -31,7 +31,7 @@ #include "operation.h" 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_move_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); Index: trunk/src/obj_line.c =================================================================== --- trunk/src/obj_line.c (revision 14527) +++ trunk/src/obj_line.c (revision 14528) @@ -352,8 +352,8 @@ return pcb_line_copy_meta(line, Line); } -/* moves a line to buffer */ -void *pcb_lineop_move_to_buffer(pcb_opctx_t *ctx, pcb_layer_t * layer, pcb_line_t * line) +/* moves a line between board and buffer */ +void *pcb_lineop_move_buffer(pcb_opctx_t *ctx, pcb_layer_t * layer, pcb_line_t * line) { pcb_layer_t *lay = &ctx->buffer.dst->Layer[pcb_layer_id(ctx->buffer.src, layer)]; Index: trunk/src/obj_line_op.h =================================================================== --- trunk/src/obj_line_op.h (revision 14527) +++ trunk/src/obj_line_op.h (revision 14528) @@ -38,7 +38,7 @@ void *pcb_lineop_set_join(pcb_opctx_t *ctx, pcb_layer_t *Layer, pcb_line_t *Line); void *pcb_lineop_clear_join(pcb_opctx_t *ctx, pcb_layer_t *Layer, pcb_line_t *Line); void *pcb_lineop_insert_point(pcb_opctx_t *ctx, pcb_layer_t *Layer, pcb_line_t *Line); -void *pcb_lineop_move_to_buffer(pcb_opctx_t *ctx, pcb_layer_t * layer, pcb_line_t * line); +void *pcb_lineop_move_buffer(pcb_opctx_t *ctx, pcb_layer_t * layer, pcb_line_t * line); void *pcb_lineop_copy(pcb_opctx_t *ctx, pcb_layer_t *Layer, pcb_line_t *Line); void *pcb_lineop_move(pcb_opctx_t *ctx, pcb_layer_t *Layer, pcb_line_t *Line); void *pcb_lineop_move_noclip(pcb_opctx_t *ctx, pcb_layer_t *Layer, pcb_line_t *Line); Index: trunk/src/obj_pinvia.c =================================================================== --- trunk/src/obj_pinvia.c (revision 14527) +++ trunk/src/obj_pinvia.c (revision 14528) @@ -361,8 +361,8 @@ return pcb_via_copy_meta(v, Via); } -/* moves a via to paste buffer without allocating memory for the name */ -void *pcb_viaop_move_to_buffer(pcb_opctx_t *ctx, pcb_pin_t * via) +/* moves a via beteen board and buffer without allocating memory for the name */ +void *pcb_viaop_move_buffer(pcb_opctx_t *ctx, pcb_pin_t * via) { pcb_poly_restore_to_poly(ctx->buffer.src, PCB_TYPE_VIA, via, via); Index: trunk/src/obj_pinvia_op.h =================================================================== --- trunk/src/obj_pinvia_op.h (revision 14527) +++ trunk/src/obj_pinvia_op.h (revision 14528) @@ -31,7 +31,7 @@ #include "operation.h" void *pcb_viaop_add_to_buffer(pcb_opctx_t *ctx, pcb_pin_t *Via); -void *pcb_viaop_move_to_buffer(pcb_opctx_t *ctx, pcb_pin_t * via); +void *pcb_viaop_move_buffer(pcb_opctx_t *ctx, pcb_pin_t * via); void *pcb_viaop_change_thermal(pcb_opctx_t *ctx, pcb_pin_t *Via); void *pcb_pinop_change_thermal(pcb_opctx_t *ctx, pcb_element_t *element, pcb_pin_t *Pin); void *pcb_viaop_change_size(pcb_opctx_t *ctx, pcb_pin_t *Via); Index: trunk/src/obj_poly.c =================================================================== --- trunk/src/obj_poly.c (revision 14527) +++ trunk/src/obj_poly.c (revision 14528) @@ -401,8 +401,8 @@ } -/* moves a polygon to buffer. Doesn't allocate memory for the points */ -void *pcb_polyop_move_to_buffer(pcb_opctx_t *ctx, pcb_layer_t * layer, pcb_poly_t * polygon) +/* moves a polygon between board and buffer. Doesn't allocate memory for the points */ +void *pcb_polyop_move_buffer(pcb_opctx_t *ctx, pcb_layer_t * layer, pcb_poly_t * polygon) { pcb_layer_t *lay = &ctx->buffer.dst->Layer[pcb_layer_id(ctx->buffer.src, layer)]; Index: trunk/src/obj_poly_op.h =================================================================== --- trunk/src/obj_poly_op.h (revision 14527) +++ trunk/src/obj_poly_op.h (revision 14528) @@ -31,7 +31,7 @@ #include "operation.h" void *pcb_polyop_add_to_buffer(pcb_opctx_t *ctx, pcb_layer_t *Layer, pcb_poly_t *Polygon); -void *pcb_polyop_move_to_buffer(pcb_opctx_t *ctx, pcb_layer_t * layer, pcb_poly_t * polygon); +void *pcb_polyop_move_buffer(pcb_opctx_t *ctx, pcb_layer_t * layer, pcb_poly_t * polygon); void *pcb_polyop_change_clear_size(pcb_opctx_t *ctx, pcb_layer_t *Layer, pcb_poly_t *poly); void *pcb_polyop_change_clear(pcb_opctx_t *ctx, pcb_layer_t *Layer, pcb_poly_t *Polygon); void *pcb_polyop_insert_point(pcb_opctx_t *ctx, pcb_layer_t *Layer, pcb_poly_t *Polygon); Index: trunk/src/obj_pstk_op.c =================================================================== --- trunk/src/obj_pstk_op.c (revision 14527) +++ trunk/src/obj_pstk_op.c (revision 14528) @@ -40,7 +40,8 @@ return pcb_pstk_copy_meta(p, ps); } -void *pcb_pstkop_move_to_buffer(pcb_opctx_t *ctx, pcb_pstk_t *ps) +/* Move between board and buffer */ +void *pcb_pstkop_move_buffer(pcb_opctx_t *ctx, pcb_pstk_t *ps) { pcb_cardinal_t npid; pcb_pstk_proto_t *proto = pcb_pstk_get_proto(ps); Index: trunk/src/obj_pstk_op.h =================================================================== --- trunk/src/obj_pstk_op.h (revision 14527) +++ trunk/src/obj_pstk_op.h (revision 14528) @@ -29,7 +29,7 @@ #include "operation.h" void *pcb_pstkop_add_to_buffer(pcb_opctx_t *ctx, pcb_pstk_t *ps); -void *pcb_pstkop_move_to_buffer(pcb_opctx_t *ctx, pcb_pstk_t *ps); +void *pcb_pstkop_move_buffer(pcb_opctx_t *ctx, pcb_pstk_t *ps); void *pcb_pstkop_copy(pcb_opctx_t *ctx, pcb_pstk_t *ps); void *pcb_pstkop_move(pcb_opctx_t *ctx, pcb_pstk_t *ps); Index: trunk/src/obj_rat.c =================================================================== --- trunk/src/obj_rat.c (revision 14527) +++ trunk/src/obj_rat.c (revision 14528) @@ -133,8 +133,8 @@ pcb_flag_mask(Rat->Flags, PCB_FLAG_FOUND | ctx->buffer.extraflg))); } -/* moves a rat-line to paste buffer */ -void *pcb_ratop_move_to_buffer(pcb_opctx_t *ctx, pcb_rat_t * rat) +/* moves a rat-line between board and buffer */ +void *pcb_ratop_move_buffer(pcb_opctx_t *ctx, pcb_rat_t * rat) { pcb_r_delete_entry(ctx->buffer.src->rat_tree, (pcb_box_t *) rat); Index: trunk/src/obj_rat_op.h =================================================================== --- trunk/src/obj_rat_op.h (revision 14527) +++ trunk/src/obj_rat_op.h (revision 14528) @@ -31,7 +31,7 @@ #include "operation.h" void *pcb_ratop_add_to_buffer(pcb_opctx_t *ctx, pcb_rat_t *Rat); -void *pcb_ratop_move_to_buffer(pcb_opctx_t *ctx, pcb_rat_t * rat); +void *pcb_ratop_move_buffer(pcb_opctx_t *ctx, pcb_rat_t * rat); void *pcb_ratop_insert_point(pcb_opctx_t *ctx, pcb_rat_t *Rat); void *pcb_ratop_move_to_layer(pcb_opctx_t *ctx, pcb_rat_t * Rat); void *pcb_ratop_destroy(pcb_opctx_t *ctx, pcb_rat_t *Rat); Index: trunk/src/obj_subc.c =================================================================== --- trunk/src/obj_subc.c (revision 14527) +++ trunk/src/obj_subc.c (revision 14528) @@ -1316,6 +1316,14 @@ return sc; } +/* Move between board and buffer */ +void *pcb_subcop_move_buffer(pcb_opctx_t *ctx, pcb_subc_t *sc) +{ + return pcb_subcop_move_to_buffer(ctx, sc); +#warning subc TODO: buffer->board +} + + void *pcb_subcop_add_to_buffer(pcb_opctx_t *ctx, pcb_subc_t *sc) { pcb_subc_t *nsc; Index: trunk/src/obj_subc_op.h =================================================================== --- trunk/src/obj_subc_op.h (revision 14527) +++ trunk/src/obj_subc_op.h (revision 14528) @@ -33,7 +33,7 @@ void *pcb_subcop_move(pcb_opctx_t *ctx, pcb_subc_t *sc); void *pcb_subcop_rotate90(pcb_opctx_t *ctx, pcb_subc_t *sc); void *pcb_subcop_rotate(pcb_opctx_t *ctx, pcb_subc_t *sc); -void *pcb_subcop_move_to_buffer(pcb_opctx_t *ctx, pcb_subc_t *sc); +void *pcb_subcop_move_buffer(pcb_opctx_t *ctx, pcb_subc_t *sc); void *pcb_subcop_add_to_buffer(pcb_opctx_t *ctx, pcb_subc_t *sc); void *pcb_subcop_change_size(pcb_opctx_t *ctx, pcb_subc_t *sc); void *pcb_subcop_change_clear_size(pcb_opctx_t *ctx, pcb_subc_t *sc); Index: trunk/src/obj_text.c =================================================================== --- trunk/src/obj_text.c (revision 14527) +++ trunk/src/obj_text.c (revision 14528) @@ -340,8 +340,8 @@ return t; } -/* moves a text to buffer without allocating memory for the name */ -void *pcb_textop_move_to_buffer(pcb_opctx_t *ctx, pcb_layer_t * layer, pcb_text_t * text) +/* moves a text without allocating memory for the name between board and buffer */ +void *pcb_textop_move_buffer(pcb_opctx_t *ctx, pcb_layer_t * layer, pcb_text_t * text) { pcb_layer_t *lay = &ctx->buffer.dst->Layer[pcb_layer_id(ctx->buffer.src, layer)]; Index: trunk/src/obj_text_op.h =================================================================== --- trunk/src/obj_text_op.h (revision 14527) +++ trunk/src/obj_text_op.h (revision 14528) @@ -31,7 +31,7 @@ #include "operation.h" void *pcb_textop_add_to_buffer(pcb_opctx_t *ctx, pcb_layer_t *Layer, pcb_text_t *Text); -void *pcb_textop_move_to_buffer(pcb_opctx_t *ctx, pcb_layer_t * layer, pcb_text_t * text); +void *pcb_textop_move_buffer(pcb_opctx_t *ctx, pcb_layer_t * layer, pcb_text_t * text); void *pcb_textop_change_size(pcb_opctx_t *ctx, pcb_layer_t *Layer, pcb_text_t *Text); void *pcb_textop_change_name(pcb_opctx_t *ctx, pcb_layer_t *Layer, pcb_text_t *Text); void *pcb_textop_change_join(pcb_opctx_t *ctx, pcb_layer_t *Layer, pcb_text_t *Text);