Index: trunk/src/obj_arc.c
===================================================================
--- trunk/src/obj_arc.c	(revision 37862)
+++ trunk/src/obj_arc.c	(revision 37863)
@@ -239,12 +239,12 @@
 		new_sa = 0;
 	}
 	pcb_poly_restore_to_poly(PCB->Data, PCB_OBJ_ARC, Layer, a);
-	rnd_r_delete_entry(Layer->arc_tree, (rnd_box_t *) a);
+	rnd_rtree_delete(Layer->arc_tree, a, (rnd_rtree_box_t *)a);
 	pcb_undo_add_obj_to_change_angles(PCB_OBJ_ARC, a, a, a);
 	a->StartAngle = new_sa;
 	a->Delta = new_da;
 	pcb_arc_bbox(a);
-	rnd_r_insert_entry(Layer->arc_tree, (rnd_box_t *) a);
+	rnd_rtree_insert(Layer->arc_tree, a, (rnd_rtree_box_t *)a);
 	pcb_poly_clear_from_poly(PCB->Data, PCB_OBJ_ARC, Layer, a);
 }
 
@@ -252,12 +252,12 @@
 void pcb_arc_set_radii(pcb_layer_t *Layer, pcb_arc_t *a, rnd_coord_t new_width, rnd_coord_t new_height)
 {
 	pcb_poly_restore_to_poly(PCB->Data, PCB_OBJ_ARC, Layer, a);
-	rnd_r_delete_entry(Layer->arc_tree, (rnd_box_t *) a);
+	rnd_rtree_delete(Layer->arc_tree, a, (rnd_rtree_box_t *)a);
 	pcb_undo_add_obj_to_change_radii(PCB_OBJ_ARC, a, a, a);
 	a->Width = new_width;
 	a->Height = new_height;
 	pcb_arc_bbox(a);
-	rnd_r_insert_entry(Layer->arc_tree, (rnd_box_t *) a);
+	rnd_rtree_insert(Layer->arc_tree, a, (rnd_rtree_box_t *)a);
 	pcb_poly_clear_from_poly(PCB->Data, PCB_OBJ_ARC, Layer, a);
 }
 
@@ -349,7 +349,7 @@
 	pcb_arc_bbox(Arc);
 	if (!Layer->arc_tree)
 		Layer->arc_tree = rnd_r_create_tree();
-	rnd_r_insert_entry(Layer->arc_tree, (rnd_box_t *) Arc);
+	rnd_rtree_insert(Layer->arc_tree, Arc, (rnd_rtree_box_t *)Arc);
 	Arc->type = PCB_OBJ_ARC;
 	PCB_SET_PARENT(Arc, layer, Layer);
 }
@@ -359,7 +359,7 @@
 void pcb_arc_free(pcb_arc_t *arc)
 {
 	if ((arc->parent.layer != NULL) && (arc->parent.layer->arc_tree != NULL))
-		rnd_r_delete_entry(arc->parent.layer->arc_tree, (rnd_box_t *)arc);
+		rnd_rtree_delete(arc->parent.layer->arc_tree, arc, (rnd_rtree_box_t *)arc);
 	pcb_attribute_free(&arc->Attributes);
 	pcb_arc_unreg(arc);
 	pcb_obj_common_free((pcb_any_obj_t *)arc);
@@ -430,7 +430,7 @@
 	if (ly == NULL)
 		return;
 	if (ly->arc_tree != NULL)
-		rnd_r_delete_entry(ly->arc_tree, (rnd_box_t *)arc);
+		rnd_rtree_delete(ly->arc_tree, arc, (rnd_rtree_box_t *)arc);
 	pcb_poly_restore_to_poly(ly->parent.data, PCB_OBJ_ARC, ly, arc);
 }
 
@@ -440,7 +440,7 @@
 	if (ly == NULL)
 		return;
 	if (ly->arc_tree != NULL)
-		rnd_r_insert_entry(ly->arc_tree, (rnd_box_t *)arc);
+		rnd_rtree_insert(ly->arc_tree, arc, (rnd_rtree_box_t *)arc);
 	pcb_poly_clear_from_poly(ly->parent.data, PCB_OBJ_ARC, ly, arc);
 }
 
@@ -464,7 +464,7 @@
 	pcb_layer_t *layer = g->arc->parent.layer;
 
 	if (layer->arc_tree != NULL)
-		rnd_r_delete_entry(layer->arc_tree, (rnd_box_t *)g->arc);
+		rnd_rtree_delete(layer->arc_tree, g->arc, (rnd_rtree_box_t *)g->arc);
 	pcb_poly_restore_to_poly(layer->parent.data, PCB_OBJ_ARC, layer, g->arc);
 
 	rnd_swap(rnd_coord_t, g->Thickness, g->arc->Thickness);
@@ -478,7 +478,7 @@
 
 	pcb_arc_bbox(g->arc);
 	if (layer->arc_tree != NULL)
-		rnd_r_insert_entry(layer->arc_tree, (rnd_box_t *)g->arc);
+		rnd_rtree_insert(layer->arc_tree, g->arc, (rnd_rtree_box_t *)g->arc);
 	pcb_poly_clear_from_poly(layer->parent.data, PCB_OBJ_ARC, layer, g->arc);
 
 	return 0;
@@ -534,7 +534,7 @@
 	}
 
 	pcb_poly_restore_to_poly(ctx->buffer.src, PCB_OBJ_ARC, srcly, arc);
-	rnd_r_delete_entry(srcly->arc_tree, (rnd_box_t *) arc);
+	rnd_rtree_delete(srcly->arc_tree, arc, (rnd_rtree_box_t *)arc);
 
 	pcb_arc_unreg(arc);
 	pcb_arc_reg(dstly, arc);
@@ -543,7 +543,7 @@
 
 	if (!dstly->arc_tree)
 		dstly->arc_tree = rnd_r_create_tree();
-	rnd_r_insert_entry(dstly->arc_tree, (rnd_box_t *) arc);
+	rnd_rtree_insert(dstly->arc_tree, arc, (rnd_rtree_box_t *)arc);
 	pcb_poly_clear_from_poly(ctx->buffer.dst, PCB_OBJ_ARC, dstly, arc);
 
 	return arc;
@@ -564,11 +564,11 @@
 	if (value <= PCB_MAX_THICKNESS && value >= PCB_MIN_THICKNESS && value != Arc->Thickness) {
 		pcb_undo_add_obj_to_size(PCB_OBJ_ARC, Layer, Arc, Arc);
 		pcb_arc_invalidate_erase(Arc);
-		rnd_r_delete_entry(Layer->arc_tree, (rnd_box_t *) Arc);
+		rnd_rtree_delete(Layer->arc_tree, Arc, (rnd_rtree_box_t *)Arc);
 		pcb_poly_restore_to_poly(PCB->Data, PCB_OBJ_ARC, Layer, Arc);
 		Arc->Thickness = value;
 		pcb_arc_bbox(Arc);
-		rnd_r_insert_entry(Layer->arc_tree, (rnd_box_t *) Arc);
+		rnd_rtree_insert(Layer->arc_tree, Arc, (rnd_rtree_box_t *)Arc);
 		pcb_poly_clear_from_poly(PCB->Data, PCB_OBJ_ARC, Layer, Arc);
 		pcb_arc_invalidate_draw(Layer, Arc);
 		return Arc;
@@ -591,11 +591,11 @@
 	if (value != Arc->Clearance) {
 		pcb_undo_add_obj_to_clear_size(PCB_OBJ_ARC, Layer, Arc, Arc);
 		pcb_arc_invalidate_erase(Arc);
-		rnd_r_delete_entry(Layer->arc_tree, (rnd_box_t *) Arc);
+		rnd_rtree_delete(Layer->arc_tree, Arc, (rnd_rtree_box_t *)Arc);
 		pcb_poly_restore_to_poly(PCB->Data, PCB_OBJ_ARC, Layer, Arc);
 		Arc->Clearance = value;
 		pcb_arc_bbox(Arc);
-		rnd_r_insert_entry(Layer->arc_tree, (rnd_box_t *) Arc);
+		rnd_rtree_insert(Layer->arc_tree, Arc, (rnd_rtree_box_t *)Arc);
 		pcb_poly_clear_from_poly(PCB->Data, PCB_OBJ_ARC, Layer, Arc);
 		pcb_arc_invalidate_draw(Layer, Arc);
 		return Arc;
@@ -628,11 +628,11 @@
 	if (value != *dst) {
 		pcb_undo_add_obj_to_change_radii(PCB_OBJ_ARC, Layer, Arc, Arc);
 		pcb_arc_invalidate_erase(Arc);
-		rnd_r_delete_entry(Layer->arc_tree, (rnd_box_t *) Arc);
+		rnd_rtree_delete(Layer->arc_tree, Arc, (rnd_rtree_box_t *)Arc);
 		pcb_poly_restore_to_poly(PCB->Data, PCB_OBJ_ARC, Layer, Arc);
 		*dst = value;
 		pcb_arc_bbox(Arc);
-		rnd_r_insert_entry(Layer->arc_tree, (rnd_box_t *) Arc);
+		rnd_rtree_insert(Layer->arc_tree, Arc, (rnd_rtree_box_t *)Arc);
 		pcb_poly_clear_from_poly(PCB->Data, PCB_OBJ_ARC, Layer, Arc);
 		pcb_arc_invalidate_draw(Layer, Arc);
 		return Arc;
@@ -667,11 +667,11 @@
 	if (value != *dst) {
 		pcb_undo_add_obj_to_change_angles(PCB_OBJ_ARC, Layer, Arc, Arc);
 		pcb_arc_invalidate_erase(Arc);
-		rnd_r_delete_entry(Layer->arc_tree, (rnd_box_t *) Arc);
+		rnd_rtree_delete(Layer->arc_tree, Arc, (rnd_rtree_box_t *)Arc);
 		pcb_poly_restore_to_poly(PCB->Data, PCB_OBJ_ARC, Layer, Arc);
 		*dst = value;
 		pcb_arc_bbox(Arc);
-		rnd_r_insert_entry(Layer->arc_tree, (rnd_box_t *) Arc);
+		rnd_rtree_insert(Layer->arc_tree, Arc, (rnd_rtree_box_t *)Arc);
 		pcb_poly_clear_from_poly(PCB->Data, PCB_OBJ_ARC, Layer, Arc);
 		pcb_arc_invalidate_draw(Layer, Arc);
 		return Arc;
@@ -750,10 +750,10 @@
 
 void *pcb_arcop_move(pcb_opctx_t *ctx, pcb_layer_t *Layer, pcb_arc_t *Arc)
 {
-	rnd_r_delete_entry(Layer->arc_tree, (rnd_box_t *) Arc);
+	rnd_rtree_delete(Layer->arc_tree, Arc, (rnd_rtree_box_t *)Arc);
 	pcb_poly_restore_to_poly(PCB->Data, PCB_OBJ_ARC, Layer, Arc);
 	pcb_arcop_move_noclip(ctx, Layer, Arc);
-	rnd_r_insert_entry(Layer->arc_tree, (rnd_box_t *) Arc);
+	rnd_rtree_insert(Layer->arc_tree, Arc, (rnd_rtree_box_t *)Arc);
 	pcb_poly_clear_from_poly(PCB->Data, PCB_OBJ_ARC, Layer, Arc);
 	return Arc;
 }
@@ -761,11 +761,11 @@
 void *pcb_arcop_clip(pcb_opctx_t *ctx, pcb_layer_t *Layer, pcb_arc_t *Arc)
 {
 	if (ctx->clip.restore) {
-		rnd_r_delete_entry(Layer->arc_tree, (rnd_box_t *) Arc);
+		rnd_rtree_delete(Layer->arc_tree, Arc, (rnd_rtree_box_t *)Arc);
 		pcb_poly_restore_to_poly(PCB->Data, PCB_OBJ_ARC, Layer, Arc);
 	}
 	if (ctx->clip.clear) {
-		rnd_r_insert_entry(Layer->arc_tree, (rnd_box_t *) Arc);
+		rnd_rtree_insert(Layer->arc_tree, Arc, (rnd_rtree_box_t *)Arc);
 		pcb_poly_clear_from_poly(PCB->Data, PCB_OBJ_ARC, Layer, Arc);
 	}
 	return Arc;
@@ -774,7 +774,7 @@
 /* moves an arc between layers; lowlevel routines */
 void *pcb_arcop_move_to_layer_low(pcb_opctx_t *ctx, pcb_layer_t * Source, pcb_arc_t * arc, pcb_layer_t * Destination)
 {
-	rnd_r_delete_entry(Source->arc_tree, (rnd_box_t *) arc);
+	rnd_rtree_delete(Source->arc_tree, arc, (rnd_rtree_box_t *)arc);
 
 	pcb_arc_unreg(arc);
 	pcb_arc_reg(Destination, arc);
@@ -781,7 +781,7 @@
 
 	if (!Destination->arc_tree)
 		Destination->arc_tree = rnd_r_create_tree();
-	rnd_r_insert_entry(Destination->arc_tree, (rnd_box_t *) arc);
+	rnd_rtree_insert(Destination->arc_tree, arc, (rnd_rtree_box_t *)arc);
 
 	return arc;
 }
@@ -814,7 +814,7 @@
 /* destroys an arc from a layer */
 void *pcb_arcop_destroy(pcb_opctx_t *ctx, pcb_layer_t *Layer, pcb_arc_t *Arc)
 {
-	rnd_r_delete_entry(Layer->arc_tree, (rnd_box_t *) Arc);
+	rnd_rtree_delete(Layer->arc_tree, Arc, (rnd_rtree_box_t *)Arc);
 
 	pcb_arc_free(Arc);
 	return NULL;
@@ -871,11 +871,11 @@
 void pcb_arc_rotate(pcb_layer_t *layer, pcb_arc_t *arc, rnd_coord_t X, rnd_coord_t Y, double cosa, double sina, rnd_angle_t angle)
 {
 	if (layer->arc_tree != NULL)
-		rnd_r_delete_entry(layer->arc_tree, (rnd_box_t *) arc);
+		rnd_rtree_delete(layer->arc_tree, arc, (rnd_rtree_box_t *)arc);
 	rnd_rotate(&arc->X, &arc->Y, X, Y, cosa, sina);
 	arc->StartAngle = rnd_normalize_angle(arc->StartAngle + angle);
 	if (layer->arc_tree != NULL)
-		rnd_r_insert_entry(layer->arc_tree, (rnd_box_t *) arc);
+		rnd_rtree_insert(layer->arc_tree, arc, (rnd_rtree_box_t *)arc);
 }
 
 void pcb_arc_mirror(pcb_arc_t *arc, rnd_coord_t y_offs, rnd_bool undoable)
@@ -900,13 +900,13 @@
 
 void pcb_arc_flip_side(pcb_layer_t *layer, pcb_arc_t *arc)
 {
-	rnd_r_delete_entry(layer->arc_tree, (rnd_box_t *) arc);
+	rnd_rtree_delete(layer->arc_tree, arc, (rnd_rtree_box_t *)arc);
 	arc->X = PCB_SWAP_X(arc->X);
 	arc->Y = PCB_SWAP_Y(arc->Y);
 	arc->StartAngle = RND_SWAP_ANGLE(arc->StartAngle);
 	arc->Delta = RND_SWAP_DELTA(arc->Delta);
 	pcb_arc_bbox(arc);
-	rnd_r_insert_entry(layer->arc_tree, (rnd_box_t *) arc);
+	rnd_rtree_insert(layer->arc_tree, arc, (rnd_rtree_box_t *)arc);
 }
 
 void pcb_arc_scale(pcb_arc_t *arc, double sx, double sy, double sth)
@@ -940,10 +940,10 @@
 	pcb_arc_invalidate_erase(Arc);
 	pcb_poly_restore_to_poly(PCB->Data, PCB_OBJ_ARC, Layer, Arc);
 	if (Layer->arc_tree != NULL)
-		rnd_r_delete_entry(Layer->arc_tree, (rnd_box_t *) Arc);
+		rnd_rtree_delete(Layer->arc_tree, Arc, (rnd_rtree_box_t *)Arc);
 	pcb_arc_rotate90(Arc, ctx->rotate.center_x, ctx->rotate.center_y, ctx->rotate.number);
 	if (Layer->arc_tree != NULL)
-		rnd_r_insert_entry(Layer->arc_tree, (rnd_box_t *) Arc);
+		rnd_rtree_insert(Layer->arc_tree, Arc, (rnd_rtree_box_t *)Arc);
 	pcb_poly_clear_from_poly(PCB->Data, PCB_OBJ_ARC, Layer, Arc);
 	pcb_arc_invalidate_draw(Layer, Arc);
 	return Arc;