From a7bbb6c1cc5c5b9ed3dc48cdb4da910214d51e96 Mon Sep 17 00:00:00 2001 From: Berthold Stoeger Date: Sat, 17 Oct 2020 09:58:23 +0200 Subject: 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". 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". 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 --- commands/command.cpp | 2 +- commands/command.h | 2 +- commands/command_divelist.cpp | 2 +- commands/command_divelist.h | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) (limited to 'commands') diff --git a/commands/command.cpp b/commands/command.cpp index eaf84bab3..d70ca12fe 100644 --- a/commands/command.cpp +++ b/commands/command.cpp @@ -18,7 +18,7 @@ void addDive(dive *d, bool autogroup, bool newNumber) } void importDives(struct dive_table *dives, struct trip_table *trips, struct dive_site_table *sites, - filter_preset_table_t *presets, int flags, const QString &source) + struct filter_preset_table *presets, int flags, const QString &source) { execute(new ImportDives(dives, trips, sites, presets, flags, source)); } diff --git a/commands/command.h b/commands/command.h index 8936355e5..b2c6826a3 100644 --- a/commands/command.h +++ b/commands/command.h @@ -33,7 +33,7 @@ QString changesMade(); // return a string with the texts from all commands on // insertion position. void addDive(dive *d, bool autogroup, bool newNumber); void importDives(struct dive_table *dives, 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 flags, const QString &source); // The tables are consumed! void deleteDive(const QVector &divesToDelete); void shiftTime(const std::vector &changedDives, int amount); diff --git a/commands/command_divelist.cpp b/commands/command_divelist.cpp index 39232b731..54dc0983c 100644 --- a/commands/command_divelist.cpp +++ b/commands/command_divelist.cpp @@ -470,7 +470,7 @@ void AddDive::undoit() } ImportDives::ImportDives(struct dive_table *dives, struct trip_table *trips, struct dive_site_table *sites, - filter_preset_table_t *filter_presets, int flags, const QString &source) + struct filter_preset_table *filter_presets, int flags, const QString &source) { setText(Command::Base::tr("import %n dive(s) from %1", "", dives->nr).arg(source)); diff --git a/commands/command_divelist.h b/commands/command_divelist.h index 9569da031..cf204bedc 100644 --- a/commands/command_divelist.h +++ b/commands/command_divelist.h @@ -99,7 +99,7 @@ class ImportDives : public DiveListBase { public: // Note: dives and trips are consumed - after the call they will be empty. ImportDives(struct dive_table *dives, struct trip_table *trips, struct dive_site_table *sites, - filter_preset_table_t *filter_presets, int flags, const QString &source); + struct filter_preset_table *filter_presets, int flags, const QString &source); private: void undoit() override; void redoit() override; -- cgit v1.2.3-70-g09d2