github/qBittorrent
1
0
Fork 0
mirror of https://github.com/qbittorrent/qBittorrent synced 2025-08-19 12:59:56 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Merge pull request #8087 from sledgehammer999/fix_flag_sorting

Browse source 
Fix sorting of country flags column in Peers tab.
This commit is contained in:
sledgehammer999 2017-12-23 19:15:44 +02:00 • committed by GitHub
commit 0a35adbdba
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
5 changed files with 9 additions and 29 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/gui/categoryfilterproxymodel.cpp
View file

@ -54,8 +54,6 @@ bool CategoryFilterProxyModel::lessThan(const QModelIndex &left, const QModelInd
int result = Utils::String::naturalCompare(left.data().toString(), right.data().toString() int result = Utils::String::naturalCompare(left.data().toString(), right.data().toString()
, Qt::CaseInsensitive); , Qt::CaseInsensitive);
if (result != 0)
return (result < 0);
return (left < right); return (result < 0);
} }

6
src/gui/properties/peerlistsortmodel.h
View file

@ -53,17 +53,11 @@ protected:
const QString strL = left.data().toString(); const QString strL = left.data().toString();
const QString strR = right.data().toString(); const QString strR = right.data().toString();
const int result = Utils::String::naturalCompare(strL, strR, Qt::CaseInsensitive); const int result = Utils::String::naturalCompare(strL, strR, Qt::CaseInsensitive);
if (result != 0)
return (result < 0); return (result < 0);
return (left < right);
} }
break; break;
default: default:
if (left.data() != right.data())
return QSortFilterProxyModel::lessThan(left, right); return QSortFilterProxyModel::lessThan(left, right);
return (left < right);
}; };
} }
}; };

6
src/gui/search/searchsortmodel.cpp
View file

@ -113,17 +113,11 @@ bool SearchSortModel::lessThan(const QModelIndex &left, const QModelIndex &right
const QString strL = left.data().toString(); const QString strL = left.data().toString();
const QString strR = right.data().toString(); const QString strR = right.data().toString();
const int result = Utils::String::naturalCompare(strL, strR, Qt::CaseInsensitive); const int result = Utils::String::naturalCompare(strL, strR, Qt::CaseInsensitive);
if (result != 0)
return (result < 0); return (result < 0);
return (left < right);
} }
break; break;
default: default:
if (left.data() != right.data())
return base::lessThan(left, right); return base::lessThan(left, right);
return (left < right);
}; };
} }

3
src/gui/tagfilterproxymodel.cpp
View file

@ -54,8 +54,5 @@ bool TagFilterProxyModel::lessThan(const QModelIndex &left, const QModelIndex &r
int result = Utils::String::naturalCompare(left.data().toString(), right.data().toString() int result = Utils::String::naturalCompare(left.data().toString(), right.data().toString()
, Qt::CaseInsensitive); , Qt::CaseInsensitive);
if (result != 0)
return (result < 0); return (result < 0);
return (left < right);
} }

3
src/gui/transferlistsortmodel.cpp
View file

@ -95,10 +95,7 @@ bool TransferListSortModel::lessThan(const QModelIndex &left, const QModelIndex
return lowerPositionThan(left, right); return lowerPositionThan(left, right);
const int result = Utils::String::naturalCompare(vL.toString(), vR.toString(), Qt::CaseInsensitive); const int result = Utils::String::naturalCompare(vL.toString(), vR.toString(), Qt::CaseInsensitive);
if (result != 0)
return (result < 0); return (result < 0);
return (left < right);
} }
case TorrentModel::TR_ADD_DATE: case TorrentModel::TR_ADD_DATE: