Simplify DivePictureModel

The code of DivePictureModel used a QHash to keep track of thumbnails.
Not only was the code rather complex - it also had the consequence that
pictures are sorted according to the hash function, i.e. seemingly
random.

This commit replaces the QHash by a simple QList which keeps track
of thumbnails and some meta-data.

Signed-off-by: Berthold Stoeger <bstoeger@mail.tuwien.ac.at>

1 files changed, 7 insertions, 17 deletions

diff --git a/qt-models/divesitepicturesmodel.cpp b/qt-models/divesitepicturesmodel.cpp
index 0cd444ca8..b83d616c0 100644
--- a/qt-models/divesitepicturesmodel.cpp
+++ b/qt-models/divesitepicturesmodel.cpp
@@ -17,30 +17,20 @@ DiveSitePicturesModel::DiveSitePicturesModel() {
 
 void DiveSitePicturesModel::updateDivePictures() {
 	beginResetModel();
-	numberOfPictures = 0;
+	pictures.clear();
 	endResetModel();
 
 	const uint32_t ds_uuid = displayed_dive_site.uuid;
 	struct dive *d;
 	int i;
 
-	stringPixmapCache.clear();
-	SPictureList pictures;
+	for_each_dive (i, d)
+		if (d->dive_site_uuid == ds_uuid && dive_get_picture_count(d))
+			FOR_EACH_PICTURE(d)
+				pictures.push_back({picture, picture->filename, QImage(), picture->offset.seconds});
 
-	for_each_dive (i, d) {
-		if (d->dive_site_uuid == ds_uuid && dive_get_picture_count(d)) {
-			FOR_EACH_PICTURE(d) {
-				stringPixmapCache[QString(picture->filename)].offsetSeconds = picture->offset.seconds;
-				pictures.push_back(picture);
-			}
-		}
-	}
+	QtConcurrent::blockingMap(pictures, scaleImages);
 
-	QList<SPixmap> list = QtConcurrent::blockingMapped(pictures, scaleImages);
-	Q_FOREACH (const SPixmap &pixmap, list)
-		stringPixmapCache[pixmap.first->filename].image = pixmap.second;
-
-	numberOfPictures = list.count();
-	beginInsertRows(QModelIndex(), 0, numberOfPictures - 1);
+	beginInsertRows(QModelIndex(), 0, pictures.count() - 1);
 	endInsertRows();
 }