mirror of
https://github.com/subsurface/subsurface.git
synced 2025-02-19 22:16:15 +00:00
core: turn C dive-table into an owning table
This is a humongous commit, because it touches all parts of the code. It removes the last user of our horrible TABLE macros, which simulate std::vector<> in a very clumsy way. Signed-off-by: Berthold Stoeger <bstoeger@mail.tuwien.ac.at>
This commit is contained in:
parent
f00c30ad4a
commit
b95ac3f79c
73 changed files with 1030 additions and 1230 deletions
|
|
@ -62,11 +62,9 @@ static std::vector<dive *> getDives(bool currentDiveOnly)
|
|||
: std::vector<dive *> { };
|
||||
|
||||
std::vector<dive *> res;
|
||||
struct dive *d;
|
||||
int i;
|
||||
for_each_dive (i, d) {
|
||||
for (auto &d: divelog.dives) {
|
||||
if (d->selected)
|
||||
res.push_back(d);
|
||||
res.push_back(d.get());
|
||||
}
|
||||
return res;
|
||||
}
|
||||
|
|
@ -1443,7 +1441,7 @@ void EditDive::exchangeDives()
|
|||
QVector<dive *> dives = { oldDive };
|
||||
timestamp_t delta = oldDive->when - newDive->when;
|
||||
if (delta != 0) {
|
||||
sort_dive_table(divelog.dives.get());
|
||||
divelog.dives.sort();
|
||||
divelog.trips->sort();
|
||||
if (newDive->divetrip != oldDive->divetrip)
|
||||
qWarning("Command::EditDive::redo(): This command does not support moving between trips!");
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue