From 7267221715d8431bd1aaaaa3ace4f8c0ce151627 Mon Sep 17 00:00:00 2001 From: Campbell Barton Date: Wed, 30 Oct 2013 23:08:53 +0000 Subject: remove return argument from wmOperatorType->cancel, was only ever returning OPERATOR_CANCELLED. --- source/blender/windowmanager/WM_api.h | 10 ++++---- source/blender/windowmanager/WM_types.h | 2 +- source/blender/windowmanager/intern/wm_operators.c | 28 +++++++--------------- 3 files changed, 14 insertions(+), 26 deletions(-) (limited to 'source/blender/windowmanager') diff --git a/source/blender/windowmanager/WM_api.h b/source/blender/windowmanager/WM_api.h index c338d49fe17..9bc12d04b02 100644 --- a/source/blender/windowmanager/WM_api.h +++ b/source/blender/windowmanager/WM_api.h @@ -294,20 +294,20 @@ void WM_menutype_free(void); /* default operator callbacks for border/circle/lasso */ int WM_border_select_invoke (struct bContext *C, struct wmOperator *op, const struct wmEvent *event); int WM_border_select_modal (struct bContext *C, struct wmOperator *op, const struct wmEvent *event); -int WM_border_select_cancel(struct bContext *C, struct wmOperator *op); +void WM_border_select_cancel(struct bContext *C, struct wmOperator *op); int WM_gesture_circle_invoke(struct bContext *C, struct wmOperator *op, const struct wmEvent *event); int WM_gesture_circle_modal(struct bContext *C, struct wmOperator *op, const struct wmEvent *event); -int WM_gesture_circle_cancel(struct bContext *C, struct wmOperator *op); +void WM_gesture_circle_cancel(struct bContext *C, struct wmOperator *op); int WM_gesture_lines_invoke(struct bContext *C, struct wmOperator *op, const struct wmEvent *event); int WM_gesture_lines_modal(struct bContext *C, struct wmOperator *op, const struct wmEvent *event); -int WM_gesture_lines_cancel(struct bContext *C, struct wmOperator *op); +void WM_gesture_lines_cancel(struct bContext *C, struct wmOperator *op); int WM_gesture_lasso_invoke(struct bContext *C, struct wmOperator *op, const struct wmEvent *event); int WM_gesture_lasso_modal(struct bContext *C, struct wmOperator *op, const struct wmEvent *event); -int WM_gesture_lasso_cancel(struct bContext *C, struct wmOperator *op); +void WM_gesture_lasso_cancel(struct bContext *C, struct wmOperator *op); const int (*WM_gesture_lasso_path_to_array(struct bContext *C, struct wmOperator *op, int *mcords_tot))[2]; int WM_gesture_straightline_invoke(struct bContext *C, struct wmOperator *op, const struct wmEvent *event); int WM_gesture_straightline_modal(struct bContext *C, struct wmOperator *op, const struct wmEvent *event); -int WM_gesture_straightline_cancel(struct bContext *C, struct wmOperator *op); +void WM_gesture_straightline_cancel(struct bContext *C, struct wmOperator *op); /* Gesture manager API */ struct wmGesture *WM_gesture_new(struct bContext *C, const struct wmEvent *event, int type); diff --git a/source/blender/windowmanager/WM_types.h b/source/blender/windowmanager/WM_types.h index ac9af832671..6538272a43c 100644 --- a/source/blender/windowmanager/WM_types.h +++ b/source/blender/windowmanager/WM_types.h @@ -535,7 +535,7 @@ typedef struct wmOperatorType { * canceled due to some external reason, cancel is called * - see defines below for return values */ int (*invoke)(struct bContext *, struct wmOperator *, const struct wmEvent *) ATTR_WARN_UNUSED_RESULT; - int (*cancel)(struct bContext *, struct wmOperator *); + void (*cancel)(struct bContext *, struct wmOperator *); int (*modal)(struct bContext *, struct wmOperator *, const struct wmEvent *) ATTR_WARN_UNUSED_RESULT; /* verify if the operator can be executed in the current context, note diff --git a/source/blender/windowmanager/intern/wm_operators.c b/source/blender/windowmanager/intern/wm_operators.c index 6091ec4a371..acc26f6f065 100644 --- a/source/blender/windowmanager/intern/wm_operators.c +++ b/source/blender/windowmanager/intern/wm_operators.c @@ -341,14 +341,14 @@ static int wm_macro_modal(bContext *C, wmOperator *op, const wmEvent *event) return wm_macro_end(op, retval); } -static int wm_macro_cancel(bContext *C, wmOperator *op) +static void wm_macro_cancel(bContext *C, wmOperator *op) { /* call cancel on the current modal operator, if any */ if (op->opm && op->opm->type->cancel) { op->opm->type->cancel(C, op->opm); } - return wm_macro_end(op, OPERATOR_CANCELLED); + wm_macro_end(op, OPERATOR_CANCELLED); } /* Names have to be static for now */ @@ -2844,11 +2844,9 @@ int WM_border_select_modal(bContext *C, wmOperator *op, const wmEvent *event) return OPERATOR_RUNNING_MODAL; } -int WM_border_select_cancel(bContext *C, wmOperator *op) +void WM_border_select_cancel(bContext *C, wmOperator *op) { wm_gesture_end(C, op); - - return OPERATOR_CANCELLED; } /* **************** circle gesture *************** */ @@ -2961,11 +2959,9 @@ int WM_gesture_circle_modal(bContext *C, wmOperator *op, const wmEvent *event) return OPERATOR_RUNNING_MODAL; } -int WM_gesture_circle_cancel(bContext *C, wmOperator *op) +void WM_gesture_circle_cancel(bContext *C, wmOperator *op) { wm_gesture_end(C, op); - - return OPERATOR_CANCELLED; } #if 0 @@ -3188,18 +3184,14 @@ int WM_gesture_lines_modal(bContext *C, wmOperator *op, const wmEvent *event) return WM_gesture_lasso_modal(C, op, event); } -int WM_gesture_lasso_cancel(bContext *C, wmOperator *op) +void WM_gesture_lasso_cancel(bContext *C, wmOperator *op) { wm_gesture_end(C, op); - - return OPERATOR_CANCELLED; } -int WM_gesture_lines_cancel(bContext *C, wmOperator *op) +void WM_gesture_lines_cancel(bContext *C, wmOperator *op) { wm_gesture_end(C, op); - - return OPERATOR_CANCELLED; } /** @@ -3365,11 +3357,9 @@ int WM_gesture_straightline_modal(bContext *C, wmOperator *op, const wmEvent *ev return OPERATOR_RUNNING_MODAL; } -int WM_gesture_straightline_cancel(bContext *C, wmOperator *op) +void WM_gesture_straightline_cancel(bContext *C, wmOperator *op) { wm_gesture_end(C, op); - - return OPERATOR_CANCELLED; } #if 0 @@ -3803,7 +3793,7 @@ static void radial_control_set_value(RadialControl *rc, float val) } } -static int radial_control_cancel(bContext *C, wmOperator *op) +static void radial_control_cancel(bContext *C, wmOperator *op) { RadialControl *rc = op->customdata; wmWindowManager *wm = CTX_wm_manager(C); @@ -3821,8 +3811,6 @@ static int radial_control_cancel(bContext *C, wmOperator *op) glDeleteTextures(1, &rc->gltex); MEM_freeN(rc); - - return OPERATOR_CANCELLED; } static int radial_control_modal(bContext *C, wmOperator *op, const wmEvent *event) -- cgit v1.2.3