2.5 -

Renaming operators to follow new naming convention set out by Ton

6 files changed, 135 insertions, 148 deletions

diff --git a/source/blender/editors/animation/anim_markers.c b/source/blender/editors/animation/anim_markers.c
index e6f225dd0f7..b8a4436dedf 100644
--- a/source/blender/editors/animation/anim_markers.c
+++ b/source/blender/editors/animation/anim_markers.c
@@ -206,11 +206,11 @@ static int ed_marker_add(bContext *C, wmOperator *op)
 	return OPERATOR_FINISHED;
 }
 
-static void ED_MARKER_OT_add(wmOperatorType *ot)
+static void MARKER_OT_add(wmOperatorType *ot)
 {
 	/* identifiers */
 	ot->name= "Add Time Marker";
-	ot->idname= "ED_MARKER_OT_add";
+	ot->idname= "MARKER_OT_add";
 	
 	/* api callbacks */
 	ot->exec= ed_marker_add;
@@ -471,14 +471,14 @@ static int ed_marker_move_exec(bContext *C, wmOperator *op)
 		ed_marker_move_exit(C, op);
 		return OPERATOR_FINISHED;
 	}
-	return OPERATOR_CANCELLED;
+	return OPERATOR_PASS_THROUGH;
 }
 
-static void ED_MARKER_OT_move(wmOperatorType *ot)
+static void MARKER_OT_move(wmOperatorType *ot)
 {
 	/* identifiers */
 	ot->name= "Move Time Marker";
-	ot->idname= "ED_MARKER_OT_move";
+	ot->idname= "MARKER_OT_move";
 	
 	/* api callbacks */
 	ot->exec= ed_marker_move_exec;
@@ -548,11 +548,11 @@ static int ed_marker_duplicate_invoke(bContext *C, wmOperator *op, wmEvent *evt)
 	return ed_marker_move_invoke(C, op, evt);
 }
 
-static void ED_MARKER_OT_duplicate(wmOperatorType *ot)
+static void MARKER_OT_duplicate(wmOperatorType *ot)
 {
 	/* identifiers */
 	ot->name= "Duplicate Time Marker";
-	ot->idname= "ED_MARKER_OT_duplicate";
+	ot->idname= "MARKER_OT_duplicate";
 	
 	/* api callbacks */
 	ot->exec= ed_marker_duplicate_exec;
@@ -638,22 +638,22 @@ static int ed_marker_select_invoke(bContext *C, wmOperator *op, wmEvent *evt)
 	return ed_marker_select(C, evt, 0);
 }
 
-static void ED_MARKER_OT_mouseselect(wmOperatorType *ot)
+static void MARKER_OT_mouseselect(wmOperatorType *ot)
 {
 	/* identifiers */
 	ot->name= "Select Time Marker";
-	ot->idname= "ED_MARKER_OT_mouseselect";
+	ot->idname= "MARKER_OT_mouseselect";
 	
 	/* api callbacks */
 	ot->invoke= ed_marker_select_invoke;
 	ot->poll= ED_operator_areaactive;
 }
 
-static void ED_MARKER_OT_mouseselect_extend(wmOperatorType *ot)
+static void MARKER_OT_mouseselect_extend(wmOperatorType *ot)
 {
 	/* identifiers */
 	ot->name= "Extend Select Time Marker";
-	ot->idname= "ED_MARKER_OT_mouseselect_extend";
+	ot->idname= "MARKER_OT_mouseselect_extend";
 	
 	/* api callbacks */
 	ot->invoke= ed_marker_select_extend_invoke;
@@ -721,11 +721,11 @@ static int ed_marker_border_select_exec(bContext *C, wmOperator *op)
 	return 1;
 }
 
-static void ED_MARKER_OT_border_select(wmOperatorType *ot)
+static void MARKER_OT_border_select(wmOperatorType *ot)
 {
 	/* identifiers */
 	ot->name= "Marker Border select";
-	ot->idname= "ED_MARKER_OT_border_select";
+	ot->idname= "MARKER_OT_border_select";
 	
 	/* api callbacks */
 	ot->exec= ed_marker_border_select_exec;
@@ -781,11 +781,11 @@ static int ed_marker_select_all_invoke(bContext *C, wmOperator *op, wmEvent *evt
 	return ed_marker_select_all_exec(C, op);
 }
 
-static void ED_MARKER_OT_select_all(wmOperatorType *ot)
+static void MARKER_OT_select_all(wmOperatorType *ot)
 {
 	/* identifiers */
 	ot->name= "(De)select all markers";
-	ot->idname= "ED_MARKER_OT_select_all";
+	ot->idname= "MARKER_OT_select_all";
 	
 	/* api callbacks */
 	ot->exec= ed_marker_select_all_exec;
@@ -822,11 +822,11 @@ static int ed_marker_delete_exec(bContext *C, wmOperator *op)
 }
 
 
-static void ED_MARKER_OT_delete(wmOperatorType *ot)
+static void MARKER_OT_delete(wmOperatorType *ot)
 {
 	/* identifiers */
 	ot->name= "Delete Markers";
-	ot->idname= "ED_MARKER_OT_delete";
+	ot->idname= "MARKER_OT_delete";
 	
 	/* api callbacks */
 	ot->invoke= WM_operator_confirm;
@@ -840,14 +840,14 @@ static void ED_MARKER_OT_delete(wmOperatorType *ot)
 /* called in screen_ops.c:ED_operatortypes_screen() */
 void ED_marker_operatortypes(void)
 {
-	WM_operatortype_append(ED_MARKER_OT_add);
-	WM_operatortype_append(ED_MARKER_OT_move);
-	WM_operatortype_append(ED_MARKER_OT_duplicate);
-	WM_operatortype_append(ED_MARKER_OT_mouseselect);
-	WM_operatortype_append(ED_MARKER_OT_mouseselect_extend);
-	WM_operatortype_append(ED_MARKER_OT_border_select);
-	WM_operatortype_append(ED_MARKER_OT_select_all);
-	WM_operatortype_append(ED_MARKER_OT_delete);
+	WM_operatortype_append(MARKER_OT_add);
+	WM_operatortype_append(MARKER_OT_move);
+	WM_operatortype_append(MARKER_OT_duplicate);
+	WM_operatortype_append(MARKER_OT_mouseselect);
+	WM_operatortype_append(MARKER_OT_mouseselect_extend);
+	WM_operatortype_append(MARKER_OT_border_select);
+	WM_operatortype_append(MARKER_OT_select_all);
+	WM_operatortype_append(MARKER_OT_delete);
 }
 
 /* called in screen_ops.c:ED_keymap_screen() */
@@ -855,16 +855,16 @@ void ED_marker_keymap(wmWindowManager *wm)
 {
 	ListBase *keymap= WM_keymap_listbase(wm, "Markers", 0, 0);
 	
-	WM_keymap_verify_item(keymap, "ED_MARKER_OT_add", MKEY, KM_PRESS, 0, 0);
-	WM_keymap_verify_item(keymap, "ED_MARKER_OT_move", EVT_TWEAK_R, KM_ANY, 0, 0);
-	WM_keymap_verify_item(keymap, "ED_MARKER_OT_duplicate", DKEY, KM_PRESS, KM_SHIFT, 0);
-	WM_keymap_verify_item(keymap, "ED_MARKER_OT_mouseselect", RIGHTMOUSE, KM_PRESS, 0, 0);
-	WM_keymap_verify_item(keymap, "ED_MARKER_OT_mouseselect_extend", RIGHTMOUSE, KM_PRESS, KM_SHIFT, 0);
-	WM_keymap_verify_item(keymap, "ED_MARKER_OT_border_select", BKEY, KM_PRESS, 0, 0);
-	WM_keymap_verify_item(keymap, "ED_MARKER_OT_select_all", AKEY, KM_PRESS, 0, 0);
-	WM_keymap_verify_item(keymap, "ED_MARKER_OT_delete", XKEY, KM_PRESS, 0, 0);
+	WM_keymap_verify_item(keymap, "MARKER_OT_add", MKEY, KM_PRESS, 0, 0);
+	WM_keymap_verify_item(keymap, "MARKER_OT_move", EVT_TWEAK_R, KM_ANY, 0, 0);
+	WM_keymap_verify_item(keymap, "MARKER_OT_duplicate", DKEY, KM_PRESS, KM_SHIFT, 0);
+	WM_keymap_verify_item(keymap, "MARKER_OT_mouseselect", RIGHTMOUSE, KM_PRESS, 0, 0);
+	WM_keymap_verify_item(keymap, "MARKER_OT_mouseselect_extend", RIGHTMOUSE, KM_PRESS, KM_SHIFT, 0);
+	WM_keymap_verify_item(keymap, "MARKER_OT_border_select", BKEY, KM_PRESS, 0, 0);
+	WM_keymap_verify_item(keymap, "MARKER_OT_select_all", AKEY, KM_PRESS, 0, 0);
+	WM_keymap_verify_item(keymap, "MARKER_OT_delete", XKEY, KM_PRESS, 0, 0);
 	
-	WM_keymap_add_item(keymap, "ED_MARKER_OT_move", GKEY, KM_PRESS, 0, 0);
+	WM_keymap_add_item(keymap, "MARKER_OT_move", GKEY, KM_PRESS, 0, 0);
 	
 	/* generates event, in end to make select work */
 	WM_keymap_verify_item(keymap, "WM_OT_tweak_gesture", RIGHTMOUSE, KM_PRESS, 0, 0);
diff --git a/source/blender/editors/animation/anim_ops.c b/source/blender/editors/animation/anim_ops.c
index be3ab0502c4..2a877253fa6 100644
--- a/source/blender/editors/animation/anim_ops.c
+++ b/source/blender/editors/animation/anim_ops.c
@@ -201,13 +201,13 @@ static int change_frame_modal(bContext *C, wmOperator *op, wmEvent *event)
 	return OPERATOR_RUNNING_MODAL;
 }
 
-void ED_ANIM_OT_change_frame(wmOperatorType *ot)
+void ANIM_OT_change_frame(wmOperatorType *ot)
 {
 	PropertyRNA *prop;
 
 	/* identifiers */
 	ot->name= "Change frame";
-	ot->idname= "ED_ANIM_OT_change_frame";
+	ot->idname= "ANIM_OT_change_frame";
 	
 	/* api callbacks */
 	ot->exec= change_frame_exec;
@@ -252,11 +252,11 @@ static int previewrange_define_exec(bContext *C, wmOperator *op)
 	return OPERATOR_FINISHED;
 } 
 
-void ED_ANIM_OT_previewrange_define(wmOperatorType *ot)
+void ANIM_OT_previewrange_define(wmOperatorType *ot)
 {
 	/* identifiers */
 	ot->name= "Set Preview Range";
-	ot->idname= "ED_ANIM_OT_previewrange_define";
+	ot->idname= "ANIM_OT_previewrange_define";
 	
 	/* api callbacks */
 	ot->invoke= WM_border_select_invoke;
@@ -296,11 +296,11 @@ static int previewrange_clear_exec(bContext *C, wmOperator *op)
 	return OPERATOR_FINISHED;
 } 
 
-void ED_ANIM_OT_previewrange_clear(wmOperatorType *ot)
+void ANIM_OT_previewrange_clear(wmOperatorType *ot)
 {
 	/* identifiers */
 	ot->name= "Clear Preview Range";
-	ot->idname= "ED_ANIM_OT_previewrange_clear";
+	ot->idname= "ANIM_OT_previewrange_clear";
 	
 	/* api callbacks */
 	ot->exec= previewrange_clear_exec;
@@ -358,11 +358,11 @@ static int toggle_time_exec(bContext *C, wmOperator *op)
 	return OPERATOR_FINISHED;
 }
 
-void ED_ANIM_OT_toggle_time(wmOperatorType *ot)
+void ANIM_OT_toggle_time(wmOperatorType *ot)
 {
 	/* identifiers */
 	ot->name= "Toggle Frames/Seconds";
-	ot->idname= "ED_ANIM_OT_toggle_time";
+	ot->idname= "ANIM_OT_toggle_time";
 	
 	/* api callbacks */
 	ot->exec= toggle_time_exec;
@@ -372,22 +372,22 @@ void ED_ANIM_OT_toggle_time(wmOperatorType *ot)
 
 void ED_operatortypes_anim(void)
 {
-	WM_operatortype_append(ED_ANIM_OT_change_frame);
-	WM_operatortype_append(ED_ANIM_OT_toggle_time);
+	WM_operatortype_append(ANIM_OT_change_frame);
+	WM_operatortype_append(ANIM_OT_toggle_time);
 	
-	WM_operatortype_append(ED_ANIM_OT_previewrange_define);
-	WM_operatortype_append(ED_ANIM_OT_previewrange_clear);
+	WM_operatortype_append(ANIM_OT_previewrange_define);
+	WM_operatortype_append(ANIM_OT_previewrange_clear);
 }
 
 void ED_keymap_anim(wmWindowManager *wm)
 {
 	ListBase *keymap= WM_keymap_listbase(wm, "Animation", 0, 0);
 	
-	WM_keymap_verify_item(keymap, "ED_ANIM_OT_change_frame", LEFTMOUSE, KM_PRESS, 0, 0);
-	WM_keymap_verify_item(keymap, "ED_ANIM_OT_toggle_time", TKEY, KM_PRESS, 0, 0);
+	WM_keymap_verify_item(keymap, "ANIM_OT_change_frame", LEFTMOUSE, KM_PRESS, 0, 0);
+	WM_keymap_verify_item(keymap, "ANIM_OT_toggle_time", TKEY, KM_PRESS, 0, 0);
 	
 		/* preview range */
-	WM_keymap_verify_item(keymap, "ED_ANIM_OT_previewrange_define", PKEY, KM_PRESS, KM_CTRL, 0);
-	WM_keymap_verify_item(keymap, "ED_ANIM_OT_previewrange_clear", PKEY, KM_PRESS, KM_ALT, 0);
+	WM_keymap_verify_item(keymap, "ANIM_OT_previewrange_define", PKEY, KM_PRESS, KM_CTRL, 0);
+	WM_keymap_verify_item(keymap, "ANIM_OT_previewrange_clear", PKEY, KM_PRESS, KM_ALT, 0);
 }
 
diff --git a/source/blender/editors/interface/view2d_ops.c b/source/blender/editors/interface/view2d_ops.c
index a200c432bd3..11af9b26bb4 100644
--- a/source/blender/editors/interface/view2d_ops.c
+++ b/source/blender/editors/interface/view2d_ops.c
@@ -234,13 +234,11 @@ static int view_pan_modal(bContext *C, wmOperator *op, wmEvent *event)
 	return OPERATOR_RUNNING_MODAL;
 }
 
-void ED_View2D_OT_view_pan(wmOperatorType *ot)
+void View2D_OT_view_pan(wmOperatorType *ot)
 {
-	PropertyRNA *prop;
-	
 	/* identifiers */
 	ot->name= "Pan View";
-	ot->idname= "ED_View2D_OT_view_pan";
+	ot->idname= "View2D_OT_view_pan";
 	
 	/* api callbacks */
 	ot->exec= view_pan_exec;
@@ -251,8 +249,8 @@ void ED_View2D_OT_view_pan(wmOperatorType *ot)
 	ot->flag= OPTYPE_REGISTER;
 	
 	/* rna - must keep these in sync with the other operators */
-	prop= RNA_def_property(ot->srna, "deltax", PROP_INT, PROP_NONE);
-	prop= RNA_def_property(ot->srna, "deltay", PROP_INT, PROP_NONE);
+	RNA_def_property(ot->srna, "deltax", PROP_INT, PROP_NONE);
+	RNA_def_property(ot->srna, "deltay", PROP_INT, PROP_NONE);
 }
 
 /* ------------------ Scrollwheel Versions (2) ---------------------- */
@@ -275,13 +273,11 @@ static int view_scrollright_exec(bContext *C, wmOperator *op)
 	return OPERATOR_FINISHED;
 }
 
-void ED_View2D_OT_view_scrollright(wmOperatorType *ot)
+void View2D_OT_view_scrollright(wmOperatorType *ot)
 {
-	PropertyRNA *prop;
-	
 	/* identifiers */
 	ot->name= "Scroll Right";
-	ot->idname= "ED_View2D_OT_view_rightscroll";
+	ot->idname= "View2D_OT_view_rightscroll";
 	
 	/* api callbacks */
 	ot->exec= view_scrollright_exec;
@@ -290,8 +286,8 @@ void ED_View2D_OT_view_scrollright(wmOperatorType *ot)
 	ot->flag= OPTYPE_REGISTER;
 	
 	/* rna - must keep these in sync with the other operators */
-	prop= RNA_def_property(ot->srna, "deltax", PROP_INT, PROP_NONE);
-	prop= RNA_def_property(ot->srna, "deltay", PROP_INT, PROP_NONE);
+	RNA_def_property(ot->srna, "deltax", PROP_INT, PROP_NONE);
+	RNA_def_property(ot->srna, "deltay", PROP_INT, PROP_NONE);
 }
 
 
@@ -314,13 +310,11 @@ static int view_scrollleft_exec(bContext *C, wmOperator *op)
 	return OPERATOR_FINISHED;
 }
 
-void ED_View2D_OT_view_scrollleft(wmOperatorType *ot)
+void View2D_OT_view_scrollleft(wmOperatorType *ot)
 {
-	PropertyRNA *prop;
-	
 	/* identifiers */
 	ot->name= "Scroll Left";
-	ot->idname= "ED_View2D_OT_view_leftscroll";
+	ot->idname= "View2D_OT_view_leftscroll";
 	
 	/* api callbacks */
 	ot->exec= view_scrollleft_exec;
@@ -329,10 +323,11 @@ void ED_View2D_OT_view_scrollleft(wmOperatorType *ot)
 	ot->flag= OPTYPE_REGISTER;
 	
 	/* rna - must keep these in sync with the other operators */
-	prop= RNA_def_property(ot->srna, "deltax", PROP_INT, PROP_NONE);
-	prop= RNA_def_property(ot->srna, "deltay", PROP_INT, PROP_NONE);
+	RNA_def_property(ot->srna, "deltax", PROP_INT, PROP_NONE);
+	RNA_def_property(ot->srna, "deltay", PROP_INT, PROP_NONE);
 }
 
+
 /* this operator only needs this single callback, where it callsthe view_pan_*() methods */
 static int view_scrolldown_exec(bContext *C, wmOperator *op)
 {
@@ -351,13 +346,11 @@ static int view_scrolldown_exec(bContext *C, wmOperator *op)
 	return OPERATOR_FINISHED;
 }
 
-void ED_View2D_OT_view_scrolldown(wmOperatorType *ot)
+void View2D_OT_view_scrolldown(wmOperatorType *ot)
 {
-	PropertyRNA *prop;
-	
 	/* identifiers */
 	ot->name= "Scroll Down";
-	ot->idname= "ED_View2D_OT_view_downscroll";
+	ot->idname= "View2D_OT_view_downscroll";
 	
 	/* api callbacks */
 	ot->exec= view_scrolldown_exec;
@@ -366,8 +359,8 @@ void ED_View2D_OT_view_scrolldown(wmOperatorType *ot)
 	ot->flag= OPTYPE_REGISTER;
 	
 	/* rna - must keep these in sync with the other operators */
-	prop= RNA_def_property(ot->srna, "deltax", PROP_INT, PROP_NONE);
-	prop= RNA_def_property(ot->srna, "deltay", PROP_INT, PROP_NONE);
+	RNA_def_property(ot->srna, "deltax", PROP_INT, PROP_NONE);
+	RNA_def_property(ot->srna, "deltay", PROP_INT, PROP_NONE);
 }
 
 
@@ -390,13 +383,11 @@ static int view_scrollup_exec(bContext *C, wmOperator *op)
 	return OPERATOR_FINISHED;
 }
 
-void ED_View2D_OT_view_scrollup(wmOperatorType *ot)
+void View2D_OT_view_scrollup(wmOperatorType *ot)
 {
-	PropertyRNA *prop;
-	
 	/* identifiers */
 	ot->name= "Scroll Up";
-	ot->idname= "ED_View2D_OT_view_upscroll";
+	ot->idname= "View2D_OT_view_upscroll";
 	
 	/* api callbacks */
 	ot->exec= view_scrollup_exec;
@@ -405,8 +396,8 @@ void ED_View2D_OT_view_scrollup(wmOperatorType *ot)
 	ot->flag= OPTYPE_REGISTER;
 	
 	/* rna - must keep these in sync with the other operators */
-	prop= RNA_def_property(ot->srna, "deltax", PROP_INT, PROP_NONE);
-	prop= RNA_def_property(ot->srna, "deltay", PROP_INT, PROP_NONE);
+	RNA_def_property(ot->srna, "deltax", PROP_INT, PROP_NONE);
+	RNA_def_property(ot->srna, "deltay", PROP_INT, PROP_NONE);
 }
 
 /* ********************************************************* */
@@ -492,13 +483,11 @@ static int view_zoomin_exec(bContext *C, wmOperator *op)
 	return OPERATOR_FINISHED;
 }
 
-void ED_View2D_OT_view_zoomin(wmOperatorType *ot)
+void View2D_OT_view_zoomin(wmOperatorType *ot)
 {
-	PropertyRNA *prop;
-	
 	/* identifiers */
 	ot->name= "Zoom In";
-	ot->idname= "ED_View2D_OT_view_zoomin";
+	ot->idname= "View2D_OT_view_zoomin";
 	
 	/* api callbacks */
 	ot->exec= view_zoomin_exec;
@@ -507,8 +496,8 @@ void ED_View2D_OT_view_zoomin(wmOperatorType *ot)
 	ot->flag= OPTYPE_REGISTER;
 	
 	/* rna - must keep these in sync with the other operators */
-	prop= RNA_def_property(ot->srna, "zoomfacx", PROP_FLOAT, PROP_NONE);
-	prop= RNA_def_property(ot->srna, "zoomfacy", PROP_FLOAT, PROP_NONE);
+	RNA_def_property(ot->srna, "zoomfacx", PROP_FLOAT, PROP_NONE);
+	RNA_def_property(ot->srna, "zoomfacy", PROP_FLOAT, PROP_NONE);
 }
 
 
@@ -530,13 +519,11 @@ static int view_zoomout_exec(bContext *C, wmOperator *op)
 	return OPERATOR_FINISHED;
 }
 
-void ED_View2D_OT_view_zoomout(wmOperatorType *ot)
+void View2D_OT_view_zoomout(wmOperatorType *ot)
 {
-	PropertyRNA *prop;
-	
 	/* identifiers */
 	ot->name= "Zoom Out";
-	ot->idname= "ED_View2D_OT_view_zoomout";
+	ot->idname= "View2D_OT_view_zoomout";
 	
 	/* api callbacks */
 	ot->exec= view_zoomout_exec;
@@ -545,8 +532,8 @@ void ED_View2D_OT_view_zoomout(wmOperatorType *ot)
 	ot->flag= OPTYPE_REGISTER;
 	
 	/* rna - must keep these in sync with the other operators */
-	prop= RNA_def_property(ot->srna, "zoomfacx", PROP_FLOAT, PROP_NONE);
-	prop= RNA_def_property(ot->srna, "zoomfacy", PROP_FLOAT, PROP_NONE);
+	RNA_def_property(ot->srna, "zoomfacx", PROP_FLOAT, PROP_NONE);
+	RNA_def_property(ot->srna, "zoomfacy", PROP_FLOAT, PROP_NONE);
 }
 
 /* ********************************************************* */
@@ -766,13 +753,13 @@ static int view_zoomdrag_modal(bContext *C, wmOperator *op, wmEvent *event)
 	return OPERATOR_RUNNING_MODAL;
 }
 
-void ED_View2D_OT_view_zoom(wmOperatorType *ot)
+void View2D_OT_view_zoom(wmOperatorType *ot)
 {
 	PropertyRNA *prop;
 	
 	/* identifiers */
 	ot->name= "Zoom View";
-	ot->idname= "ED_View2D_OT_view_zoom";
+	ot->idname= "View2D_OT_view_zoom";
 	
 	/* api callbacks */
 	ot->exec= view_zoomdrag_exec;
@@ -866,11 +853,11 @@ static int view_borderzoom_exec(bContext *C, wmOperator *op)
 	return OPERATOR_FINISHED;
 } 
 
-void ED_View2D_OT_view_borderzoom(wmOperatorType *ot)
+void View2D_OT_view_borderzoom(wmOperatorType *ot)
 {
 	/* identifiers */
 	ot->name= "Zoom to Border";
-	ot->idname= "ED_View2D_OT_view_borderzoom";
+	ot->idname= "View2D_OT_view_borderzoom";
 	
 	/* api callbacks */
 	ot->invoke= WM_border_select_invoke;
@@ -1206,11 +1193,11 @@ static int scroller_activate_invoke(bContext *C, wmOperator *op, wmEvent *event)
 }
 
 /* LMB-Drag in Scrollers - not repeatable operator! */
-void ED_View2D_OT_scroller_activate(wmOperatorType *ot)
+void View2D_OT_scroller_activate(wmOperatorType *ot)
 {
 	/* identifiers */
 	ot->name= "Scroller Activate";
-	ot->idname= "ED_View2D_OT_scroller_activate";
+	ot->idname= "View2D_OT_scroller_activate";
 	
 	/* api callbacks */
 	ot->invoke= scroller_activate_invoke;
@@ -1222,20 +1209,20 @@ void ED_View2D_OT_scroller_activate(wmOperatorType *ot)
 
 void ui_view2d_operatortypes(void)
 {
-	WM_operatortype_append(ED_View2D_OT_view_pan);
+	WM_operatortype_append(View2D_OT_view_pan);
 	
-	WM_operatortype_append(ED_View2D_OT_view_scrollleft);
-	WM_operatortype_append(ED_View2D_OT_view_scrollright);
-	WM_operatortype_append(ED_View2D_OT_view_scrollup);
-	WM_operatortype_append(ED_View2D_OT_view_scrolldown);
+	WM_operatortype_append(View2D_OT_view_scrollleft);
+	WM_operatortype_append(View2D_OT_view_scrollright);
+	WM_operatortype_append(View2D_OT_view_scrollup);
+	WM_operatortype_append(View2D_OT_view_scrolldown);
 	
-	WM_operatortype_append(ED_View2D_OT_view_zoomin);
-	WM_operatortype_append(ED_View2D_OT_view_zoomout);
+	WM_operatortype_append(View2D_OT_view_zoomin);
+	WM_operatortype_append(View2D_OT_view_zoomout);
 	
-	WM_operatortype_append(ED_View2D_OT_view_zoom);
-	WM_operatortype_append(ED_View2D_OT_view_borderzoom);
+	WM_operatortype_append(View2D_OT_view_zoom);
+	WM_operatortype_append(View2D_OT_view_borderzoom);
 	
-	WM_operatortype_append(ED_View2D_OT_scroller_activate);
+	WM_operatortype_append(View2D_OT_scroller_activate);
 }
 
 void UI_view2d_keymap(wmWindowManager *wm)
@@ -1243,27 +1230,27 @@ void UI_view2d_keymap(wmWindowManager *wm)
 	ListBase *keymap= WM_keymap_listbase(wm, "View2D", 0, 0);
 	
 	/* pan/scroll */
-	WM_keymap_add_item(keymap, "ED_View2D_OT_view_pan", MIDDLEMOUSE, KM_PRESS, 0, 0);
+	WM_keymap_add_item(keymap, "View2D_OT_view_pan", MIDDLEMOUSE, KM_PRESS, 0, 0);
 	
-	WM_keymap_add_item(keymap, "ED_View2D_OT_view_rightscroll", WHEELDOWNMOUSE, KM_ANY, KM_CTRL, 0);
-	WM_keymap_add_item(keymap, "ED_View2D_OT_view_leftscroll", WHEELUPMOUSE, KM_ANY, KM_CTRL, 0);
+	WM_keymap_add_item(keymap, "View2D_OT_view_rightscroll", WHEELDOWNMOUSE, KM_ANY, KM_CTRL, 0);
+	WM_keymap_add_item(keymap, "View2D_OT_view_leftscroll", WHEELUPMOUSE, KM_ANY, KM_CTRL, 0);
 	
-	WM_keymap_add_item(keymap, "ED_View2D_OT_view_downscroll", WHEELDOWNMOUSE, KM_ANY, KM_SHIFT, 0);
-	WM_keymap_add_item(keymap, "ED_View2D_OT_view_upscroll", WHEELUPMOUSE, KM_ANY, KM_SHIFT, 0);
+	WM_keymap_add_item(keymap, "View2D_OT_view_downscroll", WHEELDOWNMOUSE, KM_ANY, KM_SHIFT, 0);
+	WM_keymap_add_item(keymap, "View2D_OT_view_upscroll", WHEELUPMOUSE, KM_ANY, KM_SHIFT, 0);
 	
 	/* zoom - single step */
-	WM_keymap_add_item(keymap, "ED_View2D_OT_view_zoomout", WHEELUPMOUSE, KM_ANY, 0, 0);
-	WM_keymap_add_item(keymap, "ED_View2D_OT_view_zoomin", WHEELDOWNMOUSE, KM_ANY, 0, 0);
-	WM_keymap_add_item(keymap, "ED_View2D_OT_view_zoomout", PADMINUS, KM_PRESS, 0, 0);
-	WM_keymap_add_item(keymap, "ED_View2D_OT_view_zoomin", PADPLUSKEY, KM_PRESS, 0, 0);
+	WM_keymap_add_item(keymap, "View2D_OT_view_zoomout", WHEELUPMOUSE, KM_ANY, 0, 0);
+	WM_keymap_add_item(keymap, "View2D_OT_view_zoomin", WHEELDOWNMOUSE, KM_ANY, 0, 0);
+	WM_keymap_add_item(keymap, "View2D_OT_view_zoomout", PADMINUS, KM_PRESS, 0, 0);
+	WM_keymap_add_item(keymap, "View2D_OT_view_zoomin", PADPLUSKEY, KM_PRESS, 0, 0);
 	
 	/* zoom - drag */
-	WM_keymap_add_item(keymap, "ED_View2D_OT_view_zoom", MIDDLEMOUSE, KM_PRESS, KM_CTRL, 0);
+	WM_keymap_add_item(keymap, "View2D_OT_view_zoom", MIDDLEMOUSE, KM_PRESS, KM_CTRL, 0);
 	
 	/* borderzoom - drag */
-	WM_keymap_add_item(keymap, "ED_View2D_OT_view_borderzoom", ZKEY, KM_PRESS, KM_SHIFT, 0);
+	WM_keymap_add_item(keymap, "View2D_OT_view_borderzoom", ZKEY, KM_PRESS, KM_SHIFT, 0);
 	
 	/* scrollers */
-	WM_keymap_add_item(keymap, "ED_View2D_OT_scroller_activate", LEFTMOUSE, KM_PRESS, 0, 0);
+	WM_keymap_add_item(keymap, "View2D_OT_scroller_activate", LEFTMOUSE, KM_PRESS, 0, 0);
 }
 
diff --git a/source/blender/editors/space_action/action_intern.h b/source/blender/editors/space_action/action_intern.h
index 51c6c3c7a1d..27d8ada37ac 100644
--- a/source/blender/editors/space_action/action_intern.h
+++ b/source/blender/editors/space_action/action_intern.h
@@ -48,10 +48,10 @@ void action_header_buttons(const struct bContext *C, struct ARegion *ar);
 
 /* ***************************************** */
 /* action_select.c */
-void ED_ACT_OT_keyframes_deselectall(struct wmOperatorType *ot);
-void ED_ACT_OT_keyframes_borderselect(struct wmOperatorType *ot);
-void ED_ACT_OT_keyframes_columnselect(struct wmOperatorType *ot);
-void ED_ACT_OT_keyframes_clickselect(struct wmOperatorType *ot);
+void ACT_OT_keyframes_deselectall(struct wmOperatorType *ot);
+void ACT_OT_keyframes_borderselect(struct wmOperatorType *ot);
+void ACT_OT_keyframes_columnselect(struct wmOperatorType *ot);
+void ACT_OT_keyframes_clickselect(struct wmOperatorType *ot);
 
 /* defines for left-right select tool */
 enum {
diff --git a/source/blender/editors/space_action/action_ops.c b/source/blender/editors/space_action/action_ops.c
index ceaa8117de7..19850917a9c 100644
--- a/source/blender/editors/space_action/action_ops.c
+++ b/source/blender/editors/space_action/action_ops.c
@@ -62,10 +62,10 @@ void action_operatortypes(void)
 	/* channels */
 	
 	/* keyframes */
-	WM_operatortype_append(ED_ACT_OT_keyframes_clickselect);
-	WM_operatortype_append(ED_ACT_OT_keyframes_deselectall);
-	WM_operatortype_append(ED_ACT_OT_keyframes_borderselect);
-	WM_operatortype_append(ED_ACT_OT_keyframes_columnselect);
+	WM_operatortype_append(ACT_OT_keyframes_clickselect);
+	WM_operatortype_append(ACT_OT_keyframes_deselectall);
+	WM_operatortype_append(ACT_OT_keyframes_borderselect);
+	WM_operatortype_append(ACT_OT_keyframes_columnselect);
 }
 
 /* ************************** registration - keymaps **********************************/
@@ -74,25 +74,25 @@ static void action_keymap_keyframes (ListBase *keymap)
 {
 	/* action_select.c - selection tools */
 		/* click-select */
-	WM_keymap_add_item(keymap, "ED_ACT_OT_keyframes_clickselect", SELECTMOUSE, KM_PRESS, 0, 0);
-	RNA_boolean_set(WM_keymap_add_item(keymap, "ED_ACT_OT_keyframes_clickselect", SELECTMOUSE, KM_PRESS, KM_CTRL, 0)->ptr, "column_select", 1);
-	RNA_boolean_set(WM_keymap_add_item(keymap, "ED_ACT_OT_keyframes_clickselect", SELECTMOUSE, KM_PRESS, KM_SHIFT, 0)->ptr, "extend_select", 1);
-	RNA_enum_set(WM_keymap_add_item(keymap, "ED_ACT_OT_keyframes_clickselect", SELECTMOUSE, KM_PRESS, KM_ALT, 0)->ptr, "left_right", ACTKEYS_LRSEL_TEST);
+	WM_keymap_add_item(keymap, "ACT_OT_keyframes_clickselect", SELECTMOUSE, KM_PRESS, 0, 0);
+	RNA_boolean_set(WM_keymap_add_item(keymap, "ACT_OT_keyframes_clickselect", SELECTMOUSE, KM_PRESS, KM_CTRL, 0)->ptr, "column_select", 1);
+	RNA_boolean_set(WM_keymap_add_item(keymap, "ACT_OT_keyframes_clickselect", SELECTMOUSE, KM_PRESS, KM_SHIFT, 0)->ptr, "extend_select", 1);
+	RNA_enum_set(WM_keymap_add_item(keymap, "ACT_OT_keyframes_clickselect", SELECTMOUSE, KM_PRESS, KM_ALT, 0)->ptr, "left_right", ACTKEYS_LRSEL_TEST);
 	
 	
 		/* deselect all */
-	WM_keymap_add_item(keymap, "ED_ACT_OT_keyframes_deselectall", AKEY, KM_PRESS, 0, 0);
-	RNA_boolean_set(WM_keymap_add_item(keymap, "ED_ACT_OT_keyframes_deselectall", IKEY, KM_PRESS, KM_CTRL, 0)->ptr, "invert", 1);
+	WM_keymap_add_item(keymap, "ACT_OT_keyframes_deselectall", AKEY, KM_PRESS, 0, 0);
+	RNA_boolean_set(WM_keymap_add_item(keymap, "ACT_OT_keyframes_deselectall", IKEY, KM_PRESS, KM_CTRL, 0)->ptr, "invert", 1);
 	
 		/* borderselect */
-	WM_keymap_add_item(keymap, "ED_ACT_OT_keyframes_borderselect", BKEY, KM_PRESS, 0, 0);
-	RNA_boolean_set(WM_keymap_add_item(keymap, "ED_ACT_OT_keyframes_borderselect", BKEY, KM_PRESS, KM_ALT, 0)->ptr, "axis_range", 1);
+	WM_keymap_add_item(keymap, "ACT_OT_keyframes_borderselect", BKEY, KM_PRESS, 0, 0);
+	RNA_boolean_set(WM_keymap_add_item(keymap, "ACT_OT_keyframes_borderselect", BKEY, KM_PRESS, KM_ALT, 0)->ptr, "axis_range", 1);
 	
 		/* column select */
-	RNA_enum_set(WM_keymap_add_item(keymap, "ED_ACT_OT_keyframes_columnselect", KKEY, KM_PRESS, 0, 0)->ptr, "mode", ACTKEYS_COLUMNSEL_KEYS);
-	RNA_enum_set(WM_keymap_add_item(keymap, "ED_ACT_OT_keyframes_columnselect", KKEY, KM_PRESS, KM_CTRL, 0)->ptr, "mode", ACTKEYS_COLUMNSEL_CFRA);
-	RNA_enum_set(WM_keymap_add_item(keymap, "ED_ACT_OT_keyframes_columnselect", KKEY, KM_PRESS, KM_SHIFT, 0)->ptr, "mode", ACTKEYS_COLUMNSEL_MARKERS_COLUMN);
-	RNA_enum_set(WM_keymap_add_item(keymap, "ED_ACT_OT_keyframes_columnselect", KKEY, KM_PRESS, KM_ALT, 0)->ptr, "mode", ACTKEYS_COLUMNSEL_MARKERS_BETWEEN);
+	RNA_enum_set(WM_keymap_add_item(keymap, "ACT_OT_keyframes_columnselect", KKEY, KM_PRESS, 0, 0)->ptr, "mode", ACTKEYS_COLUMNSEL_KEYS);
+	RNA_enum_set(WM_keymap_add_item(keymap, "ACT_OT_keyframes_columnselect", KKEY, KM_PRESS, KM_CTRL, 0)->ptr, "mode", ACTKEYS_COLUMNSEL_CFRA);
+	RNA_enum_set(WM_keymap_add_item(keymap, "ACT_OT_keyframes_columnselect", KKEY, KM_PRESS, KM_SHIFT, 0)->ptr, "mode", ACTKEYS_COLUMNSEL_MARKERS_COLUMN);
+	RNA_enum_set(WM_keymap_add_item(keymap, "ACT_OT_keyframes_columnselect", KKEY, KM_PRESS, KM_ALT, 0)->ptr, "mode", ACTKEYS_COLUMNSEL_MARKERS_BETWEEN);
 }
 
 /* --------------- */
diff --git a/source/blender/editors/space_action/action_select.c b/source/blender/editors/space_action/action_select.c
index cd454388a57..de41b7e4604 100644
--- a/source/blender/editors/space_action/action_select.c
+++ b/source/blender/editors/space_action/action_select.c
@@ -401,11 +401,11 @@ static int actkeys_deselectall_exec(bContext *C, wmOperator *op)
 	return OPERATOR_FINISHED;
 }
  
-void ED_ACT_OT_keyframes_deselectall (wmOperatorType *ot)
+void ACT_OT_keyframes_deselectall (wmOperatorType *ot)
 {
 	/* identifiers */
 	ot->name= "Select All";
-	ot->idname= "ED_ACT_OT_keyframes_deselectall";
+	ot->idname= "ACT_OT_keyframes_deselectall";
 	
 	/* api callbacks */
 	ot->exec= actkeys_deselectall_exec;
@@ -564,11 +564,11 @@ static int actkeys_borderselect_exec(bContext *C, wmOperator *op)
 	return OPERATOR_FINISHED;
 } 
 
-void ED_ACT_OT_keyframes_borderselect(wmOperatorType *ot)
+void ACT_OT_keyframes_borderselect(wmOperatorType *ot)
 {
 	/* identifiers */
 	ot->name= "Border Select";
-	ot->idname= "ED_ACT_OT_keyframes_borderselect";
+	ot->idname= "ACT_OT_keyframes_borderselect";
 	
 	/* api callbacks */
 	ot->invoke= WM_border_select_invoke;
@@ -797,13 +797,13 @@ static int actkeys_columnselect_exec(bContext *C, wmOperator *op)
 	return OPERATOR_FINISHED;
 }
  
-void ED_ACT_OT_keyframes_columnselect (wmOperatorType *ot)
+void ACT_OT_keyframes_columnselect (wmOperatorType *ot)
 {
 	PropertyRNA *prop;
 	
 	/* identifiers */
 	ot->name= "Select All";
-	ot->idname= "ED_ACT_OT_keyframes_columnselect";
+	ot->idname= "ACT_OT_keyframes_columnselect";
 	
 	/* api callbacks */
 	ot->exec= actkeys_columnselect_exec;
@@ -1172,13 +1172,13 @@ static int actkeys_clickselect_invoke(bContext *C, wmOperator *op, wmEvent *even
 	return OPERATOR_FINISHED;
 }
  
-void ED_ACT_OT_keyframes_clickselect (wmOperatorType *ot)
+void ACT_OT_keyframes_clickselect (wmOperatorType *ot)
 {
 	PropertyRNA *prop;
 	
 	/* identifiers */
 	ot->name= "Mouse Select Keys";
-	ot->idname= "ED_ACT_OT_keyframes_clickselect";
+	ot->idname= "ACT_OT_keyframes_clickselect";
 	
 	/* api callbacks */
 	ot->invoke= actkeys_clickselect_invoke;