d4708/qBittorrent
1
0
Fork 0
mirror of https://github.com/d47081/qBittorrent.git synced 2025-01-23 21:14:33 +00:00
Code Issues Projects Releases Wiki Activity

Simplify sorting code.

Browse Source
This commit is contained in:
sledgehammer999 2017-12-21 15:26:28 +02:00
parent 5156399c68
commit 99abc21dab
No known key found for this signature in database
GPG Key ID: 6E4A2D025B7CC9A2
4 changed files with 6 additions and 20 deletions
Show Stats 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);
} }

12
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);
}; };
} }

5
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);
} }

5
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: