mifr/subsurface
1
0
Fork 0
mirror of https://github.com/subsurface/subsurface.git synced 2025-02-19 22:16:15 +00:00
Code Issues Projects Releases Packages Wiki Activity

Undo: use dive * instead of unique index in renumber-dives

Browse source 
Now, that pointers to dives are stable, we might just as well
use dive * instead of the unique-id. This also affects the
merge-dive command, as this uses the same renumbering machinery.

Signed-off-by: Berthold Stoeger <bstoeger@mail.tuwien.ac.at>
This commit is contained in:
Berthold Stoeger 2018-07-30 15:55:29 +02:00 • committed by Dirk Hohndel
parent 26901a8dbd
commit 96d8727399
5 changed files with 16 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

6
desktop-widgets/command_divelist.h
View file

@ -85,14 +85,14 @@ private:
class RenumberDives : public Base {
public:
RenumberDives(const QVector<QPair<int, int>> &divesToRenumber);
RenumberDives(const QVector<QPair<dive *, int>> &divesToRenumber);
private:
void undo() override;
void redo() override;
bool workToBeDone() override;
// For redo and undo: pairs of dive-id / new number
QVector<QPair<int, int>> divesToRenumber;
QVector<QPair<dive *, int>> divesToRenumber;
};
// The classes RemoveDivesFromTrip, RemoveAutogenTrips, CreateTrip, AutogroupDives
@ -166,7 +166,7 @@ private:
std::vector<DiveToAdd> unmergedDives;
// For undo and redo
QVector<QPair<int, int>> divesToRenumber;
QVector<QPair<dive *, int>> divesToRenumber;
};
} // namespace Command