diff options
author | Hans Goudey <h.goudey@me.com> | 2022-10-04 01:37:25 +0300 |
---|---|---|
committer | Hans Goudey <h.goudey@me.com> | 2022-10-04 01:38:16 +0300 |
commit | 97746129d5870beedc40e3c035c7982ce8a6bebc (patch) | |
tree | b819b8e7875e6684aad7ea1f6bb7922d4fa1c8fc /source/blender/editors/space_spreadsheet | |
parent | ed7f5713f8f9d605e3cd4cce42e40fb5c6bf4bf5 (diff) |
Cleanup: replace UNUSED macro with commented args in C++ code
This is the conventional way of dealing with unused arguments in C++,
since it works on all compilers.
Regex find and replace: `UNUSED\((\w+)\)` -> `/*$1*/`
Diffstat (limited to 'source/blender/editors/space_spreadsheet')
5 files changed, 24 insertions, 28 deletions
diff --git a/source/blender/editors/space_spreadsheet/space_spreadsheet.cc b/source/blender/editors/space_spreadsheet/space_spreadsheet.cc index ee43519e260..b094222b16e 100644 --- a/source/blender/editors/space_spreadsheet/space_spreadsheet.cc +++ b/source/blender/editors/space_spreadsheet/space_spreadsheet.cc @@ -45,7 +45,7 @@ using namespace blender; using namespace blender::ed::spreadsheet; -static SpaceLink *spreadsheet_create(const ScrArea *UNUSED(area), const Scene *UNUSED(scene)) +static SpaceLink *spreadsheet_create(const ScrArea * /*area*/, const Scene * /*scene*/) { SpaceSpreadsheet *spreadsheet_space = MEM_cnew<SpaceSpreadsheet>("spreadsheet space"); spreadsheet_space->spacetype = SPACE_SPREADSHEET; @@ -110,7 +110,7 @@ static void spreadsheet_free(SpaceLink *sl) BKE_viewer_path_clear(&sspreadsheet->viewer_path); } -static void spreadsheet_init(wmWindowManager *UNUSED(wm), ScrArea *area) +static void spreadsheet_init(wmWindowManager * /*wm*/, ScrArea *area) { SpaceSpreadsheet *sspreadsheet = (SpaceSpreadsheet *)area->spacedata.first; if (sspreadsheet->runtime == nullptr) { @@ -152,9 +152,7 @@ static void spreadsheet_keymap(wmKeyConfig *keyconf) WM_keymap_ensure(keyconf, "Spreadsheet Generic", SPACE_SPREADSHEET, 0); } -static void spreadsheet_id_remap(ScrArea *UNUSED(area), - SpaceLink *slink, - const IDRemapper *mappings) +static void spreadsheet_id_remap(ScrArea * /*area*/, SpaceLink *slink, const IDRemapper *mappings) { SpaceSpreadsheet *sspreadsheet = (SpaceSpreadsheet *)slink; BKE_viewer_path_id_remap(&sspreadsheet->viewer_path, mappings); @@ -510,7 +508,7 @@ static void spreadsheet_main_region_listener(const wmRegionListenerParams *param } } -static void spreadsheet_header_region_init(wmWindowManager *UNUSED(wm), ARegion *region) +static void spreadsheet_header_region_init(wmWindowManager * /*wm*/, ARegion *region) { ED_region_header_init(region); } @@ -521,7 +519,7 @@ static void spreadsheet_header_region_draw(const bContext *C, ARegion *region) ED_region_header(C, region); } -static void spreadsheet_header_region_free(ARegion *UNUSED(region)) +static void spreadsheet_header_region_free(ARegion * /*region*/) { } @@ -565,7 +563,7 @@ static void spreadsheet_header_region_listener(const wmRegionListenerParams *par } } -static void spreadsheet_footer_region_init(wmWindowManager *UNUSED(wm), ARegion *region) +static void spreadsheet_footer_region_init(wmWindowManager * /*wm*/, ARegion *region) { ED_region_header_init(region); } @@ -608,11 +606,11 @@ static void spreadsheet_footer_region_draw(const bContext *C, ARegion *region) UI_block_draw(C, block); } -static void spreadsheet_footer_region_free(ARegion *UNUSED(region)) +static void spreadsheet_footer_region_free(ARegion * /*region*/) { } -static void spreadsheet_footer_region_listener(const wmRegionListenerParams *UNUSED(params)) +static void spreadsheet_footer_region_listener(const wmRegionListenerParams * /*params*/) { } @@ -654,11 +652,11 @@ static void spreadsheet_sidebar_init(wmWindowManager *wm, ARegion *region) WM_event_add_keymap_handler(®ion->handlers, keymap); } -static void spreadsheet_right_region_free(ARegion *UNUSED(region)) +static void spreadsheet_right_region_free(ARegion * /*region*/) { } -static void spreadsheet_right_region_listener(const wmRegionListenerParams *UNUSED(params)) +static void spreadsheet_right_region_listener(const wmRegionListenerParams * /*params*/) { } diff --git a/source/blender/editors/space_spreadsheet/spreadsheet_draw.cc b/source/blender/editors/space_spreadsheet/spreadsheet_draw.cc index e1f13f05715..e50e655853f 100644 --- a/source/blender/editors/space_spreadsheet/spreadsheet_draw.cc +++ b/source/blender/editors/space_spreadsheet/spreadsheet_draw.cc @@ -26,23 +26,23 @@ SpreadsheetDrawer::SpreadsheetDrawer() SpreadsheetDrawer::~SpreadsheetDrawer() = default; -void SpreadsheetDrawer::draw_top_row_cell(int UNUSED(column_index), - const CellDrawParams &UNUSED(params)) const +void SpreadsheetDrawer::draw_top_row_cell(int /*column_index*/, + const CellDrawParams & /*params*/) const { } -void SpreadsheetDrawer::draw_left_column_cell(int UNUSED(row_index), - const CellDrawParams &UNUSED(params)) const +void SpreadsheetDrawer::draw_left_column_cell(int /*row_index*/, + const CellDrawParams & /*params*/) const { } -void SpreadsheetDrawer::draw_content_cell(int UNUSED(row_index), - int UNUSED(column_index), - const CellDrawParams &UNUSED(params)) const +void SpreadsheetDrawer::draw_content_cell(int /*row_index*/, + int /*column_index*/, + const CellDrawParams & /*params*/) const { } -int SpreadsheetDrawer::column_width(int UNUSED(column_index)) const +int SpreadsheetDrawer::column_width(int /*column_index*/) const { return 5 * UI_UNIT_X; } diff --git a/source/blender/editors/space_spreadsheet/spreadsheet_layout.cc b/source/blender/editors/space_spreadsheet/spreadsheet_layout.cc index 7e6b0ab18c3..b4b8417c172 100644 --- a/source/blender/editors/space_spreadsheet/spreadsheet_layout.cc +++ b/source/blender/editors/space_spreadsheet/spreadsheet_layout.cc @@ -342,7 +342,7 @@ class SpreadsheetLayoutDrawer : public SpreadsheetDrawer { /* Tooltip showing raw byte values. Encode values in pointer to avoid memory allocation. */ UI_but_func_tooltip_set( but, - [](bContext * /*C*/, void *argN, const char *UNUSED(tip)) { + [](bContext * /*C*/, void *argN, const char * /*tip*/) { const uint32_t uint_color = POINTER_AS_UINT(argN); ColorGeometry4b color = *(ColorGeometry4b *)&uint_color; return BLI_sprintfN(TIP_("Byte Color (sRGB encoded):\n%3d %3d %3d %3d"), diff --git a/source/blender/editors/space_spreadsheet/spreadsheet_ops.cc b/source/blender/editors/space_spreadsheet/spreadsheet_ops.cc index 166c5de9fc3..baa58a7d824 100644 --- a/source/blender/editors/space_spreadsheet/spreadsheet_ops.cc +++ b/source/blender/editors/space_spreadsheet/spreadsheet_ops.cc @@ -22,7 +22,7 @@ using namespace blender::ed::spreadsheet; -static int row_filter_add_exec(bContext *C, wmOperator *UNUSED(op)) +static int row_filter_add_exec(bContext *C, wmOperator * /*op*/) { SpaceSpreadsheet *sspreadsheet = CTX_wm_space_spreadsheet(C); @@ -78,9 +78,7 @@ static void SPREADSHEET_OT_remove_row_filter_rule(wmOperatorType *ot) RNA_def_int(ot->srna, "index", 0, 0, INT_MAX, "Index", "", 0, INT_MAX); } -static int select_component_domain_invoke(bContext *C, - wmOperator *op, - const wmEvent *UNUSED(event)) +static int select_component_domain_invoke(bContext *C, wmOperator *op, const wmEvent * /*event*/) { GeometryComponentType component_type = static_cast<GeometryComponentType>( RNA_int_get(op->ptr, "component_type")); diff --git a/source/blender/editors/space_spreadsheet/spreadsheet_row_filter_ui.cc b/source/blender/editors/space_spreadsheet/spreadsheet_row_filter_ui.cc index a1f6de56bb2..fa22da4f26a 100644 --- a/source/blender/editors/space_spreadsheet/spreadsheet_row_filter_ui.cc +++ b/source/blender/editors/space_spreadsheet/spreadsheet_row_filter_ui.cc @@ -30,7 +30,7 @@ using namespace blender; using namespace blender::ed::spreadsheet; -static void filter_panel_id_fn(void *UNUSED(row_filter_v), char *r_name) +static void filter_panel_id_fn(void * /*row_filter_v*/, char *r_name) { /* All row filters use the same panel ID. */ BLI_snprintf(r_name, BKE_ST_MAXNAME, "SPREADSHEET_PT_filter"); @@ -304,7 +304,7 @@ static void filter_reorder(bContext *C, Panel *panel, int new_index) BLI_listbase_link_move(row_filters, filter, new_index - current_index); } -static short get_filter_expand_flag(const bContext *UNUSED(C), Panel *panel) +static short get_filter_expand_flag(const bContext * /*C*/, Panel *panel) { PointerRNA *filter_ptr = UI_panel_custom_data_get(panel); SpreadsheetRowFilter *filter = (SpreadsheetRowFilter *)filter_ptr->data; @@ -312,7 +312,7 @@ static short get_filter_expand_flag(const bContext *UNUSED(C), Panel *panel) return short(filter->flag) & SPREADSHEET_ROW_FILTER_UI_EXPAND; } -static void set_filter_expand_flag(const bContext *UNUSED(C), Panel *panel, short expand_flag) +static void set_filter_expand_flag(const bContext * /*C*/, Panel *panel, short expand_flag) { PointerRNA *filter_ptr = UI_panel_custom_data_get(panel); SpreadsheetRowFilter *filter = (SpreadsheetRowFilter *)filter_ptr->data; |