diff options
| author |  Berthold Stoeger <bstoeger@mail.tuwien.ac.at> | 2020-10-17 09:58:23 +0200 |
|---|---|---|
| committer |  Dirk Hohndel <dirk@hohndel.org> | 2020-10-17 09:04:20 -0700 |
| commit | a7bbb6c1cc5c5b9ed3dc48cdb4da910214d51e96 (patch) | |
| tree | 166a4d2a6c0e44d9ec0e03ef45274d038e93244d /core/parse.h | |
| parent | 67aec56f8c276cef9e1809404be2141d865bfe96 (diff) | |
| download | subsurface-a7bbb6c1cc5c5b9ed3dc48cdb4da910214d51e96.tar.gz | |
filter: remove filter_preset_table_t
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>
Diffstat (limited to 'core/parse.h')
| -rw-r--r-- | core/parse.h | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/core/parse.h b/core/parse.h index 899a006f7..f3d4039e3 100644 --- a/core/parse.h +++ b/core/parse.h @@ -73,10 +73,10 @@ struct parser_state { int sample_rate; struct extra_data cur_extra_data; struct units xml_parsing_units; - struct dive_table *target_table; /* non-owning */ - struct trip_table *trips; /* non-owning */ - struct dive_site_table *sites; /* non-owning */ - filter_preset_table_t *filter_presets; /* non-owning */ + struct dive_table *target_table; /* non-owning */ + struct trip_table *trips; /* non-owning */ + struct dive_site_table *sites; /* non-owning */ + struct filter_preset_table *filter_presets; /* non-owning */ sqlite3 *sql_handle; /* for SQL based parsers */ event_allocation_t event_allocation; @@ -140,7 +140,7 @@ int atoi_n(char *ptr, unsigned int len); void parse_xml_init(void); int parse_xml_buffer(const char *url, const char *buf, int size, struct dive_table *table, struct trip_table *trips, struct dive_site_table *sites, - filter_preset_table_t *filter_presets, const char **params); + struct filter_preset_table *filter_presets, const char **params); void parse_xml_exit(void); int parse_dm4_buffer(sqlite3 *handle, const char *url, const char *buf, int size, struct dive_table *table, struct trip_table *trips, struct dive_site_table *sites); int parse_dm5_buffer(sqlite3 *handle, const char *url, const char *buf, int size, struct dive_table *table, struct trip_table *trips, struct dive_site_table *sites); |