From 04d3b54000bedd06bc767fa908772c0b20cb792f Mon Sep 17 00:00:00 2001 From: Hans Goudey Date: Fri, 4 Dec 2020 08:03:14 -0600 Subject: Cleanup: Declare variables where initialized --- .../editors/interface/interface_context_menu.c | 248 ++++++++++----------- 1 file changed, 117 insertions(+), 131 deletions(-) diff --git a/source/blender/editors/interface/interface_context_menu.c b/source/blender/editors/interface/interface_context_menu.c index 02a9c3742d7..39b405a02b8 100644 --- a/source/blender/editors/interface/interface_context_menu.c +++ b/source/blender/editors/interface/interface_context_menu.c @@ -90,9 +90,8 @@ static IDProperty *shortcut_property_from_rna(bContext *C, uiBut *but) } /* Create ID property of data path, to pass to the operator. */ - IDProperty *prop; const IDPropertyTemplate val = {0}; - prop = IDP_New(IDP_GROUP, &val, __func__); + IDProperty *prop = IDP_New(IDP_GROUP, &val, __func__); IDP_AddToGroup(prop, IDP_NewString(final_data_path, "data_path", strlen(final_data_path) + 1)); MEM_freeN((void *)final_data_path); @@ -167,43 +166,40 @@ static void but_shortcut_name_func(bContext *C, void *arg1, int UNUSED(event)) static uiBlock *menu_change_shortcut(bContext *C, ARegion *region, void *arg) { wmWindowManager *wm = CTX_wm_manager(C); - uiBlock *block; uiBut *but = (uiBut *)arg; - wmKeyMap *km; - wmKeyMapItem *kmi; PointerRNA ptr; - uiLayout *layout; const uiStyle *style = UI_style_get_dpi(); IDProperty *prop; const char *idname = shortcut_get_operator_property(C, but, &prop); - kmi = WM_key_event_operator(C, - idname, - but->opcontext, - prop, - EVT_TYPE_MASK_HOTKEY_INCLUDE, - EVT_TYPE_MASK_HOTKEY_EXCLUDE, - &km); + wmKeyMap *km; + wmKeyMapItem *kmi = WM_key_event_operator(C, + idname, + but->opcontext, + prop, + EVT_TYPE_MASK_HOTKEY_INCLUDE, + EVT_TYPE_MASK_HOTKEY_EXCLUDE, + &km); U.runtime.is_dirty = true; BLI_assert(kmi != NULL); RNA_pointer_create(&wm->id, &RNA_KeyMapItem, kmi, &ptr); - block = UI_block_begin(C, region, "_popup", UI_EMBOSS); + uiBlock *block = UI_block_begin(C, region, "_popup", UI_EMBOSS); UI_block_func_handle_set(block, but_shortcut_name_func, but); UI_block_flag_enable(block, UI_BLOCK_MOVEMOUSE_QUIT); UI_block_direction_set(block, UI_DIR_CENTER_Y); - layout = UI_block_layout(block, - UI_LAYOUT_VERTICAL, - UI_LAYOUT_PANEL, - 0, - 0, - U.widget_unit * 10, - U.widget_unit * 2, - 0, - style); + uiLayout *layout = UI_block_layout(block, + UI_LAYOUT_VERTICAL, + UI_LAYOUT_PANEL, + 0, + 0, + U.widget_unit * 10, + U.widget_unit * 2, + 0, + style); uiItemL(layout, CTX_IFACE_(BLT_I18NCONTEXT_OPERATOR_DEFAULT, "Change Shortcut"), ICON_HAND); uiItemR(layout, &ptr, "type", UI_ITEM_R_FULL_EVENT | UI_ITEM_R_IMMEDIATE, "", ICON_NONE); @@ -223,22 +219,17 @@ static int g_kmi_id_hack; static uiBlock *menu_add_shortcut(bContext *C, ARegion *region, void *arg) { wmWindowManager *wm = CTX_wm_manager(C); - uiBlock *block; uiBut *but = (uiBut *)arg; - wmKeyMap *km; - wmKeyMapItem *kmi; PointerRNA ptr; - uiLayout *layout; const uiStyle *style = UI_style_get_dpi(); - int kmi_id; IDProperty *prop; const char *idname = shortcut_get_operator_property(C, but, &prop); /* XXX this guess_opname can potentially return a different keymap * than being found on adding later... */ - km = WM_keymap_guess_opname(C, idname); - kmi = WM_keymap_add_item(km, idname, EVT_AKEY, KM_PRESS, 0, 0); - kmi_id = kmi->id; + wmKeyMap *km = WM_keymap_guess_opname(C, idname); + wmKeyMapItem *kmi = WM_keymap_add_item(km, idname, EVT_AKEY, KM_PRESS, 0, 0); + int kmi_id = kmi->id; /* This takes ownership of prop, or prop can be NULL for reset. */ WM_keymap_item_properties_reset(kmi, prop); @@ -252,19 +243,19 @@ static uiBlock *menu_add_shortcut(bContext *C, ARegion *region, void *arg) RNA_pointer_create(&wm->id, &RNA_KeyMapItem, kmi, &ptr); - block = UI_block_begin(C, region, "_popup", UI_EMBOSS); + uiBlock *block = UI_block_begin(C, region, "_popup", UI_EMBOSS); UI_block_func_handle_set(block, but_shortcut_name_func, but); UI_block_direction_set(block, UI_DIR_CENTER_Y); - layout = UI_block_layout(block, - UI_LAYOUT_VERTICAL, - UI_LAYOUT_PANEL, - 0, - 0, - U.widget_unit * 10, - U.widget_unit * 2, - 0, - style); + uiLayout *layout = UI_block_layout(block, + UI_LAYOUT_VERTICAL, + UI_LAYOUT_PANEL, + 0, + 0, + U.widget_unit * 10, + U.widget_unit * 2, + 0, + style); uiItemL(layout, CTX_IFACE_(BLT_I18NCONTEXT_OPERATOR_DEFAULT, "Assign Shortcut"), ICON_HAND); uiItemR(layout, &ptr, "type", UI_ITEM_R_FULL_EVENT | UI_ITEM_R_IMMEDIATE, "", ICON_NONE); @@ -282,24 +273,21 @@ static uiBlock *menu_add_shortcut(bContext *C, ARegion *region, void *arg) static void menu_add_shortcut_cancel(struct bContext *C, void *arg1) { uiBut *but = (uiBut *)arg1; - wmKeyMap *km; - wmKeyMapItem *kmi; - int kmi_id; IDProperty *prop; const char *idname = shortcut_get_operator_property(C, but, &prop); #ifdef USE_KEYMAP_ADD_HACK - km = WM_keymap_guess_opname(C, idname); - kmi_id = g_kmi_id_hack; + wmKeyMap *km = WM_keymap_guess_opname(C, idname); + int kmi_id = g_kmi_id_hack; UNUSED_VARS(but); #else - kmi_id = WM_key_event_operator_id(C, idname, but->opcontext, prop, true, &km); + int kmi_id = WM_key_event_operator_id(C, idname, but->opcontext, prop, true, &km); #endif shortcut_free_operator_property(prop); - kmi = WM_keymap_item_find_id(km, kmi_id); + wmKeyMapItem *kmi = WM_keymap_item_find_id(km, kmi_id); WM_keymap_remove_item(km, kmi); } @@ -312,18 +300,17 @@ static void popup_change_shortcut_func(bContext *C, void *arg1, void *UNUSED(arg static void remove_shortcut_func(bContext *C, void *arg1, void *UNUSED(arg2)) { uiBut *but = (uiBut *)arg1; - wmKeyMap *km; - wmKeyMapItem *kmi; IDProperty *prop; const char *idname = shortcut_get_operator_property(C, but, &prop); - kmi = WM_key_event_operator(C, - idname, - but->opcontext, - prop, - EVT_TYPE_MASK_HOTKEY_INCLUDE, - EVT_TYPE_MASK_HOTKEY_EXCLUDE, - &km); + wmKeyMap *km; + wmKeyMapItem *kmi = WM_key_event_operator(C, + idname, + but->opcontext, + prop, + EVT_TYPE_MASK_HOTKEY_INCLUDE, + EVT_TYPE_MASK_HOTKEY_EXCLUDE, + &km); BLI_assert(kmi != NULL); WM_keymap_remove_item(km, kmi); @@ -349,7 +336,6 @@ static bool ui_but_is_user_menu_compatible(bContext *C, uiBut *but) static bUserMenuItem *ui_but_user_menu_find(bContext *C, uiBut *but, bUserMenu *um) { - MenuType *mt = NULL; if (but->optype) { IDProperty *prop = (but->opptr) ? but->opptr->data : NULL; return (bUserMenuItem *)ED_screen_user_menu_item_find_operator( @@ -373,7 +359,9 @@ static bUserMenuItem *ui_but_user_menu_find(bContext *C, uiBut *but, bUserMenu * } return umi; } - if ((mt = UI_but_menutype_get(but))) { + + MenuType *mt = UI_but_menutype_get(but); + if (mt != NULL) { return (bUserMenuItem *)ED_screen_user_menu_item_find_menu(&um->items, mt); } return NULL; @@ -515,7 +503,6 @@ bool ui_popup_context_menu_for_button(bContext *C, uiBut *but) uiPopupMenu *pup; uiLayout *layout; - { uiStringInfo label = {BUT_GET_LABEL, NULL}; @@ -979,7 +966,6 @@ bool ui_popup_context_menu_for_button(bContext *C, uiBut *but) if (ui_but_is_user_menu_compatible(C, but)) { uiBlock *block = uiLayoutGetBlock(layout); const int w = uiLayoutGetWidth(layout); - uiBut *but2; bool item_found = false; uint um_array_len; @@ -991,7 +977,7 @@ bool ui_popup_context_menu_for_button(bContext *C, uiBut *but) } bUserMenuItem *umi = ui_but_user_menu_find(C, but, um); if (umi != NULL) { - but2 = uiDefIconTextBut( + uiBut *but2 = uiDefIconTextBut( block, UI_BTYPE_BUT, 0, @@ -1016,7 +1002,7 @@ bool ui_popup_context_menu_for_button(bContext *C, uiBut *but) } if (!item_found) { - but2 = uiDefIconTextBut( + uiBut *but2 = uiDefIconTextBut( block, UI_BTYPE_BUT, 0, @@ -1043,11 +1029,10 @@ bool ui_popup_context_menu_for_button(bContext *C, uiBut *but) const char *idname = shortcut_get_operator_property(C, but, &prop); if (idname != NULL) { uiBlock *block = uiLayoutGetBlock(layout); - uiBut *but2; const int w = uiLayoutGetWidth(layout); - wmKeyMap *km; /* We want to know if this op has a shortcut, be it hotkey or not. */ + wmKeyMap *km; wmKeyMapItem *kmi = WM_key_event_operator( C, idname, but->opcontext, prop, EVT_TYPE_MASK_ALL, 0, &km); @@ -1066,77 +1051,80 @@ bool ui_popup_context_menu_for_button(bContext *C, uiBut *but) ""); #endif - but2 = uiDefIconTextBut(block, - UI_BTYPE_BUT, - 0, - ICON_HAND, - CTX_IFACE_(BLT_I18NCONTEXT_OPERATOR_DEFAULT, "Change Shortcut"), - 0, - 0, - w, - UI_UNIT_Y, - NULL, - 0, - 0, - 0, - 0, - ""); + uiBut *but2 = uiDefIconTextBut( + block, + UI_BTYPE_BUT, + 0, + ICON_HAND, + CTX_IFACE_(BLT_I18NCONTEXT_OPERATOR_DEFAULT, "Change Shortcut"), + 0, + 0, + w, + UI_UNIT_Y, + NULL, + 0, + 0, + 0, + 0, + ""); UI_but_func_set(but2, popup_change_shortcut_func, but, NULL); } else { - but2 = uiDefIconTextBut(block, - UI_BTYPE_BUT, - 0, - ICON_HAND, - IFACE_("Non-Keyboard Shortcut"), - 0, - 0, - w, - UI_UNIT_Y, - NULL, - 0, - 0, - 0, - 0, - TIP_("Only keyboard shortcuts can be edited that way, " - "please use User Preferences otherwise")); + uiBut *but2 = uiDefIconTextBut(block, + UI_BTYPE_BUT, + 0, + ICON_HAND, + IFACE_("Non-Keyboard Shortcut"), + 0, + 0, + w, + UI_UNIT_Y, + NULL, + 0, + 0, + 0, + 0, + TIP_("Only keyboard shortcuts can be edited that way, " + "please use User Preferences otherwise")); UI_but_flag_enable(but2, UI_BUT_DISABLED); } - but2 = uiDefIconTextBut(block, - UI_BTYPE_BUT, - 0, - ICON_BLANK1, - CTX_IFACE_(BLT_I18NCONTEXT_OPERATOR_DEFAULT, "Remove Shortcut"), - 0, - 0, - w, - UI_UNIT_Y, - NULL, - 0, - 0, - 0, - 0, - ""); + uiBut *but2 = uiDefIconTextBut( + block, + UI_BTYPE_BUT, + 0, + ICON_BLANK1, + CTX_IFACE_(BLT_I18NCONTEXT_OPERATOR_DEFAULT, "Remove Shortcut"), + 0, + 0, + w, + UI_UNIT_Y, + NULL, + 0, + 0, + 0, + 0, + ""); UI_but_func_set(but2, remove_shortcut_func, but, NULL); } /* only show 'assign' if there's a suitable key map for it to go in */ else if (WM_keymap_guess_opname(C, idname)) { - but2 = uiDefIconTextBut(block, - UI_BTYPE_BUT, - 0, - ICON_HAND, - CTX_IFACE_(BLT_I18NCONTEXT_OPERATOR_DEFAULT, "Assign Shortcut"), - 0, - 0, - w, - UI_UNIT_Y, - NULL, - 0, - 0, - 0, - 0, - ""); + uiBut *but2 = uiDefIconTextBut( + block, + UI_BTYPE_BUT, + 0, + ICON_HAND, + CTX_IFACE_(BLT_I18NCONTEXT_OPERATOR_DEFAULT, "Assign Shortcut"), + 0, + 0, + w, + UI_UNIT_Y, + NULL, + 0, + 0, + 0, + 0, + ""); UI_but_func_set(but2, popup_add_shortcut_func, but, NULL); } @@ -1239,9 +1227,6 @@ void ui_popup_context_menu_for_panel(bContext *C, ARegion *region, Panel *panel) bScreen *screen = CTX_wm_screen(C); const bool has_panel_category = UI_panel_category_is_visible(region); const bool any_item_visible = has_panel_category; - PointerRNA ptr; - uiPopupMenu *pup; - uiLayout *layout; if (!any_item_visible) { return; @@ -1250,10 +1235,11 @@ void ui_popup_context_menu_for_panel(bContext *C, ARegion *region, Panel *panel) return; } + PointerRNA ptr; RNA_pointer_create(&screen->id, &RNA_Panel, panel, &ptr); - pup = UI_popup_menu_begin(C, IFACE_("Panel"), ICON_NONE); - layout = UI_popup_menu_layout(pup); + uiPopupMenu *pup = UI_popup_menu_begin(C, IFACE_("Panel"), ICON_NONE); + uiLayout *layout = UI_popup_menu_layout(pup); if (has_panel_category) { char tmpstr[80]; -- cgit v1.2.3