diff options
| author |  Berthold Stoeger <bstoeger@mail.tuwien.ac.at> | 2019-01-13 08:12:47 +0200 |
|---|---|---|
| committer |  Dirk Hohndel <dirk@hohndel.org> | 2019-01-19 13:48:17 -0800 |
| commit | 1cd0863cca678cf54dfa8a71f3ca9f94bfc4f693 (patch) | |
| tree | 6c93ffdab364c718bb9876ee9ac463b773e8ea5d /desktop-widgets/command_divelist.cpp | |
| parent | 31eb86c73365deefc2bcf51f7ad86bf4ba314379 (diff) | |
| download | subsurface-1cd0863cca678cf54dfa8a71f3ca9f94bfc4f693.tar.gz | |
Import: add add_to_new_trip flag to process_imported_dives()
If this flag is set, dives that are not assigned to a trip will
be assigned to a new trip. This flag is set if the user checked
"add to new trip" in the download dialog of the desktop version.
Currently this is a no-op as the dives will already have been
added to a new trip by the downloading code. This will be removed
in a subsequent commit.
Signed-off-by: Berthold Stoeger <bstoeger@mail.tuwien.ac.at>
Diffstat (limited to 'desktop-widgets/command_divelist.cpp')
| -rw-r--r-- | desktop-widgets/command_divelist.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/desktop-widgets/command_divelist.cpp b/desktop-widgets/command_divelist.cpp index 4e985cf28..e7edaaa54 100644 --- a/desktop-widgets/command_divelist.cpp +++ b/desktop-widgets/command_divelist.cpp @@ -554,7 +554,7 @@ void AddDive::undoit() ImportDives::ImportDives(struct dive_table *dives, struct trip_table *trips, bool prefer_imported, bool downloaded, bool merge_all_trips, - const QString &source) + bool add_to_new_trip, const QString &source) { setText(tr("import %n dive(s) from %1", "", dives->nr).arg(source)); @@ -562,7 +562,7 @@ ImportDives::ImportDives(struct dive_table *dives, struct trip_table *trips, struct dive_table dives_to_remove = { 0 }; struct trip_table trips_to_add = { 0 }; process_imported_dives(dives, trips, prefer_imported, downloaded, merge_all_trips, - &dives_to_add, &dives_to_remove, &trips_to_add); + add_to_new_trip, &dives_to_add, &dives_to_remove, &trips_to_add); // Add trips to the divesToAdd.trips structure divesToAdd.trips.reserve(trips_to_add.nr); |