mirror of
https://github.com/subsurface/subsurface.git
synced 2025-02-19 22:16:15 +00:00
core: include trip table directly in divelog
Having this as a pointer is an artifact from the C/C++ split. The triptable header is small enough so that we can include it directly Signed-off-by: Berthold Stoeger <bstoeger@mail.tuwien.ac.at>
This commit is contained in:
parent
5af9d28291
commit
2bdcdab391
13 changed files with 39 additions and 39 deletions
|
@ -18,8 +18,8 @@ TripSelectionDialog::TripSelectionDialog(QWidget *parent) : QDialog(parent)
|
|||
|
||||
// We could use a model, but it seems barely worth the hassle.
|
||||
QStringList list;
|
||||
list.reserve(divelog.trips->size());
|
||||
for (auto &trip: *divelog.trips)
|
||||
list.reserve(divelog.trips.size());
|
||||
for (auto &trip: divelog.trips)
|
||||
list.push_back(formatTripTitleWithDives(*trip));
|
||||
ui.trips->addItems(list);
|
||||
}
|
||||
|
@ -37,9 +37,9 @@ dive_trip *TripSelectionDialog::selectedTrip() const
|
|||
if (rows.size() != 1)
|
||||
return nullptr;
|
||||
int idx = rows[0].row();
|
||||
if (idx < 0 || static_cast<size_t>(idx) >= divelog.trips->size())
|
||||
if (idx < 0 || static_cast<size_t>(idx) >= divelog.trips.size())
|
||||
return nullptr;
|
||||
return (*divelog.trips)[idx].get();
|
||||
return divelog.trips[idx].get();
|
||||
}
|
||||
|
||||
dive_trip *TripSelectionDialog::getTrip()
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue