From 267cd3660b5a063ba509b4a3d1080195f1aefe11 Mon Sep 17 00:00:00 2001 From: Jonas Kvinge Date: Tue, 9 Nov 2021 19:26:30 +0100 Subject: [PATCH] InternetSearchSortModel: Replace use of macro --- src/internet/internetsearchsortmodel.cpp | 21 +++++++-------------- 1 file changed, 7 insertions(+), 14 deletions(-) diff --git a/src/internet/internetsearchsortmodel.cpp b/src/internet/internetsearchsortmodel.cpp index 0fd5de785..7dd7bede0 100644 --- a/src/internet/internetsearchsortmodel.cpp +++ b/src/internet/internetsearchsortmodel.cpp @@ -55,23 +55,16 @@ bool InternetSearchSortModel::lessThan(const QModelIndex &left, const QModelInde const InternetSearchView::Result r1 = left.data(InternetSearchModel::Role_Result).value(); const InternetSearchView::Result r2 = right.data(InternetSearchModel::Role_Result).value(); -#define CompareInt(field) \ - if (r1.metadata_.field() < r2.metadata_.field()) return true; \ - if (r1.metadata_.field() > r2.metadata_.field()) return false + if (r1.metadata_.disc() < r2.metadata_.disc()) return true; + if (r1.metadata_.disc() > r2.metadata_.disc()) 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) \ - ret = QString::localeAwareCompare(r1.metadata_.field(), r2.metadata_.field()); \ - if (ret < 0) return true; \ - if (ret > 0) return false - - CompareInt(disc); - CompareInt(track); - CompareString(title); + int ret = QString::localeAwareCompare(r1.metadata_.title(), r2.metadata_.title()); + if (ret < 0) return true; + if (ret > 0) return false; return false; -#undef CompareInt -#undef CompareString }