diff options
author | Campbell Barton <ideasman42@gmail.com> | 2017-10-18 07:07:26 +0300 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2017-10-18 08:04:07 +0300 |
commit | ab7ebf2b10f67b002447fb0e2cb352c2c178e128 (patch) | |
tree | 8ca38116cf22d8a5e8c6b788f93a84ba1963cb4c /source/blender/editors/interface | |
parent | 92611dada67fcc151c894462749031be1de27191 (diff) |
Cleanup: Use const for RNA EnumPropertyItem args
Practically all access to enum data is read-only.
Diffstat (limited to 'source/blender/editors/interface')
5 files changed, 34 insertions, 33 deletions
diff --git a/source/blender/editors/interface/interface.c b/source/blender/editors/interface/interface.c index 30e47bc3d9e..dc4c1b71066 100644 --- a/source/blender/editors/interface/interface.c +++ b/source/blender/editors/interface/interface.c @@ -3290,7 +3290,7 @@ static void ui_def_but_rna__menu(bContext *UNUSED(C), uiLayout *layout, void *bu uiBut *but = (uiBut *)but_p; /* see comment in ui_item_enum_expand, re: uiname */ - EnumPropertyItem *item, *item_array; + const EnumPropertyItem *item, *item_array; bool free; uiLayout *split, *column = NULL; @@ -3400,9 +3400,8 @@ static void ui_def_but_rna__menu(bContext *UNUSED(C), uiLayout *layout, void *bu UI_block_layout_set_current(block, layout); if (free) { - MEM_freeN(item_array); + MEM_freeN((void *)item_array); } - BLI_assert((block->flag & UI_BLOCK_IS_FLIP) == 0); block->flag |= UI_BLOCK_IS_FLIP; } @@ -3433,7 +3432,7 @@ static uiBut *ui_def_but_rna( /* use rna values if parameters are not specified */ if ((proptype == PROP_ENUM) && ELEM(type, UI_BTYPE_MENU, UI_BTYPE_ROW, UI_BTYPE_LISTROW)) { /* UI_BTYPE_MENU is handled a little differently here */ - EnumPropertyItem *item; + const EnumPropertyItem *item; int value; bool free; int i; @@ -3475,7 +3474,7 @@ static uiBut *ui_def_but_rna( } if (free) { - MEM_freeN(item); + MEM_freeN((void *)item); } } else { @@ -4437,7 +4436,7 @@ static void operator_enum_search_cb(const struct bContext *C, void *but, const c } else { PointerRNA *ptr = UI_but_operator_ptr_get(but); /* Will create it if needed! */ - EnumPropertyItem *item, *item_array; + const EnumPropertyItem *item, *item_array; bool do_free; RNA_property_enum_items_gettexted((bContext *)C, ptr, prop, &item_array, NULL, &do_free); @@ -4450,8 +4449,9 @@ static void operator_enum_search_cb(const struct bContext *C, void *but, const c } } - if (do_free) - MEM_freeN(item_array); + if (do_free) { + MEM_freeN((void *)item_array); + } } } @@ -4525,7 +4525,7 @@ void UI_but_string_info_get(bContext *C, uiBut *but, ...) va_list args; uiStringInfo *si; - EnumPropertyItem *items = NULL, *item = NULL; + const EnumPropertyItem *items = NULL, *item = NULL; int totitems; bool free_items = false; @@ -4701,8 +4701,9 @@ void UI_but_string_info_get(bContext *C, uiBut *but, ...) } va_end(args); - if (free_items && items) - MEM_freeN(items); + if (free_items && items) { + MEM_freeN((void *)items); + } } /* Program Init/Exit */ diff --git a/source/blender/editors/interface/interface_eyedropper.c b/source/blender/editors/interface/interface_eyedropper.c index eab609ebe84..3d7c25e4f22 100644 --- a/source/blender/editors/interface/interface_eyedropper.c +++ b/source/blender/editors/interface/interface_eyedropper.c @@ -90,7 +90,7 @@ enum { wmKeyMap *eyedropper_modal_keymap(wmKeyConfig *keyconf) { - static EnumPropertyItem modal_items[] = { + static const EnumPropertyItem modal_items[] = { {EYE_MODAL_CANCEL, "CANCEL", 0, "Cancel", ""}, {EYE_MODAL_SAMPLE_CONFIRM, "SAMPLE_CONFIRM", 0, "Confirm Sampling", ""}, {EYE_MODAL_SAMPLE_BEGIN, "SAMPLE_BEGIN", 0, "Start Sampling", ""}, diff --git a/source/blender/editors/interface/interface_icons.c b/source/blender/editors/interface/interface_icons.c index 65b12fcd64e..0357fc8ff01 100644 --- a/source/blender/editors/interface/interface_icons.c +++ b/source/blender/editors/interface/interface_icons.c @@ -1192,7 +1192,7 @@ static int ui_id_brush_get_icon(const bContext *C, ID *id) else { Object *ob = CTX_data_active_object(C); SpaceImage *sima; - EnumPropertyItem *items = NULL; + const EnumPropertyItem *items = NULL; int tool = PAINT_TOOL_DRAW, mode = 0; /* XXX: this is not nice, should probably make brushes diff --git a/source/blender/editors/interface/interface_layout.c b/source/blender/editors/interface/interface_layout.c index c21a76918e8..cabfca14392 100644 --- a/source/blender/editors/interface/interface_layout.c +++ b/source/blender/editors/interface/interface_layout.c @@ -595,7 +595,7 @@ static void ui_item_enum_expand( uiBut *but; uiLayout *layout_radial = NULL; - EnumPropertyItem *item, *item_array; + const EnumPropertyItem *item, *item_array; const char *name; int itemw, icon, value; bool free; @@ -656,7 +656,7 @@ static void ui_item_enum_expand( UI_block_layout_set_current(block, layout); if (free) { - MEM_freeN(item_array); + MEM_freeN((void *)item_array); } } @@ -871,7 +871,7 @@ PointerRNA uiItemFullO(uiLayout *layout, const char *opname, const char *name, i static const char *ui_menu_enumpropname(uiLayout *layout, PointerRNA *ptr, PropertyRNA *prop, int retval) { - EnumPropertyItem *item; + const EnumPropertyItem *item; bool free; const char *name; @@ -884,7 +884,7 @@ static const char *ui_menu_enumpropname(uiLayout *layout, PointerRNA *ptr, Prope } if (free) { - MEM_freeN(item); + MEM_freeN((void *)item); } return name; @@ -1070,7 +1070,7 @@ void uiItemsFullEnumO( BLI_assert((prop == NULL) || (RNA_property_type(prop) == PROP_ENUM)); if (prop && RNA_property_type(prop) == PROP_ENUM) { - EnumPropertyItem *item_array = NULL; + const EnumPropertyItem *item_array = NULL; int totitem; bool free; @@ -1087,7 +1087,7 @@ void uiItemsFullEnumO( item_array, totitem); if (free) { - MEM_freeN(item_array); + MEM_freeN((void *)item_array); } /* intentionally don't touch UI_BLOCK_IS_FLIP here, @@ -1143,7 +1143,7 @@ void uiItemEnumO_string(uiLayout *layout, const char *name, int icon, const char PointerRNA ptr; PropertyRNA *prop; - EnumPropertyItem *item; + const EnumPropertyItem *item; int value; bool free; @@ -1157,14 +1157,14 @@ void uiItemEnumO_string(uiLayout *layout, const char *name, int icon, const char RNA_property_enum_items(layout->root->block->evil_C, &ptr, prop, &item, NULL, &free); if (item == NULL || RNA_enum_value_from_id(item, value_str, &value) == 0) { if (free) { - MEM_freeN(item); + MEM_freeN((void *)item); } RNA_warning("%s.%s, enum %s not found", RNA_struct_identifier(ptr.type), propname, value_str); return; } if (free) { - MEM_freeN(item); + MEM_freeN((void *)item); } } else { @@ -1262,7 +1262,7 @@ static void ui_item_rna_size( } else if (type == PROP_ENUM) { /* Find the longest enum item name, instead of using a dummy text! */ - EnumPropertyItem *item, *item_array; + const EnumPropertyItem *item, *item_array; bool free; RNA_property_enum_items_gettexted(layout->root->block->evil_C, ptr, prop, &item_array, NULL, &free); @@ -1272,7 +1272,7 @@ static void ui_item_rna_size( } } if (free) { - MEM_freeN(item_array); + MEM_freeN((void *)item_array); } } } @@ -1482,7 +1482,7 @@ void uiItemEnumR(uiLayout *layout, const char *name, int icon, struct PointerRNA void uiItemEnumR_string(uiLayout *layout, struct PointerRNA *ptr, const char *propname, const char *value, const char *name, int icon) { PropertyRNA *prop = RNA_struct_find_property(ptr, propname); - EnumPropertyItem *item; + const EnumPropertyItem *item; int ivalue, a; bool free; @@ -1496,7 +1496,7 @@ void uiItemEnumR_string(uiLayout *layout, struct PointerRNA *ptr, const char *pr if (!RNA_enum_value_from_id(item, value, &ivalue)) { if (free) { - MEM_freeN(item); + MEM_freeN((void *)item); } ui_item_disabled(layout, propname); RNA_warning("enum property value not found: %s", value); @@ -1514,7 +1514,7 @@ void uiItemEnumR_string(uiLayout *layout, struct PointerRNA *ptr, const char *pr } if (free) { - MEM_freeN(item); + MEM_freeN((void *)item); } } @@ -1537,7 +1537,7 @@ void uiItemsEnumR(uiLayout *layout, struct PointerRNA *ptr, const char *propname return; } else { - EnumPropertyItem *item; + const EnumPropertyItem *item; int totitem, i; bool free; uiLayout *split = uiLayoutSplit(layout, 0.0f, false); @@ -1570,7 +1570,7 @@ void uiItemsEnumR(uiLayout *layout, struct PointerRNA *ptr, const char *propname } if (free) { - MEM_freeN(item); + MEM_freeN((void *)item); } } diff --git a/source/blender/editors/interface/interface_templates.c b/source/blender/editors/interface/interface_templates.c index 3cc16f37736..430795d0ee1 100644 --- a/source/blender/editors/interface/interface_templates.c +++ b/source/blender/editors/interface/interface_templates.c @@ -1643,7 +1643,7 @@ static uiBlock *ui_icon_view_menu_cb(bContext *C, ARegion *ar, void *arg_litem) uiBlock *block; uiBut *but; int icon, value; - EnumPropertyItem *item; + const EnumPropertyItem *item; int a; bool free; int w, h; @@ -1683,7 +1683,7 @@ static uiBlock *ui_icon_view_menu_cb(bContext *C, ARegion *ar, void *arg_litem) UI_block_direction_set(block, UI_DIR_DOWN); if (free) { - MEM_freeN(item); + MEM_freeN((void *)item); } return block; @@ -1696,7 +1696,7 @@ void uiTemplateIconView(uiLayout *layout, PointerRNA *ptr, const char *propname, { PropertyRNA *prop = RNA_struct_find_property(ptr, propname); IconViewMenuArgs *cb_args; - EnumPropertyItem *items; + const EnumPropertyItem *items; uiBlock *block; uiBut *but; int value, icon = ICON_NONE, tot_items; @@ -1724,7 +1724,7 @@ void uiTemplateIconView(uiLayout *layout, PointerRNA *ptr, const char *propname, ui_def_but_icon(but, icon, UI_HAS_ICON | UI_BUT_ICON_PREVIEW); if (free_items) { - MEM_freeN(items); + MEM_freeN((void *)items); } } |