diff options
author | Sybren A. Stüvel <sybren@blender.org> | 2020-07-03 15:20:10 +0300 |
---|---|---|
committer | Sybren A. Stüvel <sybren@blender.org> | 2020-07-03 15:48:37 +0300 |
commit | f3b8792b963b0b2a00fe7fe173f1beb85c209fbb (patch) | |
tree | 55ffa18ad4a6f2f03a127469780d47c54ad9bd74 /source/blender/editors/interface/interface_handlers.c | |
parent | 86e7648f0edc13d613d8fc39af7758e08cfdf9e2 (diff) |
Cleanup: Interface, Clang-Tidy else-after-return fixes
This addresses warnings from Clang-Tidy's `readability-else-after-return`
rule in the `source/blender/editors/interface` module.
No functional changes.
Diffstat (limited to 'source/blender/editors/interface/interface_handlers.c')
-rw-r--r-- | source/blender/editors/interface/interface_handlers.c | 90 |
1 files changed, 34 insertions, 56 deletions
diff --git a/source/blender/editors/interface/interface_handlers.c b/source/blender/editors/interface/interface_handlers.c index f6bfb492c92..ccbbaf40992 100644 --- a/source/blender/editors/interface/interface_handlers.c +++ b/source/blender/editors/interface/interface_handlers.c @@ -1384,16 +1384,14 @@ static bool ui_drag_toggle_but_is_supported(const uiBut *but) if (ui_but_is_bool(but)) { return true; } - else if (UI_but_is_decorator(but)) { + if (UI_but_is_decorator(but)) { return ELEM(but->icon, ICON_DECORATE, ICON_DECORATE_KEYFRAME, ICON_DECORATE_ANIMATE, ICON_DECORATE_OVERRIDE); } - else { - return false; - } + return false; } /* Button pushed state to compare if other buttons match. Can be more @@ -1404,19 +1402,15 @@ static int ui_drag_toggle_but_pushed_state(bContext *C, uiBut *but) if (but->pushed_state_func) { return but->pushed_state_func(C, but->pushed_state_arg); } - else { - /* Assume icon identifies a unique state, for buttons that - * work though functions callbacks and don't have an boolean - * value that indicates the state. */ - return but->icon + but->iconadd; - } + /* Assume icon identifies a unique state, for buttons that + * work though functions callbacks and don't have an boolean + * value that indicates the state. */ + return but->icon + but->iconadd; } - else if (ui_but_is_bool(but)) { + if (ui_but_is_bool(but)) { return ui_but_is_pushed(but); } - else { - return 0; - } + return 0; } typedef struct uiDragToggleHandle { @@ -1582,9 +1576,7 @@ static int ui_handler_region_drag_toggle(bContext *C, const wmEvent *event, void WM_event_add_mousemove(win); return WM_UI_HANDLER_BREAK; } - else { - return WM_UI_HANDLER_CONTINUE; - } + return WM_UI_HANDLER_CONTINUE; } static bool ui_but_is_drag_toggle(const uiBut *but) @@ -2332,9 +2324,7 @@ static bool parse_float_array(char *text, float *values, int expected_length) memcpy(values, v, sizeof(float) * expected_length); return true; } - else { - return false; - } + return false; } static void ui_but_paste_numeric_array(bContext *C, @@ -4204,7 +4194,7 @@ static int ui_do_but_BUT(bContext *C, uiBut *but, uiHandleButtonData *data, cons button_activate_state(C, but, BUTTON_STATE_WAIT_RELEASE); return WM_UI_HANDLER_BREAK; } - else if (event->type == LEFTMOUSE && event->val == KM_RELEASE && but->block->handle) { + if (event->type == LEFTMOUSE && event->val == KM_RELEASE && but->block->handle) { /* regular buttons will be 'UI_SELECT', menu items 'UI_ACTIVE' */ if (!(but->flag & (UI_SELECT | UI_ACTIVE))) { data->cancel = true; @@ -4212,7 +4202,7 @@ static int ui_do_but_BUT(bContext *C, uiBut *but, uiHandleButtonData *data, cons button_activate_state(C, but, BUTTON_STATE_EXIT); return WM_UI_HANDLER_BREAK; } - else if (ELEM(event->type, EVT_PADENTER, EVT_RETKEY) && event->val == KM_PRESS) { + if (ELEM(event->type, EVT_PADENTER, EVT_RETKEY) && event->val == KM_PRESS) { button_activate_state(C, but, BUTTON_STATE_WAIT_FLASH); return WM_UI_HANDLER_BREAK; } @@ -4247,11 +4237,11 @@ static int ui_do_but_HOTKEYEVT(bContext *C, if (ELEM(event->type, MOUSEMOVE, INBETWEEN_MOUSEMOVE)) { return WM_UI_HANDLER_CONTINUE; } - else if (event->type == EVT_UNKNOWNKEY) { + if (event->type == EVT_UNKNOWNKEY) { WM_report(RPT_WARNING, "Unsupported key: Unknown"); return WM_UI_HANDLER_CONTINUE; } - else if (event->type == EVT_CAPSLOCKKEY) { + if (event->type == EVT_CAPSLOCKKEY) { WM_report(RPT_WARNING, "Unsupported key: CapsLock"); return WM_UI_HANDLER_CONTINUE; } @@ -4301,7 +4291,7 @@ static int ui_do_but_HOTKEYEVT(bContext *C, button_activate_state(C, but, BUTTON_STATE_EXIT); return WM_UI_HANDLER_BREAK; } - else if (event->type == EVT_ESCKEY) { + if (event->type == EVT_ESCKEY) { if (event->val == KM_PRESS) { data->cancel = true; data->escapecancel = true; @@ -4367,7 +4357,7 @@ static int ui_do_but_TAB( button_activate_state(C, but, BUTTON_STATE_TEXT_EDITING); return WM_UI_HANDLER_BREAK; } - else if (ELEM(event->type, LEFTMOUSE, EVT_PADENTER, EVT_RETKEY)) { + if (ELEM(event->type, LEFTMOUSE, EVT_PADENTER, EVT_RETKEY)) { int event_val = (is_property) ? KM_PRESS : KM_CLICK; if (event->val == event_val) { button_activate_state(C, but, BUTTON_STATE_EXIT); @@ -4469,7 +4459,7 @@ static int ui_do_but_TOG(bContext *C, uiBut *but, uiHandleButtonData *data, cons button_activate_state(C, but, BUTTON_STATE_EXIT); return WM_UI_HANDLER_BREAK; } - else if (ELEM(event->type, WHEELDOWNMOUSE, WHEELUPMOUSE) && event->ctrl) { + if (ELEM(event->type, WHEELDOWNMOUSE, WHEELUPMOUSE) && event->ctrl) { /* Support alt+wheel on expanded enum rows */ if (but->type == UI_BTYPE_ROW) { const int direction = (event->type == WHEELDOWNMOUSE) ? -1 : 1; @@ -5567,7 +5557,7 @@ static int ui_do_but_BLOCK(bContext *C, uiBut *but, uiHandleButtonData *data, co button_activate_state(C, but, BUTTON_STATE_MENU_OPEN); return WM_UI_HANDLER_BREAK; } - else if (but->type == UI_BTYPE_MENU) { + if (but->type == UI_BTYPE_MENU) { if (ELEM(event->type, WHEELDOWNMOUSE, WHEELUPMOUSE) && event->ctrl) { const int direction = (event->type == WHEELDOWNMOUSE) ? 1 : -1; @@ -5741,7 +5731,7 @@ static int ui_do_but_COLOR(bContext *C, uiBut *but, uiHandleButtonData *data, co button_activate_state(C, but, BUTTON_STATE_MENU_OPEN); return WM_UI_HANDLER_BREAK; } - else if (ELEM(event->type, MOUSEPAN, WHEELDOWNMOUSE, WHEELUPMOUSE) && event->ctrl) { + if (ELEM(event->type, MOUSEPAN, WHEELDOWNMOUSE, WHEELUPMOUSE) && event->ctrl) { ColorPicker *cpicker = but->custom_data; float hsv_static[3] = {0.0f}; float *hsv = cpicker ? cpicker->color_data : hsv_static; @@ -5768,8 +5758,8 @@ static int ui_do_but_COLOR(bContext *C, uiBut *but, uiHandleButtonData *data, co ui_apply_but(C, but->block, but, data, true); return WM_UI_HANDLER_BREAK; } - else if ((int)(but->a1) == UI_PALETTE_COLOR && event->type == EVT_DELKEY && - event->val == KM_PRESS) { + if ((int)(but->a1) == UI_PALETTE_COLOR && event->type == EVT_DELKEY && + event->val == KM_PRESS) { Palette *palette = (Palette *)but->rnapoin.owner_id; PaletteColor *color = but->rnapoin.data; @@ -6174,7 +6164,7 @@ static int ui_do_but_HSVCUBE( return WM_UI_HANDLER_BREAK; } #ifdef WITH_INPUT_NDOF - else if (event->type == NDOF_MOTION) { + if (event->type == NDOF_MOTION) { const wmNDOFMotionData *ndof = event->customdata; const enum eSnapType snap = ui_event_to_snap(event); @@ -6187,7 +6177,7 @@ static int ui_do_but_HSVCUBE( } #endif /* WITH_INPUT_NDOF */ /* XXX hardcoded keymap check.... */ - else if (event->type == EVT_BACKSPACEKEY && event->val == KM_PRESS) { + if (event->type == EVT_BACKSPACEKEY && event->val == KM_PRESS) { if (ELEM(but->a1, UI_GRAD_V_ALT, UI_GRAD_L_ALT)) { int len; @@ -6450,7 +6440,7 @@ static int ui_do_but_HSVCIRCLE( return WM_UI_HANDLER_BREAK; } #ifdef WITH_INPUT_NDOF - else if (event->type == NDOF_MOTION) { + if (event->type == NDOF_MOTION) { const enum eSnapType snap = ui_event_to_snap(event); const wmNDOFMotionData *ndof = event->customdata; @@ -6463,7 +6453,7 @@ static int ui_do_but_HSVCIRCLE( } #endif /* WITH_INPUT_NDOF */ /* XXX hardcoded keymap check.... */ - else if (event->type == EVT_BACKSPACEKEY && event->val == KM_PRESS) { + if (event->type == EVT_BACKSPACEKEY && event->val == KM_PRESS) { int len; /* reset only saturation */ @@ -7257,7 +7247,7 @@ static int ui_do_but_HISTOGRAM( return WM_UI_HANDLER_BREAK; } /* XXX hardcoded keymap check.... */ - else if (event->type == EVT_BACKSPACEKEY && event->val == KM_PRESS) { + if (event->type == EVT_BACKSPACEKEY && event->val == KM_PRESS) { Histogram *hist = (Histogram *)but->poin; hist->ymax = 1.f; @@ -7333,7 +7323,7 @@ static int ui_do_but_WAVEFORM( return WM_UI_HANDLER_BREAK; } /* XXX hardcoded keymap check.... */ - else if (event->type == EVT_BACKSPACEKEY && event->val == KM_PRESS) { + if (event->type == EVT_BACKSPACEKEY && event->val == KM_PRESS) { Scopes *scopes = (Scopes *)but->poin; scopes->wavefrm_yfac = 1.f; @@ -9423,9 +9413,7 @@ static bool ui_menu_pass_event_to_parent_if_nonactive(uiPopupBlockHandle *menu, BLI_assert(retval == WM_UI_HANDLER_CONTINUE); return true; } - else { - return false; - } + return false; } static int ui_handle_menu_button(bContext *C, const wmEvent *event, uiPopupBlockHandle *menu) @@ -10120,12 +10108,10 @@ static int ui_handle_menu_event(bContext *C, if (menu->menuretval) { return WM_UI_HANDLER_CONTINUE; } - else if (inside) { + if (inside) { return WM_UI_HANDLER_BREAK; } - else { - return retval; - } + return retval; } static int ui_handle_menu_return_submenu(bContext *C, @@ -10180,9 +10166,7 @@ static int ui_handle_menu_return_submenu(bContext *C, if (menu->menuretval) { return WM_UI_HANDLER_CONTINUE; } - else { - return WM_UI_HANDLER_BREAK; - } + return WM_UI_HANDLER_BREAK; } static bool ui_but_pie_menu_supported_apply(uiBut *but) @@ -10210,9 +10194,7 @@ static int ui_but_pie_menu_apply(bContext *C, button_activate_init(C, menu->region, but, BUTTON_ACTIVATE_OPEN); return retval; } - else { - menu->menuretval = UI_RETURN_CANCEL; - } + menu->menuretval = UI_RETURN_CANCEL; } else { ui_apply_but(C, but->block, but, but->active, false); @@ -10998,9 +10980,7 @@ bool UI_textbutton_activate_rna(const bContext *C, UI_but_active_only(C, region, block, but); return true; } - else { - return false; - } + return false; } bool UI_textbutton_activate_but(const bContext *C, uiBut *actbut) @@ -11025,9 +11005,7 @@ bool UI_textbutton_activate_but(const bContext *C, uiBut *actbut) UI_but_active_only(C, region, block, but); return true; } - else { - return false; - } + return false; } /** \} */ |