squidy/qBittorrent
1
0
Fork 0
mirror of https://github.com/qbittorrent/qBittorrent.git synced 2026-01-08 16:42:30 -06:00
Code Issues Packages Projects Releases Wiki Activity

Update function signature for Qt6 qHash()

Browse Source 
Since the `qhash()` signature has changed in Qt6.
This commit is contained in:
Chocobo1
2022-03-12 20:59:29 +08:00
parent 8de966ea88
commit 926d51839f
17 changed files with 87 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -364,7 +364,11 @@ Net::ServiceID Net::ServiceID::fromURL(const QUrl &url)
return {url.host(), url.port(80)};
}
#if (QT_VERSION >= QT_VERSION_CHECK(6, 0, 0))
std::size_t Net::qHash(const ServiceID &serviceID, const std::size_t seed)
#else
uint Net::qHash(const ServiceID &serviceID, const uint seed)
#endif
{
return ::qHash(serviceID.hostName, seed) ^ ::qHash(serviceID.port);
}

7
src/base/net/downloadmanager.h
View File

@@ -29,6 +29,7 @@
#pragma once
#include <QtGlobal>
#include <QHash>
#include <QNetworkAccessManager>
#include <QObject>
@@ -52,7 +53,11 @@ namespace Net
static ServiceID fromURL(const QUrl &url);
};
uint qHash(const ServiceID &serviceID, uint seed);
#if (QT_VERSION >= QT_VERSION_CHECK(6, 0, 0))
std::size_t qHash(const ServiceID &serviceID, std::size_t seed = 0);
#else
uint qHash(const ServiceID &serviceID, uint seed = 0);
#endif
bool operator==(const ServiceID &lhs, const ServiceID &rhs);
enum class DownloadStatus