mirrors/qBittorrent
1
0
Fork 0
mirror of https://github.com/qbittorrent/qBittorrent.git synced 2024-11-29 05:48:47 +03:00
Code Issues Projects Releases Packages Wiki Activity

Fix libtorrent 1.0.0 compilation. Closes #1659

Browse source
This commit is contained in:
sledgehammer999 2014-05-10 00:13:20 +03:00
parent e6b2919eb2
commit baaf575eee
2 changed files with 17 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
src/properties/peerlistwidget.cpp
View file

@ -385,7 +385,7 @@ QStandardItem* PeerListWidget::addPeer(const QString& ip, const peer_info& peer)
m_missingFlags.insert(ip); m_missingFlags.insert(ip);
} }
} }
m_listModel->setData(m_listModel->index(row, PeerListDelegate::CONNECTION), getConnectionString(peer.connection_type)); m_listModel->setData(m_listModel->index(row, PeerListDelegate::CONNECTION), getConnectionString(peer));
QString flags, tooltip; QString flags, tooltip;
getFlags(peer, flags, tooltip); getFlags(peer, flags, tooltip);
m_listModel->setData(m_listModel->index(row, PeerListDelegate::FLAGS), flags); m_listModel->setData(m_listModel->index(row, PeerListDelegate::FLAGS), flags);
@ -411,7 +411,7 @@ void PeerListWidget::updatePeer(const QString& ip, const peer_info& peer) {
m_missingFlags.remove(ip); m_missingFlags.remove(ip);
} }
} }
m_listModel->setData(m_listModel->index(row, PeerListDelegate::CONNECTION), getConnectionString(peer.connection_type)); m_listModel->setData(m_listModel->index(row, PeerListDelegate::CONNECTION), getConnectionString(peer));
QString flags, tooltip; QString flags, tooltip;
getFlags(peer, flags, tooltip); getFlags(peer, flags, tooltip);
m_listModel->setData(m_listModel->index(row, PeerListDelegate::FLAGS), flags); m_listModel->setData(m_listModel->index(row, PeerListDelegate::FLAGS), flags);
@ -442,13 +442,18 @@ void PeerListWidget::handleSortColumnChanged(int col)
} }
} }
QString PeerListWidget::getConnectionString(int connection_type) QString PeerListWidget::getConnectionString(const peer_info& peer)
{ {
#if LIBTORRENT_VERSION_NUM < 10000
if (peer.connection_type & peer_info::bittorrent_utp) {
#else
if (peer.flags & peer_info::utp_socket) {
#endif
return QString::fromUtf8("μTP");
}
QString connection; QString connection;
switch(connection_type) { switch(peer.connection_type) {
case peer_info::bittorrent_utp:
connection = "uTP";
break;
case peer_info::http_seed: case peer_info::http_seed:
case peer_info::web_seed: case peer_info::web_seed:
connection = "Web"; connection = "Web";
@ -556,7 +561,11 @@ void PeerListWidget::getFlags(const peer_info& peer, QString& flags, QString& to
} }
//P = Peer is using uTorrent uTP //P = Peer is using uTorrent uTP
#if LIBTORRENT_VERSION_NUM < 10000
if (peer.connection_type & peer_info::bittorrent_utp) { if (peer.connection_type & peer_info::bittorrent_utp) {
#else
if (peer.flags & peer_info::utp_socket) {
#endif
flags += "P "; flags += "P ";
tooltip += QString::fromUtf8("μTP"); tooltip += QString::fromUtf8("μTP");
tooltip += ", "; tooltip += ", ";

2
src/properties/peerlistwidget.h
View file

@ -87,7 +87,7 @@ protected slots:
void handleSortColumnChanged(int col); void handleSortColumnChanged(int col);
private: private:
static QString getConnectionString(int connection_type); static QString getConnectionString(const libtorrent::peer_info &peer);
static void getFlags(const libtorrent::peer_info& peer, QString& flags, QString& tooltip); static void getFlags(const libtorrent::peer_info& peer, QString& flags, QString& tooltip);
private: private: