Picture handling: cleaning up the mess

We had pointers to data structures on the stack which we frequently
reallocated. These data structure contain basically a filename and an
offset. We then create a hash of the pointers to those datastructures with
the filename being the key. And then we passed those pointers around
through a Qt model(!!!) only in order to then later look up by filename
what the offset might be.

I am at a loss for words for the lunacy behind this design.

How about we just remember the offsets and pass the integers around?

Signed-off-by: Dirk Hohndel <dirk@hohndel.org>

1 files changed, 3 insertions, 3 deletions

diff --git a/qt-ui/divepicturewidget.cpp b/qt-ui/divepicturewidget.cpp
index b1078b42b..b44212470 100644
--- a/qt-ui/divepicturewidget.cpp
+++ b/qt-ui/divepicturewidget.cpp
@@ -49,7 +49,7 @@ void DivePictureModel::updateDivePictures()
 	stringPixmapCache.clear();
 	QStringList pictures;
 	FOR_EACH_PICTURE (&displayed_dive) {
-		stringPixmapCache[QString(picture->filename)].picture = picture;
+		stringPixmapCache[QString(picture->filename)].offsetSeconds = picture->offset.seconds;
 		pictures.push_back(QString(picture->filename));
 	}
 
@@ -89,7 +89,7 @@ QVariant DivePictureModel::data(const QModelIndex &index, int role) const
 	} else if (index.column() == 1) {
 		switch (role) {
 		case Qt::UserRole:
-			ret = QVariant::fromValue((void *)stringPixmapCache[key].picture);
+			ret = QVariant::fromValue((int)stringPixmapCache[key].offsetSeconds);
 		break;
 		case Qt::DisplayRole:
 			ret = key;
@@ -100,7 +100,7 @@ QVariant DivePictureModel::data(const QModelIndex &index, int role) const
 
 void DivePictureModel::removePicture(const QString &fileUrl)
 {
-	dive_remove_picture(stringPixmapCache[fileUrl].picture);
+	dive_remove_picture(fileUrl.toUtf8().data());
 	copy_dive(current_dive, &displayed_dive);
 	updateDivePictures();
 	mark_divelist_changed(true);