diff options
| author |  Berthold Stoeger <bstoeger@mail.tuwien.ac.at> | 2020-10-17 16:07:39 +0200 |
|---|---|---|
| committer |  Dirk Hohndel <dirk@hohndel.org> | 2020-10-24 09:51:37 -0700 |
| commit | 39a4090c0a6e1d8fe12516be06ee7b31dd4bc96d (patch) | |
| tree | 7587930b64bf95ec3a652cf761e6ded573931364 /commands/command.h | |
| parent | fadea413cdb4644b821369b27fad6e5f019d32c2 (diff) | |
| download | subsurface-39a4090c0a6e1d8fe12516be06ee7b31dd4bc96d.tar.gz | |
devices: add devices in Command::importTable()
Add a device_table parameters to Command::importTable() and
add_imported_dives(). The content of this table will be added
to the global device list (respectively removed on undo).
This is currently a no-op, as the parser doesn't yet fill
out the device table, but adds devices directly to the global
device table.
Signed-off-by: Berthold Stoeger <bstoeger@mail.tuwien.ac.at>
Diffstat (limited to 'commands/command.h')
| -rw-r--r-- | commands/command.h | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/commands/command.h b/commands/command.h index b2c6826a3..26340357e 100644 --- a/commands/command.h +++ b/commands/command.h @@ -3,7 +3,6 @@ #define COMMAND_H #include "core/dive.h" -#include "core/filterpreset.h" #include "core/pictureobj.h" #include <QVector> #include <QAction> @@ -11,6 +10,8 @@ struct DiveAndLocation; struct FilterData; +struct filter_preset_table; +struct device_table; // We put everything in a namespace, so that we can shorten names without polluting the global namespace namespace Command { @@ -33,7 +34,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, struct filter_preset_table *filter_presets, + struct dive_site_table *sites, struct device_table *devices, + struct filter_preset_table *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); |