squidy/qBittorrent
1
0
Fork 0
mirror of https://github.com/qbittorrent/qBittorrent.git synced 2025-12-22 16:37:21 -06:00
Code Issues Packages Projects Releases Wiki Activity

Rename IP filtering functions and settings names.

Browse Source
This commit is contained in:
sledgehammer999
2016-10-29 19:14:27 +03:00
parent dca4ff0649
commit f283734f13
6 changed files with 19 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/base/bittorrent/session.cpp
View File

@@ -245,7 +245,7 @@ Session::Session(QObject *parent)
, m_isLSDEnabled(BITTORRENT_SESSION_KEY("LSDEnabled"), true)
, m_isPeXEnabled(BITTORRENT_SESSION_KEY("PeXEnabled"), true)
, m_isTrackerExchangeEnabled(BITTORRENT_SESSION_KEY("TrackerExchangeEnabled"), false)
, m_isFilteringEnabled(BITTORRENT_SESSION_KEY("FilteringEnabled"), false)
, m_isIPFilteringEnabled(BITTORRENT_SESSION_KEY("IPFilteringEnabled"), false)
, m_isTrackerFilteringEnabled(BITTORRENT_SESSION_KEY("TrackerFilteringEnabled"), false)
, m_IPFilterFile(BITTORRENT_SESSION_KEY("IPFilter"))
, m_announceToAllTrackers(BITTORRENT_SESSION_KEY("AnnounceToAllTrackers"), true)
@@ -417,7 +417,7 @@ Session::Session(QObject *parent)
, Log::INFO);
m_nativeSession->set_ip_filter({});
if (isFilteringEnabled())
if (isIPFilteringEnabled())
enableIPFilter();
// Add the banned IPs
processBannedIPs();
@@ -923,7 +923,7 @@ void Session::configure()
#endif
if (m_IPFilteringChanged) {
if (isFilteringEnabled())
if (isIPFilteringEnabled())
enableIPFilter();
else
disableIPFilter();
@@ -2347,15 +2347,15 @@ void Session::setAdditionalTrackers(const QString &trackers)
}
}
bool Session::isFilteringEnabled() const
bool Session::isIPFilteringEnabled() const
{
return m_isFilteringEnabled;
return m_isIPFilteringEnabled;
}
void Session::setFilteringEnabled(bool enabled)
void Session::setIPFilteringEnabled(bool enabled)
{
if (enabled != m_isFilteringEnabled) {
m_isFilteringEnabled = enabled;
if (enabled != m_isIPFilteringEnabled) {
m_isIPFilteringEnabled = enabled;
m_IPFilteringChanged = true;
configureDeferred();
}

6
src/base/bittorrent/session.h
View File

@@ -273,8 +273,8 @@ namespace BitTorrent
void setAddTrackersEnabled(bool enabled);
QString additionalTrackers() const;
void setAdditionalTrackers(const QString &trackers);
bool isFilteringEnabled() const;
void setFilteringEnabled(bool enabled);
bool isIPFilteringEnabled() const;
void setIPFilteringEnabled(bool enabled);
QString IPFilterFile() const;
void setIPFilterFile(QString path);
bool announceToAllTrackers() const;
@@ -505,7 +505,7 @@ namespace BitTorrent
CachedSettingValue<bool> m_isLSDEnabled;
CachedSettingValue<bool> m_isPeXEnabled;
CachedSettingValue<bool> m_isTrackerExchangeEnabled;
CachedSettingValue<bool> m_isFilteringEnabled;
CachedSettingValue<bool> m_isIPFilteringEnabled;
CachedSettingValue<bool> m_isTrackerFilteringEnabled;
CachedSettingValue<QString> m_IPFilterFile;
CachedSettingValue<bool> m_announceToAllTrackers;

2
src/base/settingsstorage.cpp
View File

@@ -132,7 +132,7 @@ namespace
{"BitTorrent/Session/TrackerExchangeEnabled", "Preferences/Advanced/LtTrackerExchange"},
{"BitTorrent/Session/AddTrackersEnabled", "Preferences/Bittorrent/AddTrackers"},
{"BitTorrent/Session/AdditionalTrackers", "Preferences/Bittorrent/TrackersList"},
{"BitTorrent/Session/FilteringEnabled", "Preferences/IPFilter/Enabled"},
{"BitTorrent/Session/IPFilteringEnabled", "Preferences/IPFilter/Enabled"},
{"BitTorrent/Session/TrackerFilteringEnabled", "Preferences/IPFilter/FilterTracker"},
{"BitTorrent/Session/IPFilter", "Preferences/IPFilter/File"},
{"BitTorrent/Session/GlobalMaxRatio", "Preferences/Bittorrent/MaxRatio"},