From a71016a1a340b623727012c366de600b71348b68 Mon Sep 17 00:00:00 2001 From: Shaul Kedem Date: Sun, 12 Apr 2009 23:05:40 +0000 Subject: additional op naming convention changes --- source/blender/editors/space_node/node_edit.c | 4 ++-- source/blender/editors/space_node/node_intern.h | 2 +- source/blender/editors/space_node/node_ops.c | 4 ++-- source/blender/editors/space_script/script_edit.c | 4 ++-- source/blender/editors/space_script/script_intern.h | 2 +- source/blender/editors/space_script/script_ops.c | 4 ++-- source/blender/editors/space_view3d/view3d_ops.c | 2 +- 7 files changed, 11 insertions(+), 11 deletions(-) (limited to 'source/blender/editors') diff --git a/source/blender/editors/space_node/node_edit.c b/source/blender/editors/space_node/node_edit.c index d77d2aa09cb..044a8d3fabe 100644 --- a/source/blender/editors/space_node/node_edit.c +++ b/source/blender/editors/space_node/node_edit.c @@ -1135,11 +1135,11 @@ static int node_size_widget_invoke(bContext *C, wmOperator *op, wmEvent *event) return OPERATOR_PASS_THROUGH; } -void NODE_OT_size_widget(wmOperatorType *ot) +void NODE_OT_widget_size(wmOperatorType *ot) { /* identifiers */ ot->name= "Scale Node"; - ot->idname= "NODE_OT_size_widget"; + ot->idname= "NODE_OT_widget_size"; /* api callbacks */ ot->invoke= node_size_widget_invoke; diff --git a/source/blender/editors/space_node/node_intern.h b/source/blender/editors/space_node/node_intern.h index 4796db98e95..1ad0b348626 100644 --- a/source/blender/editors/space_node/node_intern.h +++ b/source/blender/editors/space_node/node_intern.h @@ -84,7 +84,7 @@ void snode_autoconnect(SpaceNode *snode, bNode *node_to, int flag); void NODE_OT_link(struct wmOperatorType *ot); void NODE_OT_delete(struct wmOperatorType *ot); -void NODE_OT_size_widget(struct wmOperatorType *ot); +void NODE_OT_widget_size(struct wmOperatorType *ot); void NODE_OT_links_cut(struct wmOperatorType *ot); // XXXXXX diff --git a/source/blender/editors/space_node/node_ops.c b/source/blender/editors/space_node/node_ops.c index cef867faa1f..7bd41154c1b 100644 --- a/source/blender/editors/space_node/node_ops.c +++ b/source/blender/editors/space_node/node_ops.c @@ -57,7 +57,7 @@ void node_operatortypes(void) WM_operatortype_append(NODE_OT_select_border); WM_operatortype_append(NODE_OT_delete); WM_operatortype_append(NODE_OT_link); - WM_operatortype_append(NODE_OT_size_widget); + WM_operatortype_append(NODE_OT_widget_size); WM_operatortype_append(NODE_OT_links_cut); } @@ -72,7 +72,7 @@ void node_keymap(struct wmWindowManager *wm) RNA_enum_set(WM_keymap_add_item(keymap, "NODE_OT_select_extend", SELECTMOUSE, KM_PRESS, KM_SHIFT, 0)->ptr, "select_type", NODE_SELECT_MOUSE); WM_keymap_add_item(keymap, "NODE_OT_link", LEFTMOUSE, KM_PRESS, 0, 0); - WM_keymap_add_item(keymap, "NODE_OT_size_widget", LEFTMOUSE, KM_PRESS, 0, 0); + WM_keymap_add_item(keymap, "NODE_OT_widget_size", LEFTMOUSE, KM_PRESS, 0, 0); WM_keymap_add_item(keymap, "NODE_OT_visibility_toggle", LEFTMOUSE, KM_PRESS, 0, 0); WM_keymap_add_item(keymap, "NODE_OT_links_cut", LEFTMOUSE, KM_PRESS, KM_ALT, 0); diff --git a/source/blender/editors/space_script/script_edit.c b/source/blender/editors/space_script/script_edit.c index da53057c5eb..cc8764fd67d 100644 --- a/source/blender/editors/space_script/script_edit.c +++ b/source/blender/editors/space_script/script_edit.c @@ -73,11 +73,11 @@ static int run_pyfile_exec(bContext *C, wmOperator *op) return OPERATOR_FINISHED; } -void SCRIPT_OT_run_pyfile(wmOperatorType *ot) +void SCRIPT_OT_python_file_run(wmOperatorType *ot) { /* identifiers */ ot->name= "Run python file"; - ot->idname= "SCRIPT_OT_run_pyfile"; + ot->idname= "SCRIPT_OT_python_file_run"; /* api callbacks */ ot->exec= run_pyfile_exec; diff --git a/source/blender/editors/space_script/script_intern.h b/source/blender/editors/space_script/script_intern.h index e9dd88e893c..e39dd168e71 100644 --- a/source/blender/editors/space_script/script_intern.h +++ b/source/blender/editors/space_script/script_intern.h @@ -39,7 +39,7 @@ void script_operatortypes(void); void script_keymap(struct wmWindowManager *wm); /* script_edit.c */ -void SCRIPT_OT_run_pyfile(struct wmOperatorType *ot); +void SCRIPT_OT_python_file_run(struct wmOperatorType *ot); #endif /* ED_SCRIPT_INTERN_H */ diff --git a/source/blender/editors/space_script/script_ops.c b/source/blender/editors/space_script/script_ops.c index 45cbf9f8a2d..d2aa9959a9d 100644 --- a/source/blender/editors/space_script/script_ops.c +++ b/source/blender/editors/space_script/script_ops.c @@ -59,7 +59,7 @@ void script_operatortypes(void) { - WM_operatortype_append(SCRIPT_OT_run_pyfile); + WM_operatortype_append(SCRIPT_OT_python_file_run); } void script_keymap(wmWindowManager *wm) @@ -67,6 +67,6 @@ void script_keymap(wmWindowManager *wm) ListBase *keymap= WM_keymap_listbase(wm, "Script", SPACE_SCRIPT, 0); /* TODO - this is just while we have no way to load a text datablock */ - RNA_string_set(WM_keymap_add_item(keymap, "SCRIPT_OT_run_pyfile", PKEY, KM_PRESS, 0, 0)->ptr, "filename", "test.py"); + RNA_string_set(WM_keymap_add_item(keymap, "SCRIPT_OT_python_file_run", PKEY, KM_PRESS, 0, 0)->ptr, "filename", "test.py"); } diff --git a/source/blender/editors/space_view3d/view3d_ops.c b/source/blender/editors/space_view3d/view3d_ops.c index 1cda1b9e4c8..41ef16bea4a 100644 --- a/source/blender/editors/space_view3d/view3d_ops.c +++ b/source/blender/editors/space_view3d/view3d_ops.c @@ -224,7 +224,7 @@ void view3d_keymap(wmWindowManager *wm) RNA_enum_set(WM_keymap_add_item(keymap, "PAINT_OT_texture_paint_radial_control", FKEY, KM_PRESS, KM_SHIFT, 0)->ptr, "mode", WM_RADIALCONTROL_STRENGTH); /* TODO - this is just while we have no way to load a text datablock */ - RNA_string_set(WM_keymap_add_item(keymap, "SCRIPT_OT_run_pyfile", PKEY, KM_PRESS, 0, 0)->ptr, "filename", "test.py"); + RNA_string_set(WM_keymap_add_item(keymap, "SCRIPT_OT_python_file_run", PKEY, KM_PRESS, 0, 0)->ptr, "filename", "test.py"); transform_keymap_for_space(wm, keymap, SPACE_VIEW3D); -- cgit v1.2.3