d4708/qBittorrent
1
0
Fork 0
mirror of https://github.com/d47081/qBittorrent.git synced 2025-02-02 09:55:55 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #11933 from Chocobo1/qhash

Browse Source 
Improve qHash functions
This commit is contained in:
Mike Tzou 2020-01-29 02:07:27 +08:00 committed by GitHub
commit 4884788c0b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/base/bittorrent/infohash.cpp
View File

@ -89,5 +89,9 @@ bool BitTorrent::operator!=(const InfoHash &left, const InfoHash &right)
uint BitTorrent::qHash(const InfoHash &key, const uint seed) uint BitTorrent::qHash(const InfoHash &key, const uint seed)
{ {
#if (LIBTORRENT_VERSION_NUM < 10200)
return ::qHash(static_cast<QString>(key), seed); return ::qHash(static_cast<QString>(key), seed);
#else
return ::qHash((std::hash<lt::sha1_hash> {})(key), seed);
#endif
} }

2
src/base/bittorrent/torrenthandle.cpp
View File

@ -82,7 +82,7 @@ namespace libtorrent
template <typename T, typename Tag> template <typename T, typename Tag>
uint qHash(const strong_typedef<T, Tag> &key, const uint seed) uint qHash(const strong_typedef<T, Tag> &key, const uint seed)
{ {
return static_cast<uint>((std::hash<strong_typedef<T, Tag>> {})(key) ^ seed); return ::qHash((std::hash<strong_typedef<T, Tag>> {})(key), seed);
} }
} }
} }

2
src/base/bittorrent/trackerentry.cpp
View File

@ -162,5 +162,5 @@ bool BitTorrent::operator==(const TrackerEntry &left, const TrackerEntry &right)
uint BitTorrent::qHash(const TrackerEntry &key, const uint seed) uint BitTorrent::qHash(const TrackerEntry &key, const uint seed)
{ {
return (::qHash(key.url(), seed) ^ key.tier()); return (::qHash(key.url(), seed) ^ ::qHash(key.tier()));
} }

2
src/base/net/downloadmanager.cpp
View File

@ -348,7 +348,7 @@ Net::ServiceID Net::ServiceID::fromURL(const QUrl &url)
uint Net::qHash(const ServiceID &serviceID, const uint seed) uint Net::qHash(const ServiceID &serviceID, const uint seed)
{ {
return ::qHash(serviceID.hostName, seed) ^ serviceID.port; return ::qHash(serviceID.hostName, seed) ^ ::qHash(serviceID.port);
} }
bool Net::operator==(const ServiceID &lhs, const ServiceID &rhs) bool Net::operator==(const ServiceID &lhs, const ServiceID &rhs)