mifr/subsurface
1
0
Fork 0
mirror of https://github.com/subsurface/subsurface.git synced 2025-02-19 22:16:15 +00:00
Code Issues Projects Releases Packages Wiki Activity

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

Browse source 
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>
This commit is contained in:
Berthold Stoeger 2018-02-18 14:57:42 +01:00 • committed by Lubomir I. Ivanov
parent b750a48f0f
commit f5eafe2a71
5 changed files with 21 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

5
core/qthelper.cpp
View file

@ -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)