diff options
| author |  Dirk Hohndel <dirk@hohndel.org> | 2020-04-11 11:00:11 -0700 |
|---|---|---|
| committer |  GitHub <noreply@github.com> | 2020-04-11 11:00:11 -0700 |
| commit | 2990010ccde56acec980e76ef5671137e87af488 (patch) | |
| tree | 947bac6c813ea6aec4688085fc97cd08812407db | |
| parent | 1c420dc64a800fc2ebf0b675fc7edabed6a30d31 (diff) | |
| parent | abf9650280819a5e1f5b15f6d21fa297f986f42e (diff) | |
| download | subsurface-2990010ccde56acec980e76ef5671137e87af488.tar.gz | |
Merge pull request #2742 from bstoeger/clean87
cleanup: don't keep pointer-to-picture in PictureEntry
| -rw-r--r-- | qt-models/divepicturemodel.cpp | 2 | ||||
| -rw-r--r-- | qt-models/divepicturemodel.h | 1 |
2 files changed, 1 insertions, 2 deletions
diff --git a/qt-models/divepicturemodel.cpp b/qt-models/divepicturemodel.cpp index ab54c2dc1..705f23592 100644 --- a/qt-models/divepicturemodel.cpp +++ b/qt-models/divepicturemodel.cpp @@ -59,7 +59,7 @@ void DivePictureModel::updateDivePictures() if (dive->selected) { int first = pictures.count(); FOR_EACH_PICTURE(dive) - pictures.push_back({ dive->id, picture, picture->filename, {}, picture->offset.seconds, {.seconds = 0}}); + pictures.push_back({ dive->id, picture->filename, {}, picture->offset.seconds, {.seconds = 0}}); // Sort pictures of this dive by offset. // Thus, the list will be sorted by (diveId, offset). diff --git a/qt-models/divepicturemodel.h b/qt-models/divepicturemodel.h index 4e25db687..5bee26864 100644 --- a/qt-models/divepicturemodel.h +++ b/qt-models/divepicturemodel.h @@ -10,7 +10,6 @@ struct PictureEntry { int diveId; - struct picture *picture; QString filename; QImage image; int offsetSeconds; |