summaryrefslogtreecommitdiffstats
path: root/commands/command_divelist.h
diff options
context:
space:
mode:
authorGravatar Berthold Stoeger <bstoeger@mail.tuwien.ac.at>2020-10-17 16:07:39 +0200
committerGravatar Dirk Hohndel <dirk@hohndel.org>2020-10-24 09:51:37 -0700
commit39a4090c0a6e1d8fe12516be06ee7b31dd4bc96d (patch)
tree7587930b64bf95ec3a652cf761e6ded573931364 /commands/command_divelist.h
parentfadea413cdb4644b821369b27fad6e5f019d32c2 (diff)
downloadsubsurface-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_divelist.h')
-rw-r--r--commands/command_divelist.h5
1 files changed, 4 insertions, 1 deletions
diff --git a/commands/command_divelist.h b/commands/command_divelist.h
index cf204bedc..893badb39 100644
--- a/commands/command_divelist.h
+++ b/commands/command_divelist.h
@@ -6,6 +6,7 @@
#include "command_base.h"
#include "core/filterpreset.h"
+#include "core/device.h"
#include <QVector>
@@ -99,7 +100,8 @@ 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,
- struct filter_preset_table *filter_presets, int flags, const QString &source);
+ struct device_table *devices, struct filter_preset_table *filter_presets, int flags,
+ const QString &source);
private:
void undoit() override;
void redoit() override;
@@ -108,6 +110,7 @@ private:
// For redo and undo
DivesAndTripsToAdd divesToAdd;
DivesAndSitesToRemove divesAndSitesToRemove;
+ struct device_table devicesToAddAndRemove;
// For redo
std::vector<OwningDiveSitePtr> sitesToAdd;