dave/openttd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

No longer use CDECL for GUIList::FilterFunction

Browse Source
This commit is contained in:
Jonathan G Rennison
2022-11-19 21:51:44 +00:00
parent b52bb3ca44
commit 728b902e9f
11 changed files with 15 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/build_vehicle_gui.cpp
View File

@@ -724,7 +724,7 @@ const StringID _engine_sort_listing[][14] = {{
}};
/** Filters vehicles by cargo and engine (in case of rail vehicle). */
static bool CDECL CargoAndEngineFilter(const EngineID *eid, const CargoID cid)
static bool CargoAndEngineFilter(const EngineID *eid, const CargoID cid)
{
if (cid == CF_ANY) {
return true;

2
src/industry_gui.cpp
View File

@@ -1281,7 +1281,7 @@ enum CargoFilterSpecialType {
* @param cargoes The accepted and produced cargo pair to look for.
* @return bool Whether the given cargoes accepted and produced by the industry.
*/
static bool CDECL CargoFilter(const Industry * const *industry, const std::pair<CargoID, CargoID> &cargoes)
static bool CargoFilter(const Industry * const *industry, const std::pair<CargoID, CargoID> &cargoes)
{
auto accepted_cargo = cargoes.first;
auto produced_cargo = cargoes.second;

4
src/network/network_content_gui.cpp
View File

@@ -438,7 +438,7 @@ class NetworkContentListWindow : public Window, ContentCallback {
}
/** Filter content by tags/name */
static bool CDECL TagNameFilter(const ContentInfo * const *a, ContentListFilterData &filter)
static bool TagNameFilter(const ContentInfo * const *a, ContentListFilterData &filter)
{
filter.string_filter.ResetState();
for (auto &tag : (*a)->tags) filter.string_filter.AddLine(tag.c_str());
@@ -448,7 +448,7 @@ class NetworkContentListWindow : public Window, ContentCallback {
}
/** Filter content by type, but still show content selected for download. */
static bool CDECL TypeOrSelectedFilter(const ContentInfo * const *a, ContentListFilterData &filter)
static bool TypeOrSelectedFilter(const ContentInfo * const *a, ContentListFilterData &filter)
{
if (filter.types.none()) return true;
if (filter.types[(*a)->type]) return true;

2
src/network/network_gui.cpp
View File

@@ -389,7 +389,7 @@ protected:
}
}
static bool CDECL NGameSearchFilter(NetworkGameList * const *item, StringFilter &sf)
static bool NGameSearchFilter(NetworkGameList * const *item, StringFilter &sf)
{
assert(item != nullptr);
assert((*item) != nullptr);

2
src/newgrf_gui.cpp
View File

@@ -1440,7 +1440,7 @@ private:
}
/** Filter grfs by tags/name */
static bool CDECL TagNameFilter(const GRFConfig * const *a, StringFilter &filter)
static bool TagNameFilter(const GRFConfig * const *a, StringFilter &filter)
{
filter.ResetState();
filter.AddLine((*a)->GetName());

2
src/object_gui.cpp
View File

@@ -135,7 +135,7 @@ public:
}
/** Filter object classes by class name. */
static bool CDECL TagNameFilter(ObjectClassID const *oc, StringFilter &filter)
static bool TagNameFilter(ObjectClassID const *oc, StringFilter &filter)
{
ObjectClass *objclass = ObjectClass::Get(*oc);
char buffer[DRAW_STRING_BUFFER];

2
src/rail_gui.cpp
View File

@@ -1185,7 +1185,7 @@ public:
}
/** Filter station classes by class name. */
static bool CDECL TagNameFilter(StationClassID const * sc, StringFilter &filter)
static bool TagNameFilter(StationClassID const * sc, StringFilter &filter)
{
char buffer[DRAW_STRING_BUFFER];
GetString(buffer, StationClass::Get(*sc)->name, lastof(buffer));

2
src/road_gui.cpp
View File

@@ -1341,7 +1341,7 @@ public:
}
/** Filter classes by class name. */
static bool CDECL TagNameFilter(RoadStopClassID const *sc, StringFilter &filter)
static bool TagNameFilter(RoadStopClassID const *sc, StringFilter &filter)
{
char buffer[DRAW_STRING_BUFFER];
GetString(buffer, RoadStopClass::Get(*sc)->name, lastof(buffer));

6
src/signs_gui.cpp
View File

@@ -90,7 +90,7 @@ struct SignList {
}
/** Filter sign list by sign name */
static bool CDECL SignNameFilter(const Sign * const *a, StringFilter &filter)
static bool SignNameFilter(const Sign * const *a, StringFilter &filter)
{
/* Same performance benefit as above for sorting. */
const char *a_name = (*a)->name.empty() ? SignList::default_name : (*a)->name.c_str();
@@ -101,14 +101,14 @@ struct SignList {
}
/** Filter sign list excluding OWNER_DEITY */
static bool CDECL OwnerDeityFilter(const Sign * const *a, StringFilter &filter)
static bool OwnerDeityFilter(const Sign * const *a, StringFilter &filter)
{
/* You should never be able to edit signs of owner DEITY */
return (*a)->owner != OWNER_DEITY;
}
/** Filter sign list by owner */
static bool CDECL OwnerVisibilityFilter(const Sign * const *a, StringFilter &filter)
static bool OwnerVisibilityFilter(const Sign * const *a, StringFilter &filter)
{
assert(!HasBit(_display_opt, DO_SHOW_COMPETITOR_SIGNS));
/* Hide sign if non-own signs are hidden in the viewport */

2
src/sortlist_type.h
View File

@@ -46,7 +46,7 @@ template <typename T, typename F = const char*>
class GUIList : public std::vector<T> {
public:
typedef bool SortFunction(const T&, const T&); ///< Signature of sort function.
typedef bool CDECL FilterFunction(const T*, F); ///< Signature of filter function.
typedef bool FilterFunction(const T*, F); ///< Signature of filter function.
protected:
SortFunction * const *sort_func_list; ///< the sort criteria functions

4
src/vehicle_gui.cpp
View File

@@ -275,7 +275,7 @@ void BaseVehicleListWindow::BuildVehicleList()
}
/** Cargo filter functions */
static bool CDECL CargoFilter(const Vehicle * const *vid, const CargoID cid)
static bool CargoFilter(const Vehicle * const *vid, const CargoID cid)
{
if (cid == BaseVehicleListWindow::CF_ANY) {
return true;
@@ -308,7 +308,7 @@ static bool CDECL CargoFilter(const Vehicle * const *vid, const CargoID cid)
}
}
static bool CDECL GroupCargoFilter(const GUIVehicleGroup* group, const CargoID cid)
static bool GroupCargoFilter(const GUIVehicleGroup* group, const CargoID cid)
{
if (cid == BaseVehicleListWindow::CF_ANY) return true;
for (VehicleList::const_iterator v = group->vehicles_begin; v != group->vehicles_end; ++v) {