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

Migrate to lt::error_code

Browse Source
This commit is contained in:
Chocobo1 2019-10-17 00:29:26 +08:00
parent 0d3152e4b0
commit cbe78baff1
No known key found for this signature in database
GPG Key ID: 210D9C873253A68C
2 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/base/bittorrent/private/filterparserthread.cpp
View File

@ -30,6 +30,8 @@
#include <cctype> #include <cctype>
#include <libtorrent/error_code.hpp>
#include <QDataStream> #include <QDataStream>
#include <QFile> #include <QFile>
@ -89,7 +91,7 @@ namespace
bool parseIPAddress(const char *data, lt::address &address) bool parseIPAddress(const char *data, lt::address &address)
{ {
IPv4Parser parser; IPv4Parser parser;
boost::system::error_code ec; lt::error_code ec;
if (parser.tryParse(data)) if (parser.tryParse(data))
address = lt::address_v4(parser.parsed()); address = lt::address_v4(parser.parsed());

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

@ -1012,7 +1012,7 @@ void Session::processBannedIPs(lt::ip_filter &filter)
{ {
// First, import current filter // First, import current filter
for (const QString &ip : asConst(m_bannedIPs.value())) { for (const QString &ip : asConst(m_bannedIPs.value())) {
boost::system::error_code ec; lt::error_code ec;
const lt::address addr = lt::address::from_string(ip.toLatin1().constData(), ec); const lt::address addr = lt::address::from_string(ip.toLatin1().constData(), ec);
Q_ASSERT(!ec); Q_ASSERT(!ec);
if (!ec) if (!ec)
@ -1612,7 +1612,7 @@ void Session::banIP(const QString &ip)
QStringList bannedIPs = m_bannedIPs; QStringList bannedIPs = m_bannedIPs;
if (!bannedIPs.contains(ip)) { if (!bannedIPs.contains(ip)) {
lt::ip_filter filter = m_nativeSession->get_ip_filter(); lt::ip_filter filter = m_nativeSession->get_ip_filter();
boost::system::error_code ec; lt::error_code ec;
const lt::address addr = lt::address::from_string(ip.toLatin1().constData(), ec); const lt::address addr = lt::address::from_string(ip.toLatin1().constData(), ec);
Q_ASSERT(!ec); Q_ASSERT(!ec);
if (ec) return; if (ec) return;
@ -4132,7 +4132,7 @@ void Session::handlePortmapAlert(const lt::portmap_alert *p)
void Session::handlePeerBlockedAlert(const lt::peer_blocked_alert *p) void Session::handlePeerBlockedAlert(const lt::peer_blocked_alert *p)
{ {
boost::system::error_code ec; lt::error_code ec;
#if LIBTORRENT_VERSION_NUM < 10200 #if LIBTORRENT_VERSION_NUM < 10200
const std::string ip = p->ip.to_string(ec); const std::string ip = p->ip.to_string(ec);
#else #else
@ -4166,7 +4166,7 @@ void Session::handlePeerBlockedAlert(const lt::peer_blocked_alert *p)
void Session::handlePeerBanAlert(const lt::peer_ban_alert *p) void Session::handlePeerBanAlert(const lt::peer_ban_alert *p)
{ {
boost::system::error_code ec; lt::error_code ec;
#if (LIBTORRENT_VERSION_NUM < 10200) #if (LIBTORRENT_VERSION_NUM < 10200)
const std::string ip = p->ip.address().to_string(ec); const std::string ip = p->ip.address().to_string(ec);
#else #else
@ -4244,7 +4244,7 @@ void Session::handleListenSucceededAlert(const lt::listen_succeeded_alert *p)
} }
#endif #endif
boost::system::error_code ec; lt::error_code ec;
LogMsg(tr("Successfully listening on IP: %1, port: %2/%3" LogMsg(tr("Successfully listening on IP: %1, port: %2/%3"
, "e.g: Successfully listening on IP: 192.168.0.1, port: TCP/6881") , "e.g: Successfully listening on IP: 192.168.0.1, port: TCP/6881")
#if (LIBTORRENT_VERSION_NUM < 10200) #if (LIBTORRENT_VERSION_NUM < 10200)
@ -4307,7 +4307,7 @@ void Session::handleListenFailedAlert(const lt::listen_failed_alert *p)
} }
#endif #endif
boost::system::error_code ec; lt::error_code ec;
LogMsg(tr("Failed to listen on IP: %1, port: %2/%3. Reason: %4" LogMsg(tr("Failed to listen on IP: %1, port: %2/%3. Reason: %4"
, "e.g: Failed to listen on IP: 192.168.0.1, port: TCP/6881. Reason: already in use") , "e.g: Failed to listen on IP: 192.168.0.1, port: TCP/6881. Reason: already in use")
#if (LIBTORRENT_VERSION_NUM < 10200) #if (LIBTORRENT_VERSION_NUM < 10200)
@ -4321,7 +4321,7 @@ void Session::handleListenFailedAlert(const lt::listen_failed_alert *p)
void Session::handleExternalIPAlert(const lt::external_ip_alert *p) void Session::handleExternalIPAlert(const lt::external_ip_alert *p)
{ {
boost::system::error_code ec; lt::error_code ec;
LogMsg(tr("Detected external IP: %1", "e.g. Detected external IP: 1.1.1.1") LogMsg(tr("Detected external IP: %1", "e.g. Detected external IP: 1.1.1.1")
.arg(p->external_address.to_string(ec).c_str()), Log::INFO); .arg(p->external_address.to_string(ec).c_str()), Log::INFO);
} }