diff options
Diffstat (limited to 'desktop-widgets/command_divesite.cpp')
| -rw-r--r-- | desktop-widgets/command_divesite.cpp | 17 |
1 files changed, 11 insertions, 6 deletions
diff --git a/desktop-widgets/command_divesite.cpp b/desktop-widgets/command_divesite.cpp index 7289bb980..4f53b376e 100644 --- a/desktop-widgets/command_divesite.cpp +++ b/desktop-widgets/command_divesite.cpp @@ -1,6 +1,7 @@ // SPDX-License-Identifier: GPL-2.0 #include "command_divesite.h" +#include "command_private.h" #include "core/divesite.h" #include "core/subsurface-qt/DiveListNotifier.h" #include "core/qthelper.h" @@ -312,7 +313,7 @@ void MergeDiveSites::redo() sitesToAdd = std::move(removeDiveSites(sitesToRemove)); // Remember which dives changed so that we can send a single dives-edited signal - QVector<dive *> divesChanged; + std::vector<dive *> divesChanged; // The dives of the above dive sites were reset to no dive sites. // Add them to the merged-into dive site. Thankfully, we remember @@ -320,28 +321,32 @@ void MergeDiveSites::redo() for (const OwningDiveSitePtr &site: sitesToAdd) { for (int i = 0; i < site->dives.nr; ++i) { add_dive_to_dive_site(site->dives.dives[i], ds); - divesChanged.append(site->dives.dives[i]); + divesChanged.push_back(site->dives.dives[i]); } } - emit diveListNotifier.divesEdited(divesChanged, DiveField::DIVESITE); + processByTrip(divesChanged, [&](dive_trip *trip, const QVector<dive *> &divesInTrip) { + emit diveListNotifier.divesChanged(trip, divesInTrip, DiveField::DIVESITE); + }); } void MergeDiveSites::undo() { // Remember which dives changed so that we can send a single dives-edited signal - QVector<dive *> divesChanged; + std::vector<dive *> divesChanged; // Before readding the dive sites, unregister the corresponding dives so that they can be // readded to their old dive sites. for (const OwningDiveSitePtr &site: sitesToAdd) { for (int i = 0; i < site->dives.nr; ++i) { unregister_dive_from_dive_site(site->dives.dives[i]); - divesChanged.append(site->dives.dives[i]); + divesChanged.push_back(site->dives.dives[i]); } } sitesToRemove = std::move(addDiveSites(sitesToAdd)); - emit diveListNotifier.divesEdited(divesChanged, DiveField::DIVESITE); + processByTrip(divesChanged, [&](dive_trip *trip, const QVector<dive *> &divesInTrip) { + emit diveListNotifier.divesChanged(trip, divesInTrip, DiveField::DIVESITE); + }); } } // namespace Command |