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

Provide a proper default return statement for the function

Browse Source
This commit is contained in:
Chocobo1 2020-05-16 21:40:46 +08:00
parent 21e1c33d15
commit 328eb5b5cc
No known key found for this signature in database
GPG Key ID: 210D9C873253A68C
1 changed files with 15 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
src/gui/transferlistsortmodel.cpp
View File

@ -100,6 +100,14 @@ bool TransferListSortModel::lessThan_impl(const QModelIndex &left, const QModelI
return lessThan_impl(left.sibling(left.row(), column), right.sibling(right.row(), column)); return lessThan_impl(left.sibling(left.row(), column), right.sibling(right.row(), column));
}; };
const auto hashLessThan = [this, &left, &right]() -> bool
{
const TransferListModel *model = qobject_cast<TransferListModel *>(sourceModel());
const QString hashL = model->torrentHandle(left)->hash();
const QString hashR = model->torrentHandle(right)->hash();
return hashL < hashR;
};
const int sortColumn = left.column(); const int sortColumn = left.column();
const QVariant leftValue = left.data(TransferListModel::UnderlyingDataRole); const QVariant leftValue = left.data(TransferListModel::UnderlyingDataRole);
const QVariant rightValue = right.data(TransferListModel::UnderlyingDataRole); const QVariant rightValue = right.data(TransferListModel::UnderlyingDataRole);
@ -138,8 +146,9 @@ bool TransferListSortModel::lessThan_impl(const QModelIndex &left, const QModelI
else if (dateR.isValid()) { else if (dateR.isValid()) {
return false; return false;
} }
return hashLessThan();
} }
break;
case TransferListModel::TR_QUEUE_POSITION: { case TransferListModel::TR_QUEUE_POSITION: {
// QVariant has comparators for all basic types // QVariant has comparators for all basic types
@ -166,8 +175,9 @@ bool TransferListSortModel::lessThan_impl(const QModelIndex &left, const QModelI
else if (dateR.isValid()) { else if (dateR.isValid()) {
return true; return true;
} }
return hashLessThan();
} }
break;
case TransferListModel::TR_SEEDS: case TransferListModel::TR_SEEDS:
case TransferListModel::TR_PEERS: { case TransferListModel::TR_PEERS: {
@ -237,19 +247,11 @@ bool TransferListSortModel::lessThan_impl(const QModelIndex &left, const QModelI
if (rightValue < 0) return true; if (rightValue < 0) return true;
return (leftValue < rightValue); return (leftValue < rightValue);
default:
if (leftValue != rightValue)
return QSortFilterProxyModel::lessThan(left, right);
return invokeLessThanForColumn(TransferListModel::TR_QUEUE_POSITION);
} }
// Finally, sort by hash return (leftValue != rightValue)
const TransferListModel *model = qobject_cast<TransferListModel *>(sourceModel()); ? QSortFilterProxyModel::lessThan(left, right)
const QString hashL = model->torrentHandle(left)->hash(); : invokeLessThanForColumn(TransferListModel::TR_QUEUE_POSITION);
const QString hashR = model->torrentHandle(right)->hash();
return hashL < hashR;
} }
bool TransferListSortModel::filterAcceptsRow(const int sourceRow, const QModelIndex &sourceParent) const bool TransferListSortModel::filterAcceptsRow(const int sourceRow, const QModelIndex &sourceParent) const