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
|
|
@ -102,9 +102,8 @@ void DivePlannerPointsModel::setupStartTime()
|
|||
// if the latest dive is in the future, then start an hour after it ends
|
||||
// otherwise start an hour from now
|
||||
startTime = QDateTime::currentDateTimeUtc().addSecs(3600 + gettimezoneoffset());
|
||||
if (divelog.dives->nr > 0) {
|
||||
struct dive *d = get_dive(divelog.dives->nr - 1);
|
||||
time_t ends = d->endtime();
|
||||
if (!divelog.dives.empty()) {
|
||||
time_t ends = divelog.dives.back()->endtime();
|
||||
time_t diff = ends - dateTimeToTimestamp(startTime);
|
||||
if (diff > 0)
|
||||
startTime = startTime.addSecs(diff + 3600);
|
||||
|
|
@ -1097,7 +1096,7 @@ void DivePlannerPointsModel::updateDiveProfile()
|
|||
|
||||
|
||||
#if DEBUG_PLAN
|
||||
save_dive(stderr, d);
|
||||
save_dive(stderr, *d);
|
||||
dump_plan(&diveplan);
|
||||
#endif
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue