mirror/qBittorrent
2
0
Fork 0
mirror of https://github.com/qbittorrent/qBittorrent.git synced 2024-12-27 08:19:30 +08:00
Code Issues Packages Projects Releases Wiki Activity

Add comparison operators for ProxyConfiguration

Browse Source
This commit is contained in:
Chocobo1 2019-06-16 16:55:58 +08:00
parent 623210df58
commit 3b015db77d
No known key found for this signature in database
GPG Key ID: 210D9C873253A68C
2 changed files with 16 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
src/base/net/proxyconfigurationmanager.cpp
View File

@ -41,15 +41,20 @@ const QString KEY_PASSWORD = SETTINGS_KEY("Password");
namespace namespace
{ {
inline SettingsStorage *settings() { return SettingsStorage::instance(); } inline SettingsStorage *settings() { return SettingsStorage::instance(); }
inline bool isSameConfig(const Net::ProxyConfiguration &conf1, const Net::ProxyConfiguration &conf2)
{
return conf1.type == conf2.type
&& conf1.ip == conf2.ip
&& conf1.port == conf2.port
&& conf1.username == conf2.username
&& conf1.password == conf2.password;
} }
bool Net::operator==(const ProxyConfiguration &left, const ProxyConfiguration &right)
{
return (left.type == right.type)
&& (left.ip == right.ip)
&& (left.port == right.port)
&& (left.username == right.username)
&& (left.password == right.password);
}
bool Net::operator!=(const ProxyConfiguration &left, const ProxyConfiguration &right)
{
return !(left == right);
} }
using namespace Net; using namespace Net;
@ -97,7 +102,7 @@ ProxyConfiguration ProxyConfigurationManager::proxyConfiguration() const
void ProxyConfigurationManager::setProxyConfiguration(const ProxyConfiguration &config) void ProxyConfigurationManager::setProxyConfiguration(const ProxyConfiguration &config)
{ {
if (!isSameConfig(config, m_config)) { if (config != m_config) {
m_config = config; m_config = config;
settings()->storeValue(KEY_TYPE, static_cast<int>(config.type)); settings()->storeValue(KEY_TYPE, static_cast<int>(config.type));
settings()->storeValue(KEY_IP, config.ip); settings()->storeValue(KEY_IP, config.ip);

2
src/base/net/proxyconfigurationmanager.h
View File

@ -51,6 +51,8 @@ namespace Net
QString username; QString username;
QString password; QString password;
}; };
bool operator==(const ProxyConfiguration &left, const ProxyConfiguration &right);
bool operator!=(const ProxyConfiguration &left, const ProxyConfiguration &right);
class ProxyConfigurationManager : public QObject class ProxyConfigurationManager : public QObject
{ {