d4708/qBittorrent
1
0
Fork 0
mirror of https://github.com/d47081/qBittorrent.git synced 2025-01-11 15:27:54 +00:00
Code Issues Projects Releases Wiki Activity

Update naturalSorting in the Peers tab.

Browse Source
This commit is contained in:
sledgehammer999 2013-09-10 18:19:13 +03:00
parent d09b0d5f72
commit 6e9ed4ead7
1 changed files with 12 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
src/properties/peerlistsortmodel.h
View File

@ -43,25 +43,19 @@ public:
protected: protected:
bool lessThan(const QModelIndex &left, const QModelIndex &right) const { bool lessThan(const QModelIndex &left, const QModelIndex &right) const {
if (sortColumn() == PeerListDelegate::IP) { if (sortColumn() == PeerListDelegate::IP || sortColumn() == PeerListDelegate::CLIENT) {
const QStringList ipLeft = sourceModel()->data(left).toString().split('.'); QVariant vL = sourceModel()->data(left);
const QStringList ipRight = sourceModel()->data(right).toString().split('.'); QVariant vR = sourceModel()->data(right);
if ((ipRight.size() & ipLeft.size()) != 4) // One row in model if (!(vL.isValid() && vR.isValid()))
return false; return QSortFilterProxyModel::lessThan(left, right);
Q_ASSERT(ipLeft.size() == 4); Q_ASSERT(vL.isValid());
Q_ASSERT(ipRight.size() == 4); Q_ASSERT(vR.isValid());
int i = 0; bool res = false;
while (i < 4) { if (misc::naturalSort(vL.toString(), vR.toString(), res))
int l = ipLeft.at(i).toInt(); return res;
int r = ipRight.at(i).toInt();
if (l < r) return QSortFilterProxyModel::lessThan(left, right);
return true;
else if (l > r)
return false;
++i;
}
return false;
} }
return QSortFilterProxyModel::lessThan(left, right); return QSortFilterProxyModel::lessThan(left, right);
} }