mifr/subsurface
1
0
Fork 0
mirror of https://github.com/subsurface/subsurface.git synced 2025-02-19 22:16:15 +00:00
Code Issues Projects Releases Packages Wiki Activity

filter: remove filter_preset_table_t

Browse source 
We used a typedef "filter_preset_table_t" for the filter preset table,
because it is a "std::vector<filter_preset>". However, that is in
contrast to all the other global tables (dives, trips, sites) that we
have.

Therefore, turn this into a standard struct, which simply inherits
from "std::vector<filter_preset>". Note that while inheriting from
std::vector<> is generally not recommended, it is not a problem
here, because we don't modify it in any shape or form.

Signed-off-by: Berthold Stoeger <bstoeger@mail.tuwien.ac.at>
This commit is contained in:
Berthold Stoeger 2020-10-17 09:58:23 +02:00 • committed by Dirk Hohndel
parent 67aec56f8c
commit a7bbb6c1cc
20 changed files with 52 additions and 46 deletions
Download patch file Download diff file Expand all files Collapse all files

4
core/load-git.c
View file

@ -47,7 +47,7 @@ struct git_parser_state {
struct dive_table *table;
struct trip_table *trips;
struct dive_site_table *sites;
filter_preset_table_t *filter_presets;
struct filter_preset_table *filter_presets;
int o2pressure_sensor;
};
@ -1879,7 +1879,7 @@ const char *get_sha(git_repository *repo, const char *branch)
* or report an error and return 1 if the load failed.
*/
int git_load_dives(struct git_repository *repo, const char *branch, struct dive_table *table, struct trip_table *trips,
struct dive_site_table *sites, filter_preset_table_t *filter_presets)
struct dive_site_table *sites, struct filter_preset_table *filter_presets)
{
int ret;
struct git_parser_state state = { 0 };