Index: trunk/doc-rnd/hacking/renames =================================================================== --- trunk/doc-rnd/hacking/renames (revision 4916) +++ trunk/doc-rnd/hacking/renames (revision 4917) @@ -465,3 +465,8 @@ Concat -> pcb_concat StripWhiteSpaceAndDup -> pcb_strdup_strip_wspace MoveLayer -> pcb_layer_move +MOVE -> PCB_MOVE +MoveObject -> pcb_move_obj +MoveObjectToLayer -> pcb_move_obj_to_layer +MoveObjectAndRubberband -> pcb_move_obj_and_rubberband +MoveSelectedObjectsToLayer -> pcb_move_selected_objs_to_layer Index: trunk/src/action_helper.c =================================================================== --- trunk/src/action_helper.c (revision 4916) +++ trunk/src/action_helper.c (revision 4917) @@ -1167,7 +1167,7 @@ Crosshair.AttachedObject.Ptr2, Crosshair.AttachedObject.Ptr3, Note.X - Crosshair.AttachedObject.X, Note.Y - Crosshair.AttachedObject.Y); else { - MoveObjectAndRubberband(Crosshair.AttachedObject.Type, + pcb_move_obj_and_rubberband(Crosshair.AttachedObject.Type, Crosshair.AttachedObject.Ptr1, Crosshair.AttachedObject.Ptr2, Crosshair.AttachedObject.Ptr3, Index: trunk/src/box.h =================================================================== --- trunk/src/box.h (revision 4916) +++ trunk/src/box.h (revision 4917) @@ -98,8 +98,8 @@ #define PCB_BOX_MOVE_LOWLEVEL(b,dx,dy) \ { \ - MOVE((b)->X1,(b)->Y1,(dx),(dy)) \ - MOVE((b)->X2,(b)->Y2,(dx),(dy)) \ + PCB_MOVE((b)->X1,(b)->Y1,(dx),(dy)) \ + PCB_MOVE((b)->X2,(b)->Y2,(dx),(dy)) \ } Index: trunk/src/conf.c =================================================================== --- trunk/src/conf.c (revision 4916) +++ trunk/src/conf.c (revision 4917) @@ -423,21 +423,21 @@ static void conf_insert_arr(conf_native_t *dest, int offs) { -#define CASE_MOVE(typ, fld) \ +#define CASE_PCB_MOVE(typ, fld) \ case typ: memmove(dest->val.fld+offs, dest->val.fld, dest->used * sizeof(dest->val.fld[0])); return memmove(dest->prop+offs, dest->prop, dest->used * sizeof(dest->prop[0])); if (dest->used > 0) { switch(dest->type) { - CASE_MOVE(CFN_STRING, string); - CASE_MOVE(CFN_BOOLEAN, boolean); - CASE_MOVE(CFN_INTEGER, integer); - CASE_MOVE(CFN_REAL, real); - CASE_MOVE(CFN_COORD, coord); - CASE_MOVE(CFN_UNIT, unit); - CASE_MOVE(CFN_COLOR, color); - CASE_MOVE(CFN_LIST, list); - CASE_MOVE(CFN_INCREMENTS, increments); + CASE_PCB_MOVE(CFN_STRING, string); + CASE_PCB_MOVE(CFN_BOOLEAN, boolean); + CASE_PCB_MOVE(CFN_INTEGER, integer); + CASE_PCB_MOVE(CFN_REAL, real); + CASE_PCB_MOVE(CFN_COORD, coord); + CASE_PCB_MOVE(CFN_UNIT, unit); + CASE_PCB_MOVE(CFN_COLOR, color); + CASE_PCB_MOVE(CFN_LIST, list); + CASE_PCB_MOVE(CFN_INCREMENTS, increments); } } #undef CASE_MOVE Index: trunk/src/move.c =================================================================== --- trunk/src/move.c (revision 4916) +++ trunk/src/move.c (revision 4917) @@ -67,7 +67,7 @@ * moves the object identified by its data pointers and the type * not we don't bump the undo serial number */ -void *MoveObject(int Type, void *Ptr1, void *Ptr2, void *Ptr3, pcb_coord_t DX, pcb_coord_t DY) +void *pcb_move_obj(int Type, void *Ptr1, void *Ptr2, void *Ptr3, pcb_coord_t DX, pcb_coord_t DY) { void *result; pcb_opctx_t ctx; @@ -84,7 +84,7 @@ * moves the object identified by its data pointers and the type * as well as all attached rubberband lines */ -void *MoveObjectAndRubberband(int Type, void *Ptr1, void *Ptr2, void *Ptr3, pcb_coord_t DX, pcb_coord_t DY) +void *pcb_move_obj_and_rubberband(int Type, void *Ptr1, void *Ptr2, void *Ptr3, pcb_coord_t DX, pcb_coord_t DY) { pcb_rubberband_t *ptr; pcb_opctx_t ctx; @@ -131,7 +131,7 @@ * moves the object identified by its data pointers and the type * to a new layer without changing it's position */ -void *MoveObjectToLayer(int Type, void *Ptr1, void *Ptr2, void *Ptr3, pcb_layer_t *Target, pcb_bool enmasse) +void *pcb_move_obj_to_layer(int Type, void *Ptr1, void *Ptr2, void *Ptr3, pcb_layer_t *Target, pcb_bool enmasse) { void *result; pcb_opctx_t ctx; @@ -149,7 +149,7 @@ * moves the selected objects to a new layer without changing their * positions */ -pcb_bool MoveSelectedObjectsToLayer(pcb_layer_t *Target) +pcb_bool pcb_move_selected_objs_to_layer(pcb_layer_t *Target) { pcb_bool changed; pcb_opctx_t ctx; Index: trunk/src/move.h =================================================================== --- trunk/src/move.h (revision 4916) +++ trunk/src/move.h (revision 4917) @@ -34,7 +34,7 @@ /* --------------------------------------------------------------------------- * some useful transformation macros and constants */ -#define MOVE(xs,ys,deltax,deltay) \ +#define PCB_MOVE(xs,ys,deltax,deltay) \ { \ ((xs) += (deltax)); \ ((ys) += (deltay)); \ @@ -50,9 +50,9 @@ /* --------------------------------------------------------------------------- * prototypes */ -void *MoveObject(int, void *, void *, void *, pcb_coord_t, pcb_coord_t); -void *MoveObjectToLayer(int, void *, void *, void *, pcb_layer_t *, pcb_bool); -void *MoveObjectAndRubberband(int, void *, void *, void *, pcb_coord_t, pcb_coord_t); -pcb_bool MoveSelectedObjectsToLayer(pcb_layer_t *); +void *pcb_move_obj(int, void *, void *, void *, pcb_coord_t, pcb_coord_t); +void *pcb_move_obj_to_layer(int, void *, void *, void *, pcb_layer_t *, pcb_bool); +void *pcb_move_obj_and_rubberband(int, void *, void *, void *, pcb_coord_t, pcb_coord_t); +pcb_bool pcb_move_selected_objs_to_layer(pcb_layer_t *); #endif Index: trunk/src/obj_arc.h =================================================================== --- trunk/src/obj_arc.h (revision 4916) +++ trunk/src/obj_arc.h (revision 4917) @@ -61,7 +61,7 @@ #define MOVE_ARC_LOWLEVEL(a,dx,dy) \ { \ - MOVE((a)->X,(a)->Y,(dx),(dy)) \ + PCB_MOVE((a)->X,(a)->Y,(dx),(dy)) \ PCB_BOX_MOVE_LOWLEVEL(&((a)->BoundingBox),(dx),(dy)); \ } Index: trunk/src/obj_elem.c =================================================================== --- trunk/src/obj_elem.c (revision 4916) +++ trunk/src/obj_elem.c (revision 4917) @@ -1042,7 +1042,7 @@ END_LOOP; PCB_BOX_MOVE_LOWLEVEL(&Element->BoundingBox, DX, DY); PCB_BOX_MOVE_LOWLEVEL(&Element->VBox, DX, DY); - MOVE(Element->MarkX, Element->MarkY, DX, DY); + PCB_MOVE(Element->MarkX, Element->MarkY, DX, DY); if (Data) r_insert_entry(Data->element_tree, (pcb_box_t *) Element, 0); } Index: trunk/src/obj_line.c =================================================================== --- trunk/src/obj_line.c (revision 4916) +++ trunk/src/obj_line.c (revision 4917) @@ -415,7 +415,7 @@ EraseLine(Line); RestoreToPolygon(PCB->Data, PCB_TYPE_LINE, Layer, Line); r_delete_entry(Layer->line_tree, &Line->BoundingBox); - MOVE(Point->X, Point->Y, ctx->move.dx, ctx->move.dy); + PCB_MOVE(Point->X, Point->Y, ctx->move.dx, ctx->move.dy); SetLineBoundingBox(Line); r_insert_entry(Layer->line_tree, &Line->BoundingBox, 0); ClearFromPolygon(PCB->Data, PCB_TYPE_LINE, Layer, Line); @@ -430,7 +430,7 @@ if (PCB->RatOn) EraseRat((pcb_rat_t *) Line); r_delete_entry(PCB->Data->rat_tree, &Line->BoundingBox); - MOVE(Point->X, Point->Y, ctx->move.dx, ctx->move.dy); + PCB_MOVE(Point->X, Point->Y, ctx->move.dx, ctx->move.dy); SetLineBoundingBox(Line); r_insert_entry(PCB->Data->rat_tree, &Line->BoundingBox, 0); if (PCB->RatOn) { @@ -589,7 +589,7 @@ r_search(Layer->line_tree, (const pcb_box_t *) Point, NULL, remove_point, &info, NULL); return RemoveLine_op(ctx, Layer, Line); } - MoveObject(PCB_TYPE_LINE_POINT, Layer, info.line, info.point, other.X - Point->X, other.Y - Point->Y); + pcb_move_obj(PCB_TYPE_LINE_POINT, Layer, info.line, info.point, other.X - Point->X, other.Y - Point->Y); return (RemoveLine_op(ctx, Layer, Line)); } Index: trunk/src/obj_line.h =================================================================== --- trunk/src/obj_line.h (revision 4916) +++ trunk/src/obj_line.h (revision 4917) @@ -70,8 +70,8 @@ */ #define MOVE_LINE_LOWLEVEL(l,dx,dy) \ { \ - MOVE((l)->Point1.X,(l)->Point1.Y,(dx),(dy)) \ - MOVE((l)->Point2.X,(l)->Point2.Y,(dx),(dy)) \ + PCB_MOVE((l)->Point1.X,(l)->Point1.Y,(dx),(dy)) \ + PCB_MOVE((l)->Point2.X,(l)->Point2.Y,(dx),(dy)) \ SetLineBoundingBox ((l)); \ } Index: trunk/src/obj_pad.h =================================================================== --- trunk/src/obj_pad.h (revision 4916) +++ trunk/src/obj_pad.h (revision 4917) @@ -54,8 +54,8 @@ */ #define MOVE_PAD_LOWLEVEL(p,dx,dy) \ { \ - MOVE((p)->Point1.X,(p)->Point1.Y,(dx),(dy)) \ - MOVE((p)->Point2.X,(p)->Point2.Y,(dx),(dy)) \ + PCB_MOVE((p)->Point1.X,(p)->Point1.Y,(dx),(dy)) \ + PCB_MOVE((p)->Point2.X,(p)->Point2.Y,(dx),(dy)) \ SetPadBoundingBox ((p)); \ } Index: trunk/src/obj_pinvia.h =================================================================== --- trunk/src/obj_pinvia.h (revision 4916) +++ trunk/src/obj_pinvia.h (revision 4917) @@ -63,13 +63,13 @@ #define MOVE_VIA_LOWLEVEL(v,dx,dy) \ { \ - MOVE((v)->X,(v)->Y,(dx),(dy)) \ + PCB_MOVE((v)->X,(v)->Y,(dx),(dy)) \ PCB_BOX_MOVE_LOWLEVEL(&((v)->BoundingBox),(dx),(dy)); \ } #define MOVE_PIN_LOWLEVEL(p,dx,dy) \ { \ - MOVE((p)->X,(p)->Y,(dx),(dy)) \ + PCB_MOVE((p)->X,(p)->Y,(dx),(dy)) \ PCB_BOX_MOVE_LOWLEVEL(&((p)->BoundingBox),(dx),(dy)); \ } Index: trunk/src/obj_poly.c =================================================================== --- trunk/src/obj_poly.c (revision 4916) +++ trunk/src/obj_poly.c (revision 4917) @@ -344,7 +344,7 @@ { POLYGONPOINT_LOOP(Polygon); { - MOVE(point->X, point->Y, DX, DY); + PCB_MOVE(point->X, point->Y, DX, DY); } END_LOOP; PCB_BOX_MOVE_LOWLEVEL(&Polygon->BoundingBox, DX, DY); @@ -374,7 +374,7 @@ ErasePolygon(Polygon); } r_delete_entry(Layer->polygon_tree, (pcb_box_t *) Polygon); - MOVE(Point->X, Point->Y, ctx->move.dx, ctx->move.dy); + PCB_MOVE(Point->X, Point->Y, ctx->move.dx, ctx->move.dy); SetPolygonBoundingBox(Polygon); r_insert_entry(Layer->polygon_tree, (pcb_box_t *) Polygon, 0); RemoveExcessPolygonPoints(Layer, Polygon); Index: trunk/src/obj_text.h =================================================================== --- trunk/src/obj_text.h (revision 4916) +++ trunk/src/obj_text.h (revision 4917) @@ -57,7 +57,7 @@ #define MOVE_TEXT_LOWLEVEL(t,dx,dy) \ { \ PCB_BOX_MOVE_LOWLEVEL(&((t)->BoundingBox),(dx),(dy)); \ - MOVE((t)->X, (t)->Y, (dx), (dy)); \ + PCB_MOVE((t)->X, (t)->Y, (dx), (dy)); \ } Index: trunk/src/object_act.c =================================================================== --- trunk/src/object_act.c (revision 4916) +++ trunk/src/object_act.c (revision 4917) @@ -351,7 +351,7 @@ } /* --------------------------------------------------------------------------- */ -static const char moveobject_syntax[] = "MoveObject(X,Y,dim)"; +static const char moveobject_syntax[] = "pcb_move_obj(X,Y,dim)"; static const char moveobject_help[] = "Moves the object under the crosshair."; @@ -392,7 +392,7 @@ LookupRubberbandLines(type, ptr1, ptr2, ptr3); if (type == PCB_TYPE_ELEMENT) LookupRatLines(type, ptr1, ptr2, ptr3); - MoveObjectAndRubberband(type, ptr1, ptr2, ptr3, nx, ny); + pcb_move_obj_and_rubberband(type, ptr1, ptr2, ptr3, nx, ny); SetChangedFlag(pcb_true); return 0; } @@ -423,7 +423,7 @@ gui->get_coords(_("Select an Object"), &x, &y); if ((type = SearchScreen(x, y, MOVETOLAYER_TYPES, &ptr1, &ptr2, &ptr3)) != PCB_TYPE_NONE) - if (MoveObjectToLayer(type, ptr1, ptr2, ptr3, CURRENT, pcb_false)) + if (pcb_move_obj_to_layer(type, ptr1, ptr2, ptr3, CURRENT, pcb_false)) SetChangedFlag(pcb_true); break; } @@ -430,7 +430,7 @@ case F_SelectedObjects: case F_Selected: - if (MoveSelectedObjectsToLayer(CURRENT)) + if (pcb_move_selected_objs_to_layer(CURRENT)) SetChangedFlag(pcb_true); break; } Index: trunk/src/undo.c =================================================================== --- trunk/src/undo.c (revision 4916) +++ trunk/src/undo.c (revision 4917) @@ -610,7 +610,7 @@ /* lookup entry by it's ID */ type = SearchObjectByID(PCB->Data, &ptr1, &ptr2, &ptr3, Entry->ID, Entry->Kind); if (type != PCB_TYPE_NONE) { - MoveObject(type, ptr1, ptr2, ptr3, -Entry->Data.Move.DX, -Entry->Data.Move.DY); + pcb_move_obj(type, ptr1, ptr2, ptr3, -Entry->Data.Move.DX, -Entry->Data.Move.DY); Entry->Data.Move.DX *= -1; Entry->Data.Move.DY *= -1; return (pcb_true); @@ -652,7 +652,7 @@ type = SearchObjectByID(PCB->Data, &ptr1, &ptr2, &ptr3, Entry->ID, Entry->Kind); if (type != PCB_TYPE_NONE) { swap = GetLayerNumber(PCB->Data, (pcb_layer_t *) ptr1); - MoveObjectToLayer(type, ptr1, ptr2, ptr3, LAYER_PTR(Entry->Data.MoveToLayer.OriginalLayer), pcb_true); + pcb_move_obj_to_layer(type, ptr1, ptr2, ptr3, LAYER_PTR(Entry->Data.MoveToLayer.OriginalLayer), pcb_true); Entry->Data.MoveToLayer.OriginalLayer = swap; return (pcb_true); } Index: trunk/src_plugins/distaligntext/distaligntext.c =================================================================== --- trunk/src_plugins/distaligntext/distaligntext.c (revision 4916) +++ trunk/src_plugins/distaligntext/distaligntext.c (revision 4917) @@ -382,7 +382,7 @@ dy = 0; else dx = 0; - MoveObject(PCB_TYPE_ELEMENT_NAME, element, text, text, dx, dy); + pcb_move_obj(PCB_TYPE_ELEMENT_NAME, element, text, text, dx, dy); changed = 1; } } @@ -408,7 +408,7 @@ dy = 0; else dx = 0; - MoveObject(PCB_TYPE_TEXT, layer, text, text, dx, dy); + pcb_move_obj(PCB_TYPE_TEXT, layer, text, text, dx, dy); changed = 1; } } @@ -589,7 +589,7 @@ * element is also PCB_TYPE_ELEMENT_NAME. For undo, this is * significant in search.c: SearchObjectByID. * - * MoveObject() is better as in aligntext(), but we + * pcb_move_obj() is better as in aligntext(), but we * didn't keep the element reference when sorting. */ MOVE_TEXT_LOWLEVEL(text, dx, dy); Index: trunk/src_plugins/djopt/djopt.c =================================================================== --- trunk/src_plugins/djopt/djopt.c (revision 4916) +++ trunk/src_plugins/djopt/djopt.c (revision 4917) @@ -679,7 +679,7 @@ ls = LAYER_PTR(l->layer); ld = LAYER_PTR(layer); - MoveObjectToLayer(PCB_TYPE_LINE, ls, l->line, 0, ld, 0); + pcb_move_obj_to_layer(PCB_TYPE_LINE, ls, l->line, 0, ld, 0); l->layer = layer; } @@ -750,7 +750,7 @@ c->y = y; via = c->via; if (via) { - MoveObject(PCB_TYPE_VIA, via, via, via, x - via->X, y - via->Y); + pcb_move_obj(PCB_TYPE_VIA, via, via, via, x - via->X, y - via->Y); dprintf("via move %#mD to %#mD\n", via->X, via->Y, x, y); } for (i = 0; i < c->n_lines; i++) { @@ -757,10 +757,10 @@ pcb_line_t *tl = c->lines[i]->line; if (tl) { if (c->lines[i]->s == c) { - MoveObject(PCB_TYPE_LINE_POINT, LAYER_PTR(c->lines[i]->layer), tl, &tl->Point1, x - (tl->Point1.X), y - (tl->Point1.Y)); + pcb_move_obj(PCB_TYPE_LINE_POINT, LAYER_PTR(c->lines[i]->layer), tl, &tl->Point1, x - (tl->Point1.X), y - (tl->Point1.Y)); } else { - MoveObject(PCB_TYPE_LINE_POINT, LAYER_PTR(c->lines[i]->layer), tl, &tl->Point2, x - (tl->Point2.X), y - (tl->Point2.Y)); + pcb_move_obj(PCB_TYPE_LINE_POINT, LAYER_PTR(c->lines[i]->layer), tl, &tl->Point2, x - (tl->Point2.X), y - (tl->Point2.Y)); } dprintf("Line %p moved to %#mD %#mD\n", (void *) tl, tl->Point1.X, tl->Point1.Y, tl->Point2.X, tl->Point2.Y); } @@ -852,7 +852,7 @@ add_line_to_corner(l, c); add_line_to_corner(ls, c); - MoveObject(PCB_TYPE_LINE_POINT, LAYER_PTR(l->layer), l->line, &l->line->Point2, + pcb_move_obj(PCB_TYPE_LINE_POINT, LAYER_PTR(l->layer), l->line, &l->line->Point2, c->x - (l->line->Point2.X), c->y - (l->line->Point2.Y)); return 1; Index: trunk/src_plugins/gpmi/pcb-gpmi/gpmi_plugin/gpmi_pkg/layout/object.c =================================================================== --- trunk/src_plugins/gpmi/pcb-gpmi/gpmi_plugin/gpmi_pkg/layout/object.c (revision 4916) +++ trunk/src_plugins/gpmi/pcb-gpmi/gpmi_plugin/gpmi_pkg/layout/object.c (revision 4917) @@ -92,7 +92,7 @@ case OM_LINE: switch(coord) { case OC_OBJ: - MoveObject (PCB_TYPE_LINE_POINT, CURRENT, obj->obj.l, &(obj->obj.l->Point2), dx, dy); + pcb_move_obj(PCB_TYPE_LINE_POINT, CURRENT, obj->obj.l, &(obj->obj.l->Point2), dx, dy); /* intended falltrough */ case OC_P1X: case OC_P1Y: what = &(obj->obj.l->Point1); break; @@ -101,21 +101,21 @@ default: /* we do not handle anything else for now */ ; } - MoveObject (PCB_TYPE_LINE_POINT, CURRENT, obj->obj.l, what, dx, dy); + pcb_move_obj(PCB_TYPE_LINE_POINT, CURRENT, obj->obj.l, what, dx, dy); return 0; case OM_TEXT: - MoveObject (PCB_TYPE_TEXT, CURRENT, obj->obj.t, obj->obj.t, dx, dy); + pcb_move_obj(PCB_TYPE_TEXT, CURRENT, obj->obj.t, obj->obj.t, dx, dy); return 0; case OM_VIA: - MoveObject (PCB_TYPE_VIA, obj->obj.v, obj->obj.v, obj->obj.v, dx, dy); + pcb_move_obj(PCB_TYPE_VIA, obj->obj.v, obj->obj.v, obj->obj.v, dx, dy); return 0; case OM_PIN: - MoveObject (PCB_TYPE_PIN, obj->obj.pin, obj->obj.pin, obj->obj.pin, dx, dy); + pcb_move_obj(PCB_TYPE_PIN, obj->obj.pin, obj->obj.pin, obj->obj.pin, dx, dy); return 0; case OM_ARC: switch(coord) { case OC_OBJ: - MoveObject (PCB_TYPE_ARC, CURRENT, obj->obj.a, obj->obj.a, dx, dy); + pcb_move_obj(PCB_TYPE_ARC, CURRENT, obj->obj.a, obj->obj.a, dx, dy); return 0; default: /* we do not handle anything else for now */ ; @@ -124,7 +124,7 @@ break; case OM_POLYGON: if (obj->layer != -1) { - MoveObject (PCB_TYPE_POLYGON, PCB->Data->Layer + obj->layer, obj->obj.p, obj->obj.p, dx, dy); + pcb_move_obj(PCB_TYPE_POLYGON, PCB->Data->Layer + obj->layer, obj->obj.p, obj->obj.p, dx, dy); return 0; } } Index: trunk/src_plugins/io_kicad/read.c =================================================================== --- trunk/src_plugins/io_kicad/read.c (revision 4916) +++ trunk/src_plugins/io_kicad/read.c (revision 4917) @@ -1281,7 +1281,7 @@ moduleName, moduleRefdes, moduleValue, moduleX, moduleY, direction, refdesScaling, TextFlags, pcb_false); /*pcb_flag_t TextFlags, pcb_bool uniqueName) */ - MoveObject(PCB_TYPE_ELEMENT_NAME, newModule, &newModule->Name[NAME_INDEX()], &newModule->Name[NAME_INDEX()], X, Y); + pcb_move_obj(PCB_TYPE_ELEMENT_NAME, newModule, &newModule->Name[NAME_INDEX()], &newModule->Name[NAME_INDEX()], X, Y); } } Index: trunk/src_plugins/puller/puller.c =================================================================== --- trunk/src_plugins/puller/puller.c (revision 4916) +++ trunk/src_plugins/puller/puller.c (revision 4917) @@ -471,7 +471,7 @@ x = the_arc->X - the_arc->Width * cos(d2r(arc_angle)) + 0.5; y = the_arc->Y + the_arc->Height * sin(d2r(arc_angle)) + 0.5; - MoveObject(PCB_TYPE_LINE_POINT, CURRENT, the_line, &(the_line->Point2), x - the_line->Point2.X, y - the_line->Point2.Y); + pcb_move_obj(PCB_TYPE_LINE_POINT, CURRENT, the_line, &(the_line->Point2), x - the_line->Point2.X, y - the_line->Point2.Y); gui->invalidate_all(); IncrementUndoSerialNumber(); @@ -1190,8 +1190,8 @@ x = line->Point1.X; y = line->Point1.Y; #if 1 - MoveObject(PCB_TYPE_LINE_POINT, CURRENT, line, &(line->Point1), line->Point2.X - line->Point1.X, line->Point2.Y - line->Point1.Y); - MoveObject(PCB_TYPE_LINE_POINT, CURRENT, line, &(line->Point2), x - line->Point2.X, y - line->Point2.Y); + pcb_move_obj(PCB_TYPE_LINE_POINT, CURRENT, line, &(line->Point1), line->Point2.X - line->Point1.X, line->Point2.Y - line->Point1.Y); + pcb_move_obj(PCB_TYPE_LINE_POINT, CURRENT, line, &(line->Point2), x - line->Point2.X, y - line->Point2.Y); #else /* In theory, we should be using the above so that undo works. */ line->Point1.X = line->Point2.X; @@ -1736,8 +1736,8 @@ fprintf(stderr, "double neg move?\n"); abort(); } - MoveObject(PCB_TYPE_LINE_POINT, CURRENT, l, &(l->Point1), -1 - l->Point1.X, -1 - l->Point1.Y); - MoveObject(PCB_TYPE_LINE_POINT, CURRENT, l, &(l->Point2), -1 - l->Point2.X, -1 - l->Point2.Y); + pcb_move_obj(PCB_TYPE_LINE_POINT, CURRENT, l, &(l->Point1), -1 - l->Point1.X, -1 - l->Point1.Y); + pcb_move_obj(PCB_TYPE_LINE_POINT, CURRENT, l, &(l->Point2), -1 - l->Point2.X, -1 - l->Point2.Y); #endif } @@ -2019,11 +2019,11 @@ ChangeArcAngles(CURRENT, start_arc, start_arc->StartAngle, new_delta); fix_arc_extra(start_arc, sarc_extra); - MoveObject(PCB_TYPE_LINE_POINT, CURRENT, start_line, &(start_line->Point1), + pcb_move_obj(PCB_TYPE_LINE_POINT, CURRENT, start_line, &(start_line->Point1), sarc_extra->end.x - start_line->Point1.X, sarc_extra->end.y - start_line->Point1.Y); if (del_arc) { - MoveObject(PCB_TYPE_LINE_POINT, CURRENT, start_line, &(start_line->Point1), + pcb_move_obj(PCB_TYPE_LINE_POINT, CURRENT, start_line, &(start_line->Point1), sarc_extra->start.x - start_line->Point1.X, sarc_extra->start.y - start_line->Point1.Y); mark_arc_for_deletion(start_arc); } @@ -2085,17 +2085,17 @@ ChangeArcAngles(CURRENT, end_arc, end_arc->StartAngle, new_delta); fix_arc_extra(end_arc, earc_extra); - MoveObject(PCB_TYPE_LINE_POINT, CURRENT, start_line, &(start_line->Point2), + pcb_move_obj(PCB_TYPE_LINE_POINT, CURRENT, start_line, &(start_line->Point2), earc_extra->end.x - start_line->Point2.X, earc_extra->end.y - start_line->Point2.Y); if (del_arc) { - MoveObject(PCB_TYPE_LINE_POINT, CURRENT, start_line, &(start_line->Point2), + pcb_move_obj(PCB_TYPE_LINE_POINT, CURRENT, start_line, &(start_line->Point2), earc_extra->start.x - start_line->Point2.X, earc_extra->start.y - start_line->Point2.Y); mark_arc_for_deletion(end_arc); } } else { - MoveObject(PCB_TYPE_LINE_POINT, CURRENT, start_line, &(start_line->Point2), + pcb_move_obj(PCB_TYPE_LINE_POINT, CURRENT, start_line, &(start_line->Point2), end_line->Point2.X - start_line->Point2.X, end_line->Point2.Y - start_line->Point2.Y); } mark_line_for_deletion(end_line); @@ -2129,7 +2129,7 @@ #if TRACE1 pcb_printf("new point %#mS\n", ex, ey); #endif - MoveObject(PCB_TYPE_LINE_POINT, CURRENT, end_line, &(end_line->Point1), ex - end_line->Point1.X, ey - end_line->Point1.Y); + pcb_move_obj(PCB_TYPE_LINE_POINT, CURRENT, end_line, &(end_line->Point1), ex - end_line->Point1.X, ey - end_line->Point1.Y); /* Step 4: Split start_line at the obstacle and insert a zero-delta arc at it. */ @@ -2142,7 +2142,7 @@ if (end_arc) earc_extra = ARC2EXTRA(end_arc); - MoveObject(PCB_TYPE_LINE_POINT, CURRENT, start_line, &(start_line->Point2), + pcb_move_obj(PCB_TYPE_LINE_POINT, CURRENT, start_line, &(start_line->Point2), new_aextra->start.x - start_line->Point2.X, new_aextra->start.y - start_line->Point2.Y); new_line = create_line(start_line, new_aextra->end.x, new_aextra->end.y, ex, ey);