diff options
Diffstat (limited to 'source/blender/editors/interface')
20 files changed, 84 insertions, 89 deletions
diff --git a/source/blender/editors/interface/interface.cc b/source/blender/editors/interface/interface.cc index 42b3198a9c0..ec922ea301b 100644 --- a/source/blender/editors/interface/interface.cc +++ b/source/blender/editors/interface/interface.cc @@ -82,9 +82,9 @@ static void ui_but_to_pixelrect(struct rcti *rect, const struct ARegion *region, struct uiBlock *block, const struct uiBut *but); -static void ui_def_but_rna__menu(bContext *UNUSED(C), uiLayout *layout, void *but_p); -static void ui_def_but_rna__panel_type(bContext *UNUSED(C), uiLayout *layout, void *but_p); -static void ui_def_but_rna__menu_type(bContext *UNUSED(C), uiLayout *layout, void *but_p); +static void ui_def_but_rna__menu(bContext * /*C*/, uiLayout *layout, void *but_p); +static void ui_def_but_rna__panel_type(bContext * /*C*/, uiLayout *layout, void *but_p); +static void ui_def_but_rna__menu_type(bContext * /*C*/, uiLayout *layout, void *but_p); /* avoid unneeded calls to ui_but_value_get */ #define UI_BUT_VALUE_UNSET DBL_MAX @@ -4263,7 +4263,7 @@ void ui_def_but_icon_clear(uiBut *but) but->drawflag &= ~UI_BUT_ICON_LEFT; } -static void ui_def_but_rna__menu(bContext *UNUSED(C), uiLayout *layout, void *but_p) +static void ui_def_but_rna__menu(bContext * /*C*/, uiLayout *layout, void *but_p) { uiBlock *block = uiLayoutGetBlock(layout); uiPopupBlockHandle *handle = block->handle; @@ -6341,7 +6341,7 @@ static void operator_enum_search_update_fn(const struct bContext *C, void *but, const char *str, uiSearchItems *items, - const bool UNUSED(is_first)) + const bool /*is_first*/) { wmOperatorType *ot = ((uiBut *)but)->optype; PropertyRNA *prop = ot->prop; @@ -6390,7 +6390,7 @@ static void operator_enum_search_update_fn(const struct bContext *C, } } -static void operator_enum_search_exec_fn(struct bContext *UNUSED(C), void *but, void *arg2) +static void operator_enum_search_exec_fn(struct bContext * /*C*/, void *but, void *arg2) { wmOperatorType *ot = ((uiBut *)but)->optype; /* Will create it if needed! */ diff --git a/source/blender/editors/interface/interface_anim.cc b/source/blender/editors/interface/interface_anim.cc index 4da6cefd8de..58a7ac93242 100644 --- a/source/blender/editors/interface/interface_anim.cc +++ b/source/blender/editors/interface/interface_anim.cc @@ -315,7 +315,7 @@ void ui_but_anim_paste_driver(bContext *C) WM_operator_name_call(C, "ANIM_OT_paste_driver_button", WM_OP_INVOKE_DEFAULT, nullptr, nullptr); } -void ui_but_anim_decorate_cb(bContext *C, void *arg_but, void *UNUSED(arg_dummy)) +void ui_but_anim_decorate_cb(bContext *C, void *arg_but, void * /*arg_dummy*/) { wmWindowManager *wm = CTX_wm_manager(C); uiButDecorator *but_decorate = static_cast<uiButDecorator *>(arg_but); diff --git a/source/blender/editors/interface/interface_dropboxes.cc b/source/blender/editors/interface/interface_dropboxes.cc index 378162a120e..ebfde05f516 100644 --- a/source/blender/editors/interface/interface_dropboxes.cc +++ b/source/blender/editors/interface/interface_dropboxes.cc @@ -41,10 +41,7 @@ static bool ui_view_drop_poll(bContext *C, wmDrag *drag, const wmEvent *event) return UI_view_item_can_drop(hovered_item, drag, &drag->drop_state.disabled_info); } -static char *ui_view_drop_tooltip(bContext *C, - wmDrag *drag, - const int xy[2], - wmDropBox *UNUSED(drop)) +static char *ui_view_drop_tooltip(bContext *C, wmDrag *drag, const int xy[2], wmDropBox * /*drop*/) { const ARegion *region = CTX_wm_region(C); const uiViewItemHandle *hovered_item = UI_region_views_find_item_at(region, xy); @@ -61,12 +58,12 @@ static char *ui_view_drop_tooltip(bContext *C, /** \name Name Drag/Drop Callbacks * \{ */ -static bool ui_drop_name_poll(struct bContext *C, wmDrag *drag, const wmEvent *UNUSED(event)) +static bool ui_drop_name_poll(struct bContext *C, wmDrag *drag, const wmEvent * /*event*/) { return UI_but_active_drop_name(C) && (drag->type == WM_DRAG_ID); } -static void ui_drop_name_copy(bContext *UNUSED(C), wmDrag *drag, wmDropBox *drop) +static void ui_drop_name_copy(bContext * /*C*/, wmDrag *drag, wmDropBox *drop) { const ID *id = WM_drag_get_local_ID(drag, 0); RNA_string_set(drop->ptr, "string", id->name + 2); @@ -78,13 +75,13 @@ static void ui_drop_name_copy(bContext *UNUSED(C), wmDrag *drag, wmDropBox *drop /** \name Material Drag/Drop Callbacks * \{ */ -static bool ui_drop_material_poll(bContext *C, wmDrag *drag, const wmEvent *UNUSED(event)) +static bool ui_drop_material_poll(bContext *C, wmDrag *drag, const wmEvent * /*event*/) { PointerRNA mat_slot = CTX_data_pointer_get_type(C, "material_slot", &RNA_MaterialSlot); return WM_drag_is_ID_type(drag, ID_MA) && !RNA_pointer_is_null(&mat_slot); } -static void ui_drop_material_copy(bContext *UNUSED(C), wmDrag *drag, wmDropBox *drop) +static void ui_drop_material_copy(bContext * /*C*/, wmDrag *drag, wmDropBox *drop) { const ID *id = WM_drag_get_local_ID_or_import_from_asset(drag, ID_MA); RNA_int_set(drop->ptr, "session_uuid", int(id->session_uuid)); @@ -93,7 +90,7 @@ static void ui_drop_material_copy(bContext *UNUSED(C), wmDrag *drag, wmDropBox * static char *ui_drop_material_tooltip(bContext *C, wmDrag *drag, const int UNUSED(xy[2]), - struct wmDropBox *UNUSED(drop)) + struct wmDropBox * /*drop*/) { PointerRNA rna_ptr = CTX_data_pointer_get_type(C, "object", &RNA_Object); Object *ob = (Object *)rna_ptr.data; diff --git a/source/blender/editors/interface/interface_ops.cc b/source/blender/editors/interface/interface_ops.cc index 603b2c96713..6815f8689f5 100644 --- a/source/blender/editors/interface/interface_ops.cc +++ b/source/blender/editors/interface/interface_ops.cc @@ -270,7 +270,7 @@ static bool copy_python_command_button_poll(bContext *C) return false; } -static int copy_python_command_button_exec(bContext *C, wmOperator *UNUSED(op)) +static int copy_python_command_button_exec(bContext *C, wmOperator * /*op*/) { uiBut *but = UI_context_active_but_get(C); @@ -421,7 +421,7 @@ static bool assign_default_button_poll(bContext *C) return false; } -static int assign_default_button_exec(bContext *C, wmOperator *UNUSED(op)) +static int assign_default_button_exec(bContext *C, wmOperator * /*op*/) { PointerRNA ptr; PropertyRNA *prop; @@ -461,7 +461,7 @@ static void UI_OT_assign_default_button(wmOperatorType *ot) /** \name Unset Property Button Operator * \{ */ -static int unset_property_button_exec(bContext *C, wmOperator *UNUSED(op)) +static int unset_property_button_exec(bContext *C, wmOperator * /*op*/) { PointerRNA ptr; PropertyRNA *prop; @@ -609,9 +609,7 @@ static int override_type_set_button_exec(bContext *C, wmOperator *op) return operator_button_property_finish(C, &ptr, prop); } -static int override_type_set_button_invoke(bContext *C, - wmOperator *op, - const wmEvent *UNUSED(event)) +static int override_type_set_button_invoke(bContext *C, wmOperator *op, const wmEvent * /*event*/) { #if 0 /* Disabled for now */ return WM_menu_invoke_ex(C, op, WM_OP_INVOKE_DEFAULT); @@ -806,7 +804,7 @@ static bool override_idtemplate_make_poll(bContext *C) return override_idtemplate_poll(C, true); } -static int override_idtemplate_make_exec(bContext *C, wmOperator *UNUSED(op)) +static int override_idtemplate_make_exec(bContext *C, wmOperator * /*op*/) { ID *owner_id, *id; PointerRNA owner_ptr; @@ -869,7 +867,7 @@ static bool override_idtemplate_reset_poll(bContext *C) return override_idtemplate_poll(C, false); } -static int override_idtemplate_reset_exec(bContext *C, wmOperator *UNUSED(op)) +static int override_idtemplate_reset_exec(bContext *C, wmOperator * /*op*/) { ID *owner_id, *id; PointerRNA owner_ptr; @@ -917,7 +915,7 @@ static bool override_idtemplate_clear_poll(bContext *C) return override_idtemplate_poll(C, false); } -static int override_idtemplate_clear_exec(bContext *C, wmOperator *UNUSED(op)) +static int override_idtemplate_clear_exec(bContext *C, wmOperator * /*op*/) { ID *owner_id, *id; PointerRNA owner_ptr; @@ -992,7 +990,7 @@ static void UI_OT_override_idtemplate_clear(wmOperatorType *ot) ot->flag = OPTYPE_UNDO; } -static bool override_idtemplate_menu_poll(const bContext *C_const, MenuType *UNUSED(mt)) +static bool override_idtemplate_menu_poll(const bContext *C_const, MenuType * /*mt*/) { bContext *C = (bContext *)C_const; ID *owner_id, *id; @@ -1008,7 +1006,7 @@ static bool override_idtemplate_menu_poll(const bContext *C_const, MenuType *UNU return true; } -static void override_idtemplate_menu_draw(const bContext *UNUSED(C), Menu *menu) +static void override_idtemplate_menu_draw(const bContext * /*C*/, Menu *menu) { uiLayout *layout = menu->layout; uiItemO(layout, IFACE_("Make"), ICON_NONE, "UI_OT_override_idtemplate_make"); @@ -1604,7 +1602,7 @@ bool ui_jump_to_target_button_poll(bContext *C) return jump_to_target_button(C, true); } -static int jump_to_target_button_exec(bContext *C, wmOperator *UNUSED(op)) +static int jump_to_target_button_exec(bContext *C, wmOperator * /*op*/) { const bool success = jump_to_target_button(C, false); @@ -2033,7 +2031,7 @@ static void UI_OT_edittranslation_init(wmOperatorType *ot) /** \name Reload Translation Operator * \{ */ -static int reloadtranslation_exec(bContext *UNUSED(C), wmOperator *UNUSED(op)) +static int reloadtranslation_exec(bContext * /*C*/, wmOperator * /*op*/) { BLT_lang_init(); BLF_cache_clear(); @@ -2116,7 +2114,7 @@ static void UI_OT_button_execute(wmOperatorType *ot) /** \name Text Button Clear Operator * \{ */ -static int button_string_clear_exec(bContext *C, wmOperator *UNUSED(op)) +static int button_string_clear_exec(bContext *C, wmOperator * /*op*/) { uiBut *but = UI_context_active_but_get_respect_menu(C); @@ -2144,7 +2142,7 @@ static void UI_OT_button_string_clear(wmOperatorType *ot) /** \name Drop Color Operator * \{ */ -bool UI_drop_color_poll(struct bContext *C, wmDrag *drag, const wmEvent *UNUSED(event)) +bool UI_drop_color_poll(struct bContext *C, wmDrag *drag, const wmEvent * /*event*/) { /* should only return true for regions that include buttons, for now * return true always */ @@ -2165,7 +2163,7 @@ bool UI_drop_color_poll(struct bContext *C, wmDrag *drag, const wmEvent *UNUSED( return false; } -void UI_drop_color_copy(bContext *UNUSED(C), wmDrag *drag, wmDropBox *drop) +void UI_drop_color_copy(bContext * /*C*/, wmDrag *drag, wmDropBox *drop) { uiDragColorHandle *drag_info = static_cast<uiDragColorHandle *>(drag->poin); @@ -2263,7 +2261,7 @@ static bool drop_name_poll(bContext *C) return true; } -static int drop_name_invoke(bContext *C, wmOperator *op, const wmEvent *UNUSED(event)) +static int drop_name_invoke(bContext *C, wmOperator *op, const wmEvent * /*event*/) { uiBut *but = UI_but_active_drop_name_button(C); char *str = RNA_string_get_alloc(op->ptr, "string", nullptr, 0, nullptr); @@ -2323,7 +2321,7 @@ static bool ui_list_unhide_filter_options(uiList *list) return true; } -static int ui_list_start_filter_invoke(bContext *C, wmOperator *UNUSED(op), const wmEvent *event) +static int ui_list_start_filter_invoke(bContext *C, wmOperator * /*op*/, const wmEvent *event) { ARegion *region = CTX_wm_region(C); uiList *list = UI_list_find_mouse_over(region, event); @@ -2369,7 +2367,7 @@ static bool ui_view_drop_poll(bContext *C) return hovered_item != nullptr; } -static int ui_view_drop_invoke(bContext *C, wmOperator *UNUSED(op), const wmEvent *event) +static int ui_view_drop_invoke(bContext *C, wmOperator * /*op*/, const wmEvent *event) { if (event->custom != EVT_DATA_DRAGDROP) { return OPERATOR_CANCELLED | OPERATOR_PASS_THROUGH; @@ -2419,7 +2417,7 @@ static bool ui_view_item_rename_poll(bContext *C) return active_item != nullptr && UI_view_item_can_rename(active_item); } -static int ui_view_item_rename_exec(bContext *C, wmOperator *UNUSED(op)) +static int ui_view_item_rename_exec(bContext *C, wmOperator * /*op*/) { ARegion *region = CTX_wm_region(C); uiViewItemHandle *active_item = UI_region_views_find_active_item(region); diff --git a/source/blender/editors/interface/interface_panel.cc b/source/blender/editors/interface/interface_panel.cc index d25302616e5..7a69e2f9b2f 100644 --- a/source/blender/editors/interface/interface_panel.cc +++ b/source/blender/editors/interface/interface_panel.cc @@ -1804,7 +1804,7 @@ static void panels_layout_begin_clear_flags(ListBase *lb) } } -void UI_panels_begin(const bContext *UNUSED(C), ARegion *region) +void UI_panels_begin(const bContext * /*C*/, ARegion *region) { /* Set all panels as inactive, so that at the end we know which ones were used. Also * clear other flags so we know later that their values were set for the current redraw. */ @@ -1924,7 +1924,7 @@ struct uiPanelDragCollapseHandle { int xy_init[2]; }; -static void ui_panel_drag_collapse_handler_remove(bContext *UNUSED(C), void *userdata) +static void ui_panel_drag_collapse_handler_remove(bContext * /*C*/, void *userdata) { uiPanelDragCollapseHandle *dragcol_data = static_cast<uiPanelDragCollapseHandle *>(userdata); MEM_freeN(dragcol_data); diff --git a/source/blender/editors/interface/interface_query.cc b/source/blender/editors/interface/interface_query.cc index 8a940ce14ee..480c3e00e6e 100644 --- a/source/blender/editors/interface/interface_query.cc +++ b/source/blender/editors/interface/interface_query.cc @@ -424,7 +424,7 @@ uiBut *ui_list_find_from_row(const ARegion *region, const uiBut *row_but) return ui_but_find(region, ui_but_is_listbox_with_row, row_but); } -static bool ui_but_is_listrow(const uiBut *but, const void *UNUSED(customdata)) +static bool ui_but_is_listrow(const uiBut *but, const void * /*customdata*/) { return but->type == UI_BTYPE_LISTROW; } @@ -456,7 +456,7 @@ uiBut *ui_list_row_find_from_index(const ARegion *region, const int index, uiBut return ui_but_find(region, ui_but_is_listrow_at_index, &data); } -static bool ui_but_is_view_item_fn(const uiBut *but, const void *UNUSED(customdata)) +static bool ui_but_is_view_item_fn(const uiBut *but, const void * /*customdata*/) { return but->type == UI_BTYPE_VIEW_ITEM; } @@ -466,7 +466,7 @@ uiBut *ui_view_item_find_mouse_over(const ARegion *region, const int xy[2]) return ui_but_find_mouse_over_ex(region, xy, false, false, ui_but_is_view_item_fn, nullptr); } -static bool ui_but_is_active_view_item(const uiBut *but, const void *UNUSED(customdata)) +static bool ui_but_is_active_view_item(const uiBut *but, const void * /*customdata*/) { if (but->type != UI_BTYPE_VIEW_ITEM) { return false; diff --git a/source/blender/editors/interface/interface_region_color_picker.cc b/source/blender/editors/interface/interface_region_color_picker.cc index b49888005fa..0b2c538331a 100644 --- a/source/blender/editors/interface/interface_region_color_picker.cc +++ b/source/blender/editors/interface/interface_region_color_picker.cc @@ -245,7 +245,7 @@ static void ui_update_color_picker_buts_rgb(uiBut *from_but, } } -static void ui_colorpicker_rgba_update_cb(bContext *UNUSED(C), void *bt1, void *UNUSED(arg)) +static void ui_colorpicker_rgba_update_cb(bContext * /*C*/, void *bt1, void * /*arg*/) { uiBut *but = (uiBut *)bt1; uiPopupBlockHandle *popup = but->block->handle; @@ -264,7 +264,7 @@ static void ui_colorpicker_rgba_update_cb(bContext *UNUSED(C), void *bt1, void * } } -static void ui_colorpicker_hsv_update_cb(bContext *UNUSED(C), void *bt1, void *UNUSED(arg)) +static void ui_colorpicker_hsv_update_cb(bContext * /*C*/, void *bt1, void * /*arg*/) { uiBut *but = (uiBut *)bt1; uiPopupBlockHandle *popup = but->block->handle; @@ -279,7 +279,7 @@ static void ui_colorpicker_hsv_update_cb(bContext *UNUSED(C), void *bt1, void *U } } -static void ui_colorpicker_hex_rna_cb(bContext *UNUSED(C), void *bt1, void *hexcl) +static void ui_colorpicker_hex_rna_cb(bContext * /*C*/, void *bt1, void *hexcl) { uiBut *but = (uiBut *)bt1; uiPopupBlockHandle *popup = but->block->handle; @@ -302,7 +302,7 @@ static void ui_colorpicker_hex_rna_cb(bContext *UNUSED(C), void *bt1, void *hexc } } -static void ui_popup_close_cb(bContext *UNUSED(C), void *bt1, void *UNUSED(arg)) +static void ui_popup_close_cb(bContext * /*C*/, void *bt1, void * /*arg*/) { uiBut *but = (uiBut *)bt1; uiPopupBlockHandle *popup = but->block->handle; @@ -336,7 +336,7 @@ static void ui_colorpicker_hide_reveal(uiBlock *block, ePickerType colormode) } } -static void ui_colorpicker_create_mode_cb(bContext *UNUSED(C), void *bt1, void *UNUSED(arg)) +static void ui_colorpicker_create_mode_cb(bContext * /*C*/, void *bt1, void * /*arg*/) { uiBut *bt = static_cast<uiBut *>(bt1); const short colormode = ui_but_value_get(bt); @@ -820,7 +820,7 @@ static void ui_block_colorpicker(uiBlock *block, ui_colorpicker_hide_reveal(block, (ePickerType)colormode); } -static int ui_colorpicker_small_wheel_cb(const bContext *UNUSED(C), +static int ui_colorpicker_small_wheel_cb(const bContext * /*C*/, uiBlock *block, const wmEvent *event) { diff --git a/source/blender/editors/interface/interface_region_hud.cc b/source/blender/editors/interface/interface_region_hud.cc index aca36686dea..9c13a776db0 100644 --- a/source/blender/editors/interface/interface_region_hud.cc +++ b/source/blender/editors/interface/interface_region_hud.cc @@ -87,7 +87,7 @@ static void hud_region_hide(ARegion *region) /** \name Redo Panel * \{ */ -static bool hud_panel_operator_redo_poll(const bContext *C, PanelType *UNUSED(pt)) +static bool hud_panel_operator_redo_poll(const bContext *C, PanelType * /*pt*/) { ScrArea *area = CTX_wm_area(C); ARegion *region = BKE_area_find_region_type(area, RGN_TYPE_HUD); diff --git a/source/blender/editors/interface/interface_region_menu_pie.cc b/source/blender/editors/interface/interface_region_menu_pie.cc index becdfaf4e25..9dd6f95e190 100644 --- a/source/blender/editors/interface/interface_region_menu_pie.cc +++ b/source/blender/editors/interface/interface_region_menu_pie.cc @@ -49,7 +49,7 @@ struct uiPieMenu { int mx, my; }; -static uiBlock *ui_block_func_PIE(bContext *UNUSED(C), uiPopupBlockHandle *handle, void *arg_pie) +static uiBlock *ui_block_func_PIE(bContext * /*C*/, uiPopupBlockHandle *handle, void *arg_pie) { uiBlock *block; uiPieMenu *pie = static_cast<uiPieMenu *>(arg_pie); diff --git a/source/blender/editors/interface/interface_region_popover.cc b/source/blender/editors/interface/interface_region_popover.cc index e3bb4056608..431571c1376 100644 --- a/source/blender/editors/interface/interface_region_popover.cc +++ b/source/blender/editors/interface/interface_region_popover.cc @@ -355,7 +355,7 @@ uiPopover *UI_popover_begin(bContext *C, int ui_menu_width, bool from_active_but return pup; } -static void popover_keymap_fn(wmKeyMap *UNUSED(keymap), wmKeyMapItem *UNUSED(kmi), void *user_data) +static void popover_keymap_fn(wmKeyMap * /*keymap*/, wmKeyMapItem * /*kmi*/, void *user_data) { uiPopover *pup = static_cast<uiPopover *>(user_data); pup->block->handle->menuretval = UI_RETURN_OK; diff --git a/source/blender/editors/interface/interface_region_search.cc b/source/blender/editors/interface/interface_region_search.cc index fdef2c15d82..8def878c6af 100644 --- a/source/blender/editors/interface/interface_region_search.cc +++ b/source/blender/editors/interface/interface_region_search.cc @@ -307,8 +307,8 @@ bool ui_searchbox_apply(uiBut *but, ARegion *region) static struct ARegion *wm_searchbox_tooltip_init(struct bContext *C, struct ARegion *region, - int *UNUSED(r_pass), - double *UNUSED(pass_delay), + int * /*r_pass*/, + double * /*pass_delay*/, bool *r_exit_on_event) { *r_exit_on_event = true; @@ -903,7 +903,7 @@ static void str_tolower_titlecaps_ascii(char *str, const size_t len) } } -static void ui_searchbox_region_draw_cb__operator(const bContext *UNUSED(C), ARegion *region) +static void ui_searchbox_region_draw_cb__operator(const bContext * /*C*/, ARegion *region) { uiSearchboxData *data = static_cast<uiSearchboxData *>(region->regiondata); @@ -997,7 +997,7 @@ void ui_searchbox_free(bContext *C, ARegion *region) ui_region_temp_remove(C, CTX_wm_screen(C), region); } -static void ui_searchbox_region_draw_cb__menu(const bContext *UNUSED(C), ARegion *UNUSED(region)) +static void ui_searchbox_region_draw_cb__menu(const bContext * /*C*/, ARegion * /*region*/) { /* Currently unused. */ } diff --git a/source/blender/editors/interface/interface_region_tooltip.cc b/source/blender/editors/interface/interface_region_tooltip.cc index 3ded613c6f3..2a06267d90b 100644 --- a/source/blender/editors/interface/interface_region_tooltip.cc +++ b/source/blender/editors/interface/interface_region_tooltip.cc @@ -157,7 +157,7 @@ static void rgb_tint(float col[3], float h, float h_strength, float v, float v_s hsv_to_rgb_v(col_hsv_to, col); } -static void ui_tooltip_region_draw_cb(const bContext *UNUSED(C), ARegion *region) +static void ui_tooltip_region_draw_cb(const bContext * /*C*/, ARegion *region) { const float pad_px = UI_TIP_PADDING; uiTooltipData *data = static_cast<uiTooltipData *>(region->regiondata); diff --git a/source/blender/editors/interface/interface_template_asset_view.cc b/source/blender/editors/interface/interface_template_asset_view.cc index 3147deb5ad1..11fe653724c 100644 --- a/source/blender/editors/interface/interface_template_asset_view.cc +++ b/source/blender/editors/interface/interface_template_asset_view.cc @@ -66,15 +66,15 @@ static void asset_view_item_but_drag_set(uiBut *but, } static void asset_view_draw_item(uiList *ui_list, - const bContext *UNUSED(C), + const bContext * /*C*/, uiLayout *layout, - PointerRNA *UNUSED(dataptr), + PointerRNA * /*dataptr*/, PointerRNA *itemptr, - int UNUSED(icon), - PointerRNA *UNUSED(active_dataptr), - const char *UNUSED(active_propname), - int UNUSED(index), - int UNUSED(flt_flag)) + int /*icon*/, + PointerRNA * /*active_dataptr*/, + const char * /*active_propname*/, + int /*index*/, + int /*flt_flag*/) { AssetViewListData *list_data = (AssetViewListData *)ui_list->dyn_data->customdata; diff --git a/source/blender/editors/interface/interface_template_list.cc b/source/blender/editors/interface/interface_template_list.cc index f09eb5f3eb0..2b581f187a6 100644 --- a/source/blender/editors/interface/interface_template_list.cc +++ b/source/blender/editors/interface/interface_template_list.cc @@ -83,15 +83,15 @@ struct TemplateListVisualInfo { }; static void uilist_draw_item_default(struct uiList *ui_list, - const struct bContext *UNUSED(C), + const struct bContext * /*C*/, struct uiLayout *layout, - struct PointerRNA *UNUSED(dataptr), + struct PointerRNA * /*dataptr*/, struct PointerRNA *itemptr, int icon, - struct PointerRNA *UNUSED(active_dataptr), - const char *UNUSED(active_propname), - int UNUSED(index), - int UNUSED(flt_flag)) + struct PointerRNA * /*active_dataptr*/, + const char * /*active_propname*/, + int /*index*/, + int /*flt_flag*/) { PropertyRNA *nameprop = RNA_struct_name_property(itemptr->type); @@ -114,7 +114,7 @@ static void uilist_draw_item_default(struct uiList *ui_list, } static void uilist_draw_filter_default(struct uiList *ui_list, - const struct bContext *UNUSED(C), + const struct bContext * /*C*/, struct uiLayout *layout) { PointerRNA listptr; @@ -160,7 +160,7 @@ static int cmpstringp(const void *p1, const void *p2) } static void uilist_filter_items_default(struct uiList *ui_list, - const struct bContext *UNUSED(C), + const struct bContext * /*C*/, struct PointerRNA *dataptr, const char *propname) { @@ -561,7 +561,7 @@ static void uilist_prepare(uiList *ui_list, items->tot_items); } -static void uilist_resize_update_cb(bContext *C, void *arg1, void *UNUSED(arg2)) +static void uilist_resize_update_cb(bContext *C, void *arg1, void * /*arg2*/) { uiList *ui_list = static_cast<uiList *>(arg1); uiListDyn *dyn_data = ui_list->dyn_data; @@ -592,7 +592,7 @@ static void *uilist_item_use_dynamic_tooltip(PointerRNA *itemptr, const char *pr return nullptr; } -static char *uilist_item_tooltip_func(bContext *UNUSED(C), void *argN, const char *tip) +static char *uilist_item_tooltip_func(bContext * /*C*/, void *argN, const char *tip) { char *dyn_tooltip = static_cast<char *>(argN); return BLI_sprintfN("%s - %s", tip, dyn_tooltip); diff --git a/source/blender/editors/interface/interface_template_search_menu.cc b/source/blender/editors/interface/interface_template_search_menu.cc index f61baf65b58..515a69c19c9 100644 --- a/source/blender/editors/interface/interface_template_search_menu.cc +++ b/source/blender/editors/interface/interface_template_search_menu.cc @@ -931,7 +931,7 @@ static void menu_search_arg_free_fn(void *data_v) MEM_freeN(data); } -static void menu_search_exec_fn(bContext *C, void *UNUSED(arg1), void *arg2) +static void menu_search_exec_fn(bContext *C, void * /*arg1*/, void *arg2) { MenuSearch_Item *item = (MenuSearch_Item *)arg2; if (item == nullptr) { @@ -994,11 +994,11 @@ static void menu_search_exec_fn(bContext *C, void *UNUSED(arg1), void *arg2) } } -static void menu_search_update_fn(const bContext *UNUSED(C), +static void menu_search_update_fn(const bContext * /*C*/, void *arg, const char *str, uiSearchItems *items, - const bool UNUSED(is_first)) + const bool /*is_first*/) { MenuSearch_Data *data = (MenuSearch_Data *)arg; @@ -1077,7 +1077,7 @@ static bool ui_search_menu_create_context_menu(struct bContext *C, static struct ARegion *ui_search_menu_create_tooltip(struct bContext *C, struct ARegion *region, - const rcti *UNUSED(item_rect), + const rcti * /*item_rect*/, void *arg, void *active) { diff --git a/source/blender/editors/interface/interface_template_search_operator.cc b/source/blender/editors/interface/interface_template_search_operator.cc index 0d0a5f01744..58f44de5278 100644 --- a/source/blender/editors/interface/interface_template_search_operator.cc +++ b/source/blender/editors/interface/interface_template_search_operator.cc @@ -34,7 +34,7 @@ /** \name Operator Search Template Implementation * \{ */ -static void operator_search_exec_fn(bContext *C, void *UNUSED(arg1), void *arg2) +static void operator_search_exec_fn(bContext *C, void * /*arg1*/, void *arg2) { wmOperatorType *ot = static_cast<wmOperatorType *>(arg2); @@ -44,10 +44,10 @@ static void operator_search_exec_fn(bContext *C, void *UNUSED(arg1), void *arg2) } static void operator_search_update_fn(const bContext *C, - void *UNUSED(arg), + void * /*arg*/, const char *str, uiSearchItems *items, - const bool UNUSED(is_first)) + const bool /*is_first*/) { GHashIterator iter; diff --git a/source/blender/editors/interface/view2d_draw.cc b/source/blender/editors/interface/view2d_draw.cc index ca96c2abb9d..a8d6d6c78de 100644 --- a/source/blender/editors/interface/view2d_draw.cc +++ b/source/blender/editors/interface/view2d_draw.cc @@ -408,7 +408,7 @@ static void draw_vertical_scale_indicators(const ARegion *region, } static void view_to_string__frame_number( - void *UNUSED(user_data), float v2d_pos, float UNUSED(v2d_step), uint max_len, char *r_str) + void * /*user_data*/, float v2d_pos, float /*v2d_step*/, uint max_len, char *r_str) { BLI_snprintf(r_str, max_len, "%d", int(v2d_pos)); } @@ -428,7 +428,7 @@ static void view_to_string__time( } static void view_to_string__value( - void *UNUSED(user_data), float v2d_pos, float v2d_step, uint max_len, char *r_str) + void * /*user_data*/, float v2d_pos, float v2d_step, uint max_len, char *r_str) { if (v2d_step >= 1.0f) { BLI_snprintf(r_str, max_len, "%d", int(v2d_pos)); diff --git a/source/blender/editors/interface/view2d_gizmo_navigate.cc b/source/blender/editors/interface/view2d_gizmo_navigate.cc index fae28833e4f..78549a33fc5 100644 --- a/source/blender/editors/interface/view2d_gizmo_navigate.cc +++ b/source/blender/editors/interface/view2d_gizmo_navigate.cc @@ -113,7 +113,7 @@ struct NavigateWidgetGroup { int region_size[2]; }; -static bool WIDGETGROUP_navigate_poll(const bContext *C, wmGizmoGroupType *UNUSED(gzgt)) +static bool WIDGETGROUP_navigate_poll(const bContext *C, wmGizmoGroupType * /*gzgt*/) { if ((U.uiflag & USER_SHOW_GIZMO_NAVIGATE) == 0) { return false; @@ -141,7 +141,7 @@ static bool WIDGETGROUP_navigate_poll(const bContext *C, wmGizmoGroupType *UNUSE return true; } -static void WIDGETGROUP_navigate_setup(const bContext *UNUSED(C), wmGizmoGroup *gzgroup) +static void WIDGETGROUP_navigate_setup(const bContext * /*C*/, wmGizmoGroup *gzgroup) { NavigateWidgetGroup *navgroup = MEM_cnew<NavigateWidgetGroup>(__func__); diff --git a/source/blender/editors/interface/view2d_ops.cc b/source/blender/editors/interface/view2d_ops.cc index c72a0c75ee4..9b2c17bd73e 100644 --- a/source/blender/editors/interface/view2d_ops.cc +++ b/source/blender/editors/interface/view2d_ops.cc @@ -293,7 +293,7 @@ static int view_pan_modal(bContext *C, wmOperator *op, const wmEvent *event) return OPERATOR_RUNNING_MODAL; } -static void view_pan_cancel(bContext *UNUSED(C), wmOperator *op) +static void view_pan_cancel(bContext * /*C*/, wmOperator *op) { view_pan_exit(op); } @@ -330,7 +330,7 @@ static void VIEW2D_OT_pan(wmOperatorType *ot) * \{ */ /* set up modal operator and relevant settings */ -static int view_edge_pan_invoke(bContext *C, wmOperator *op, const wmEvent *UNUSED(event)) +static int view_edge_pan_invoke(bContext *C, wmOperator *op, const wmEvent * /*event*/) { op->customdata = MEM_callocN(sizeof(View2DEdgePanData), "View2DEdgePanData"); View2DEdgePanData *vpd = static_cast<View2DEdgePanData *>(op->customdata); @@ -358,7 +358,7 @@ static int view_edge_pan_modal(bContext *C, wmOperator *op, const wmEvent *event return OPERATOR_PASS_THROUGH; } -static void view_edge_pan_cancel(bContext *UNUSED(C), wmOperator *op) +static void view_edge_pan_cancel(bContext * /*C*/, wmOperator *op) { v2dViewPanData *vpd = static_cast<v2dViewPanData *>(op->customdata); vpd->v2d->flag &= ~V2D_IS_NAVIGATING; @@ -1614,7 +1614,7 @@ void UI_view2d_smooth_view(const bContext *C, } /* only meant for timer usage */ -static int view2d_smoothview_invoke(bContext *C, wmOperator *UNUSED(op), const wmEvent *event) +static int view2d_smoothview_invoke(bContext *C, wmOperator * /*op*/, const wmEvent *event) { wmWindow *win = CTX_wm_window(C); ARegion *region = CTX_wm_region(C); @@ -2169,7 +2169,7 @@ static void VIEW2D_OT_scroller_activate(wmOperatorType *ot) /** \name View Reset Operator * \{ */ -static int reset_exec(bContext *C, wmOperator *UNUSED(op)) +static int reset_exec(bContext *C, wmOperator * /*op*/) { const uiStyle *style = UI_style_get(); ARegion *region = CTX_wm_region(C); diff --git a/source/blender/editors/interface/views/abstract_view_item.cc b/source/blender/editors/interface/views/abstract_view_item.cc index f73183d07e9..101cb66bfa9 100644 --- a/source/blender/editors/interface/views/abstract_view_item.cc +++ b/source/blender/editors/interface/views/abstract_view_item.cc @@ -112,7 +112,7 @@ static AbstractViewItem *find_item_from_rename_button(const uiBut &rename_but) return nullptr; } -static void rename_button_fn(bContext *UNUSED(C), void *arg, char *UNUSED(origstr)) +static void rename_button_fn(bContext * /*C*/, void *arg, char * /*origstr*/) { const uiBut *rename_but = static_cast<uiBut *>(arg); AbstractViewItem *item = find_item_from_rename_button(*rename_but); |