Cleanup: Fold add_hash() call into learnHash() function

learnHash() was always called in conjunction with add_hash(). The
pattern was that a local filename and a hash were connected in
the hash-to-filename and the filename-to-hash maps. Then, the
original picture-filename or url were registered in the filename-to-hash
map.

This commit changes learnHash() to take three parameters (original-filename,
local-filename and hash) and do all of the above. The new code is
simpler because no dummy picture struct has to be generated in
DiveListView::loadImageFromURL().

The tests were extended to check for all hash<->filename associations.

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

1 files changed, 3 insertions, 2 deletions

diff --git a/core/qthelper.cpp b/core/qthelper.cpp
index 0029ca13a..e03f86739 100644
--- a/core/qthelper.cpp
+++ b/core/qthelper.cpp
@@ -1149,12 +1149,13 @@ QByteArray hashFile(const QString filename)
 	}
 }
 
-void learnHash(const struct picture *picture, QByteArray hash)
+void learnHash(const QString &originalName, const QString &localName, const QByteArray &hash)
 {
 	if (hash.isNull())
 		return;
+	add_hash(localName, hash);
 	QMutexLocker locker(&hashOfMutex);
-	hashOf[QString(picture->filename)] = hash;
+	hashOf[originalName] = hash;
 }
 
 static bool haveHash(const QString &filename)