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 /tests/testrenumber.cpp | |
| 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 'tests/testrenumber.cpp')
| -rw-r--r-- | tests/testrenumber.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/tests/testrenumber.cpp b/tests/testrenumber.cpp index e6b0f43fb..36c9f36cd 100644 --- a/tests/testrenumber.cpp +++ b/tests/testrenumber.cpp @@ -17,7 +17,7 @@ void TestRenumber::testMerge() struct dive_table table = empty_dive_table; struct trip_table trips = empty_trip_table; struct dive_site_table sites = empty_dive_site_table; - filter_preset_table_t filter_presets; + struct filter_preset_table filter_presets; QCOMPARE(parse_file(SUBSURFACE_TEST_DATA "/dives/test47b.xml", &table, &trips, &sites, &filter_presets), 0); add_imported_dives(&table, &trips, &sites, IMPORT_MERGE_ALL_TRIPS); QCOMPARE(dive_table.nr, 1); @@ -30,7 +30,7 @@ void TestRenumber::testMergeAndAppend() struct dive_table table = empty_dive_table; struct trip_table trips = empty_trip_table; struct dive_site_table sites = empty_dive_site_table; - filter_preset_table_t filter_presets; + struct filter_preset_table filter_presets; QCOMPARE(parse_file(SUBSURFACE_TEST_DATA "/dives/test47c.xml", &table, &trips, &sites, &filter_presets), 0); add_imported_dives(&table, &trips, &sites, IMPORT_MERGE_ALL_TRIPS); QCOMPARE(dive_table.nr, 2); |