Index: trunk/src/action_helper.c
===================================================================
--- trunk/src/action_helper.c	(revision 4830)
+++ trunk/src/action_helper.c	(revision 4831)
@@ -447,10 +447,7 @@
 	}
 }
 
-/* ---------------------------------------------------------------------------
- * adjusts the objects which are to be created like attached lines...
- */
-void AdjustAttachedObjects(void)
+void pcb_adjust_attached_objects(void)
 {
 	pcb_point_t *pnt;
 	switch (conf_core.editor.mode) {
@@ -1258,19 +1255,13 @@
 	}
 }
 
-/* ---------------------------------------------------------------------------
- * !!! no action routine !!!
- *
- * event handler to set the cursor according to the X pointer position
- * called from inside main.c
- */
-void EventMoveCrosshair(int ev_x, int ev_y)
+void pcb_event_move_crosshair(int ev_x, int ev_y)
 {
 	if (mid_stroke)
 		stub_stroke_record(ev_x, ev_y);
 	if (MoveCrosshairAbsolute(ev_x, ev_y)) {
 		/* update object position and cursor location */
-		AdjustAttachedObjects();
+		pcb_adjust_attached_objects();
 		notify_crosshair_change(pcb_true);
 	}
 }
Index: trunk/src/action_helper.h
===================================================================
--- trunk/src/action_helper.h	(revision 4830)
+++ trunk/src/action_helper.h	(revision 4831)
@@ -33,9 +33,12 @@
 
 #define CLONE_TYPES PCB_TYPE_LINE | PCB_TYPE_ARC | PCB_TYPE_VIA | PCB_TYPE_POLYGON
 
-void EventMoveCrosshair(int, int);
+/* Event handler to set the cursor according to the X pointer position
+   called from inside main.c */
+void pcb_event_move_crosshair(int ev_x, int ev_y);
 
-void AdjustAttachedObjects(void);
+/* adjusts the objects which are to be created like attached lines... */
+void pcb_adjust_attached_objects(void);
 
 void warpNoWhere(void);
 
Index: trunk/src/gui_act.c
===================================================================
--- trunk/src/gui_act.c	(revision 4830)
+++ trunk/src/gui_act.c	(revision 4831)
@@ -275,7 +275,7 @@
 			/* toggle line-adjust flag */
 		case F_ToggleAllDirections:
 			conf_toggle_editor(all_direction_lines);
-			AdjustAttachedObjects();
+			pcb_adjust_attached_objects();
 			break;
 
 		case F_CycleClip:
@@ -287,7 +287,7 @@
 			else {
 				conf_setf(CFR_DESIGN,"editor/line_refraction",-1,"%d",(conf_core.editor.line_refraction +1) % 3);
 			}
-			AdjustAttachedObjects();
+			pcb_adjust_attached_objects();
 			notify_crosshair_change(pcb_true);
 			break;
 
Index: trunk/src/set.c
===================================================================
--- trunk/src/set.c	(revision 4830)
+++ trunk/src/set.c	(revision 4831)
@@ -209,7 +209,7 @@
 		Crosshair.AttachedBox.State = STATE_SECOND;
 		Crosshair.AttachedBox.Point1.X = Crosshair.AttachedBox.Point2.X = Crosshair.AttachedLine.Point1.X;
 		Crosshair.AttachedBox.Point1.Y = Crosshair.AttachedBox.Point2.Y = Crosshair.AttachedLine.Point1.Y;
-		AdjustAttachedObjects();
+		pcb_adjust_attached_objects();
 	}
 	else if (conf_core.editor.mode == PCB_MODE_ARC && Mode == PCB_MODE_LINE && Crosshair.AttachedBox.State != STATE_FIRST) {
 		Crosshair.AttachedBox.State = STATE_FIRST;
@@ -218,7 +218,7 @@
 		Crosshair.AttachedLine.Point1.Y = Crosshair.AttachedLine.Point2.Y = Crosshair.AttachedBox.Point1.Y;
 		sprintf(sMode, "%d", Mode);
 		conf_set(CFR_DESIGN, "editor/mode", -1, sMode, POL_OVERWRITE);
-		AdjustAttachedObjects();
+		pcb_adjust_attached_objects();
 	}
 	else {
 		if (conf_core.editor.mode == PCB_MODE_ARC || conf_core.editor.mode == PCB_MODE_LINE)
Index: trunk/src/undo_act.c
===================================================================
--- trunk/src/undo_act.c	(revision 4830)
+++ trunk/src/undo_act.c	(revision 4831)
@@ -191,7 +191,7 @@
 					Crosshair.AttachedLine.Point1.Y = Crosshair.AttachedLine.Point2.Y = ptr2->Point2.Y;
 				}
 				FitCrosshairIntoGrid(Crosshair.X, Crosshair.Y);
-				AdjustAttachedObjects();
+				pcb_adjust_attached_objects();
 				if (--addedLines == 0) {
 					Crosshair.AttachedLine.State = STATE_SECOND;
 					lastLayer = CURRENT;
@@ -222,7 +222,7 @@
 				bx = GetArcEnds((pcb_arc_t *) ptr2);
 				Crosshair.AttachedBox.Point1.X = Crosshair.AttachedBox.Point2.X = bx->X1;
 				Crosshair.AttachedBox.Point1.Y = Crosshair.AttachedBox.Point2.Y = bx->Y1;
-				AdjustAttachedObjects();
+				pcb_adjust_attached_objects();
 				if (--addedLines == 0)
 					Crosshair.AttachedBox.State = STATE_SECOND;
 			}
Index: trunk/src_plugins/hid_gtk/gtkhid-main.c
===================================================================
--- trunk/src_plugins/hid_gtk/gtkhid-main.c	(revision 4830)
+++ trunk/src_plugins/hid_gtk/gtkhid-main.c	(revision 4831)
@@ -1601,7 +1601,7 @@
 	if (!conf_core.editor.view.flip_y)
 		dy = -dy;
 
-	EventMoveCrosshair(Crosshair.X + dx, Crosshair.Y + dy);
+	pcb_event_move_crosshair(Crosshair.X + dx, Crosshair.Y + dy);
 	gui->set_crosshair(Crosshair.X, Crosshair.Y, pan_warp);
 
 	return 0;
Index: trunk/src_plugins/hid_gtk/gui-output-events.c
===================================================================
--- trunk/src_plugins/hid_gtk/gui-output-events.c	(revision 4830)
+++ trunk/src_plugins/hid_gtk/gui-output-events.c	(revision 4831)
@@ -123,7 +123,7 @@
 
 	ghid_event_to_pcb_coords(event_x, event_y, &gport->pcb_x, &gport->pcb_y);
 
-	EventMoveCrosshair(gport->pcb_x, gport->pcb_y);
+	pcb_event_move_crosshair(gport->pcb_x, gport->pcb_y);
 	ghid_set_cursor_position_labels();
 }
 
@@ -146,7 +146,7 @@
 	if (ghid_is_modifier_key_sym(ksym))
 		ghid_note_event_location(NULL);
 
-	AdjustAttachedObjects();
+	pcb_adjust_attached_objects();
 	ghid_invalidate_all();
 	g_idle_add(ghid_idle_cb, NULL);
 	return FALSE;
@@ -243,7 +243,7 @@
 
 	hid_cfg_mouse_action(&ghid_mouse, ghid_mouse_button(ev->button) | mk | M_Release);
 
-	AdjustAttachedObjects();
+	pcb_adjust_attached_objects();
 	ghid_invalidate_all();
 
 	ghid_window_set_name_label(PCB->Name);
Index: trunk/src_plugins/hid_gtk/gui-top-window.c
===================================================================
--- trunk/src_plugins/hid_gtk/gui-top-window.c	(revision 4830)
+++ trunk/src_plugins/hid_gtk/gui-top-window.c	(revision 4831)
@@ -284,7 +284,7 @@
 	ghid_mode_buttons_update();
 
 	/* Sync gui status display with pcb state */
-	AdjustAttachedObjects();
+	pcb_adjust_attached_objects();
 	ghid_invalidate_all();
 	ghid_window_set_name_label(PCB->Name);
 	ghid_set_status_line_label();
Index: trunk/src_plugins/hid_lesstif/main.c
===================================================================
--- trunk/src_plugins/hid_lesstif/main.c	(revision 4830)
+++ trunk/src_plugins/hid_lesstif/main.c	(revision 4831)
@@ -863,7 +863,7 @@
 	if (!conf_core.editor.view.flip_y)
 		dy = -dy;
 
-	EventMoveCrosshair(Crosshair.X + dx, Crosshair.Y + dy);
+	pcb_event_move_crosshair(Crosshair.X + dx, Crosshair.Y + dy);
 	gui->set_crosshair(Crosshair.X, Crosshair.Y, pan_warp);
 
 	return 0;
@@ -1257,8 +1257,8 @@
 	notify_crosshair_change(pcb_false);
 	if (panning)
 		Pan(2, e->x, e->y);
-	EventMoveCrosshair(Px(e->x), Py(e->y));
-	AdjustAttachedObjects();
+	pcb_event_move_crosshair(Px(e->x), Py(e->y));
+	pcb_adjust_attached_objects();
 	notify_crosshair_change(pcb_true);
 	in_move_event = 0;
 }
@@ -1355,7 +1355,7 @@
 			in_move_event = 1;
 			if (panning)
 				Pan(2, pos_x, pos_y);
-			EventMoveCrosshair(Px(pos_x), Py(pos_y));
+			pcb_event_move_crosshair(Px(pos_x), Py(pos_y));
 			in_move_event = 0;
 		}
 		break;
@@ -1369,7 +1369,7 @@
 	case EnterNotify:
 		crosshair_in_window = 1;
 		in_move_event = 1;
-		EventMoveCrosshair(Px(e->xcrossing.x), Py(e->xcrossing.y));
+		pcb_event_move_crosshair(Px(e->xcrossing.x), Py(e->xcrossing.y));
 		ShowCrosshair(pcb_true);
 		in_move_event = 0;
 		need_idle_proc();