diff options
| author |  Berthold Stoeger <bstoeger@mail.tuwien.ac.at> | 2020-04-17 22:43:43 +0200 |
|---|---|---|
| committer |  Dirk Hohndel <dirk@hohndel.org> | 2020-05-06 13:58:09 -0700 |
| commit | 9962d47b56eb15aba9339b22845566535c168483 (patch) | |
| tree | 4101ffd5526b0a70b91e94216808cd4027ca14bc /qt-models/divepicturemodel.h | |
| parent | fe82cb32b93e906b9bf53010538651b9c84df9db (diff) | |
| download | subsurface-9962d47b56eb15aba9339b22845566535c168483.tar.gz | |
media: turn DivePictureModel::pictures into std::vector
QVector doesn't have a function to insert a range of pictures,
which we will need for undo of image adding/deletion.
Moreover, std::vector gives us stronger guarantees. For example,
if capacity is large enough, it guarantees that there will be
no reallocation and thus iterators stay valid. I have not found
such a guarantee in the Qt docs.
Signed-off-by: Berthold Stoeger <bstoeger@mail.tuwien.ac.at>
Diffstat (limited to 'qt-models/divepicturemodel.h')
| -rw-r--r-- | qt-models/divepicturemodel.h | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/qt-models/divepicturemodel.h b/qt-models/divepicturemodel.h index 523d552e3..395dbedd1 100644 --- a/qt-models/divepicturemodel.h +++ b/qt-models/divepicturemodel.h @@ -6,7 +6,6 @@ #include <QAbstractTableModel> #include <QImage> -#include <QFuture> // We use std::string instead of QString to use the same character-encoding // as in the C core (UTF-8). This is crucial to guarantee the same sort-order. @@ -36,7 +35,7 @@ public slots: void pictureOffsetChanged(dive *d, const QString filename, offset_t offset); private: DivePictureModel(); - QVector<PictureEntry> pictures; + std::vector<PictureEntry> pictures; int findPictureId(const std::string &filename); // Return -1 if not found double zoomLevel; // -1.0: minimum, 0.0: standard, 1.0: maximum int size; |