dryark/strawberry
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

InternetSearchSortModel: Replace use of macro

Browse Source
This commit is contained in:
Jonas Kvinge
2021-11-09 19:26:30 +01:00
parent bc1c0c3c6d
commit 267cd3660b
1 changed files with 7 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
src/internet/internetsearchsortmodel.cpp
View File

@@ -55,23 +55,16 @@ bool InternetSearchSortModel::lessThan(const QModelIndex &left, const QModelInde
const InternetSearchView::Result r1 = left.data(InternetSearchModel::Role_Result).value<InternetSearchView::Result>(); const InternetSearchView::Result r1 = left.data(InternetSearchModel::Role_Result).value<InternetSearchView::Result>();
const InternetSearchView::Result r2 = right.data(InternetSearchModel::Role_Result).value<InternetSearchView::Result>(); const InternetSearchView::Result r2 = right.data(InternetSearchModel::Role_Result).value<InternetSearchView::Result>();
#define CompareInt(field) \ if (r1.metadata_.disc() < r2.metadata_.disc()) return true;
if (r1.metadata_.field() < r2.metadata_.field()) return true; \ if (r1.metadata_.disc() > r2.metadata_.disc()) return false;
if (r1.metadata_.field() > r2.metadata_.field()) return false
int ret = 0; if (r1.metadata_.track() < r2.metadata_.track()) return true;
if (r1.metadata_.track() > r2.metadata_.track()) return false;
#define CompareString(field) \ int ret = QString::localeAwareCompare(r1.metadata_.title(), r2.metadata_.title());
ret = QString::localeAwareCompare(r1.metadata_.field(), r2.metadata_.field()); \ if (ret < 0) return true;
if (ret < 0) return true; \ if (ret > 0) return false;
if (ret > 0) return false
CompareInt(disc);
CompareInt(track);
CompareString(title);
return false; return false;
#undef CompareInt
#undef CompareString
} }