diff --git a/src/properties/peerlistwidget.cpp b/src/properties/peerlistwidget.cpp index a697de937..e1ca57a5a 100644 --- a/src/properties/peerlistwidget.cpp +++ b/src/properties/peerlistwidget.cpp @@ -385,7 +385,7 @@ QStandardItem* PeerListWidget::addPeer(const QString& ip, const peer_info& peer) 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; getFlags(peer, flags, tooltip); 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_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; getFlags(peer, flags, tooltip); 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; - switch(connection_type) { - case peer_info::bittorrent_utp: - connection = "uTP"; - break; + switch(peer.connection_type) { case peer_info::http_seed: case peer_info::web_seed: connection = "Web"; @@ -556,7 +561,11 @@ void PeerListWidget::getFlags(const peer_info& peer, QString& flags, QString& to } //P = Peer is using uTorrent uTP +#if LIBTORRENT_VERSION_NUM < 10000 if (peer.connection_type & peer_info::bittorrent_utp) { +#else + if (peer.flags & peer_info::utp_socket) { +#endif flags += "P "; tooltip += QString::fromUtf8("μTP"); tooltip += ", "; diff --git a/src/properties/peerlistwidget.h b/src/properties/peerlistwidget.h index 520da7bfa..1ac8e65c7 100644 --- a/src/properties/peerlistwidget.h +++ b/src/properties/peerlistwidget.h @@ -87,7 +87,7 @@ protected slots: void handleSortColumnChanged(int col); 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); private: