diff options
author | Campbell Barton <ideasman42@gmail.com> | 2015-11-23 05:49:52 +0300 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2015-11-23 09:40:09 +0300 |
commit | 676d790d29ead413a9619aa94005c5248d274cb2 (patch) | |
tree | 65fd0b6728a6f2d3db0b8e1dbe0be9edacf1d1d8 /source/blender/windowmanager | |
parent | a269287f36cfb99621fc8a5172c050f4a1046ba1 (diff) |
Cleanup: use `rna_enum_` prefix for RNA enums
Definitions could shadow local vars.
Diffstat (limited to 'source/blender/windowmanager')
-rw-r--r-- | source/blender/windowmanager/intern/wm_event_system.c | 4 | ||||
-rw-r--r-- | source/blender/windowmanager/intern/wm_keymap.c | 4 | ||||
-rw-r--r-- | source/blender/windowmanager/intern/wm_operators.c | 8 |
3 files changed, 8 insertions, 8 deletions
diff --git a/source/blender/windowmanager/intern/wm_event_system.c b/source/blender/windowmanager/intern/wm_event_system.c index 187c11ef3da..b2debf643d0 100644 --- a/source/blender/windowmanager/intern/wm_event_system.c +++ b/source/blender/windowmanager/intern/wm_event_system.c @@ -559,8 +559,8 @@ void WM_event_print(const wmEvent *event) const char *type_id = unknown; const char *val_id = unknown; - RNA_enum_identifier(event_type_items, event->type, &type_id); - RNA_enum_identifier(event_value_items, event->val, &val_id); + RNA_enum_identifier(rna_enum_event_type_items, event->type, &type_id); + RNA_enum_identifier(rna_enum_event_value_items, event->val, &val_id); printf("wmEvent type:%d / %s, val:%d / %s,\n" " shift:%d, ctrl:%d, alt:%d, oskey:%d, keymodifier:%d,\n" diff --git a/source/blender/windowmanager/intern/wm_keymap.c b/source/blender/windowmanager/intern/wm_keymap.c index 678d7b43518..f378a4cdfa3 100644 --- a/source/blender/windowmanager/intern/wm_keymap.c +++ b/source/blender/windowmanager/intern/wm_keymap.c @@ -904,12 +904,12 @@ static void wm_user_modal_keymap_set_items(wmWindowManager *wm, wmKeyMap *km) const char *WM_key_event_string(const short type, const bool compact) { EnumPropertyItem *it; - const int i = RNA_enum_from_value(event_type_items, (int)type); + const int i = RNA_enum_from_value(rna_enum_event_type_items, (int)type); if (i == -1) { return ""; } - it = &event_type_items[i]; + it = &rna_enum_event_type_items[i]; /* We first try enum items' description (abused as shortname here), and fall back to usual name if empty. */ if (compact && it->description[0]) { diff --git a/source/blender/windowmanager/intern/wm_operators.c b/source/blender/windowmanager/intern/wm_operators.c index eabc8614c80..3734b5ab530 100644 --- a/source/blender/windowmanager/intern/wm_operators.c +++ b/source/blender/windowmanager/intern/wm_operators.c @@ -1285,7 +1285,7 @@ void WM_operator_properties_filesel(wmOperatorType *ot, int filter, short type, prop = RNA_def_enum(ot->srna, "display_type", file_display_items, display, "Display Type", ""); RNA_def_property_flag(prop, PROP_HIDDEN | PROP_SKIP_SAVE); - prop = RNA_def_enum(ot->srna, "sort_method", file_sort_items, sort, "File sorting mode", ""); + prop = RNA_def_enum(ot->srna, "sort_method", rna_enum_file_sort_items, sort, "File sorting mode", ""); RNA_def_property_flag(prop, PROP_HIDDEN | PROP_SKIP_SAVE); } @@ -5233,11 +5233,11 @@ static void WM_OT_stereo3d_set(wmOperatorType *ot) ot->check = wm_stereo3d_set_check; ot->cancel = wm_stereo3d_set_cancel; - prop = RNA_def_enum(ot->srna, "display_mode", stereo3d_display_items, S3D_DISPLAY_ANAGLYPH, "Display Mode", ""); + prop = RNA_def_enum(ot->srna, "display_mode", rna_enum_stereo3d_display_items, S3D_DISPLAY_ANAGLYPH, "Display Mode", ""); RNA_def_property_flag(prop, PROP_SKIP_SAVE); - prop = RNA_def_enum(ot->srna, "anaglyph_type", stereo3d_anaglyph_type_items, S3D_ANAGLYPH_REDCYAN, "Anaglyph Type", ""); + prop = RNA_def_enum(ot->srna, "anaglyph_type", rna_enum_stereo3d_anaglyph_type_items, S3D_ANAGLYPH_REDCYAN, "Anaglyph Type", ""); RNA_def_property_flag(prop, PROP_SKIP_SAVE); - prop = RNA_def_enum(ot->srna, "interlace_type", stereo3d_interlace_type_items, S3D_INTERLACE_ROW, "Interlace Type", ""); + prop = RNA_def_enum(ot->srna, "interlace_type", rna_enum_stereo3d_interlace_type_items, S3D_INTERLACE_ROW, "Interlace Type", ""); RNA_def_property_flag(prop, PROP_SKIP_SAVE); prop = RNA_def_boolean(ot->srna, "use_interlace_swap", false, "Swap Left/Right", "Swap left and right stereo channels"); |