diff options
| author |  Berthold Stoeger <bstoeger@mail.tuwien.ac.at> | 2020-06-28 15:24:19 +0200 |
|---|---|---|
| committer |  Dirk Hohndel <dirk@hohndel.org> | 2020-09-29 16:13:03 -0700 |
| commit | f9721fce4b12faee87398d23fd2f8b4d1b9a0309 (patch) | |
| tree | 0ca37231d70028eb2fdaf615a812af8c9983b1cf /commands/command.h | |
| parent | 631be569fe5b277c4c1729019305e06b02cec611 (diff) | |
| download | subsurface-f9721fce4b12faee87398d23fd2f8b4d1b9a0309.tar.gz | |
filter: implement importing of filter presets
When importing a divelog, import filter presets. If there are
equal names, import only if the presets differ. In that case,
disambiguate the name. This made things a bit more complicated,
as comparison of filter presets had to be implemented.
Signed-off-by: Berthold Stoeger <bstoeger@mail.tuwien.ac.at>
Diffstat (limited to 'commands/command.h')
| -rw-r--r-- | commands/command.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/commands/command.h b/commands/command.h index 3cdec6d4e..8936355e5 100644 --- a/commands/command.h +++ b/commands/command.h @@ -3,6 +3,7 @@ #define COMMAND_H #include "core/dive.h" +#include "core/filterpreset.h" #include "core/pictureobj.h" #include <QVector> #include <QAction> @@ -32,7 +33,8 @@ 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, int flags, const QString &source); // The tables are consumed! + struct dive_site_table *sites, filter_preset_table_t *filter_presets, + int flags, const QString &source); // The tables are consumed! void deleteDive(const QVector<struct dive*> &divesToDelete); void shiftTime(const std::vector<dive *> &changedDives, int amount); void renumberDives(const QVector<QPair<dive *, int>> &divesToRenumber); |