From 0075a952787acc7daf8604adf0ba51cbee2cb6c1 Mon Sep 17 00:00:00 2001 From: Peter Nelson Date: Thu, 25 Apr 2024 21:01:15 +0100 Subject: [PATCH] Codefix: Make three _filter_funcs definitions distinct. (#12573) Rename the GUIList function lists defined as the same symbol. --- src/build_vehicle_gui.cpp | 4 ++-- src/industry_gui.cpp | 4 ++-- src/vehicle_gui.cpp | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/build_vehicle_gui.cpp b/src/build_vehicle_gui.cpp index ba73bf56f9..72f0ddd493 100644 --- a/src/build_vehicle_gui.cpp +++ b/src/build_vehicle_gui.cpp @@ -550,7 +550,7 @@ static bool CDECL CargoAndEngineFilter(const GUIEngineListItem *item, const Carg } } -static GUIEngineList::FilterFunction * const _filter_funcs[] = { +static GUIEngineList::FilterFunction * const _engine_filter_funcs[] = { &CargoAndEngineFilter, }; @@ -1312,7 +1312,7 @@ struct BuildVehicleWindow : Window { this->cargo_filter_criteria = _engine_sort_last_cargo_criteria[this->vehicle_type]; if (this->cargo_filter_criteria < NUM_CARGO && !HasBit(_standard_cargo_mask, this->cargo_filter_criteria)) this->cargo_filter_criteria = CargoFilterCriteria::CF_ANY; - this->eng_list.SetFilterFuncs(_filter_funcs); + this->eng_list.SetFilterFuncs(_engine_filter_funcs); this->eng_list.SetFilterState(this->cargo_filter_criteria != CargoFilterCriteria::CF_ANY); } diff --git a/src/industry_gui.cpp b/src/industry_gui.cpp index 7d85c5eded..3ce405cc71 100644 --- a/src/industry_gui.cpp +++ b/src/industry_gui.cpp @@ -1310,7 +1310,7 @@ static bool CDECL CargoFilter(const Industry * const *industry, const std::pair< return accepted_cargo_matches && produced_cargo_matches; } -static GUIIndustryList::FilterFunction * const _filter_funcs[] = { &CargoFilter }; +static GUIIndustryList::FilterFunction * const _industry_filter_funcs[] = { &CargoFilter }; /** Enum referring to the Hotkeys in the industry directory window */ enum IndustryDirectoryHotkeys { @@ -1398,7 +1398,7 @@ protected: this->produced_cargo_filter_criteria = CargoFilterCriteria::CF_ANY; this->accepted_cargo_filter_criteria = CargoFilterCriteria::CF_ANY; - this->industries.SetFilterFuncs(_filter_funcs); + this->industries.SetFilterFuncs(_industry_filter_funcs); bool is_filtering_necessary = this->produced_cargo_filter_criteria != CargoFilterCriteria::CF_ANY || this->accepted_cargo_filter_criteria != CargoFilterCriteria::CF_ANY; diff --git a/src/vehicle_gui.cpp b/src/vehicle_gui.cpp index 00060351eb..240a5cb9c5 100644 --- a/src/vehicle_gui.cpp +++ b/src/vehicle_gui.cpp @@ -334,7 +334,7 @@ static bool CargoFilter(const GUIVehicleGroup *vehgroup, const CargoID cid) return false; } -static GUIVehicleGroupList::FilterFunction * const _filter_funcs[] = { +static GUIVehicleGroupList::FilterFunction * const _vehicle_group_filter_funcs[] = { &CargoFilter, }; @@ -359,7 +359,7 @@ void BaseVehicleListWindow::SetCargoFilter(CargoID cid) void BaseVehicleListWindow::SetCargoFilterArray() { this->cargo_filter_criteria = CargoFilterCriteria::CF_ANY; - this->vehgroups.SetFilterFuncs(_filter_funcs); + this->vehgroups.SetFilterFuncs(_vehicle_group_filter_funcs); this->vehgroups.SetFilterState(this->cargo_filter_criteria != CargoFilterCriteria::CF_ANY); }