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

CollectionModel: Replace qMax with std::max

Browse Source
This commit is contained in:
Jonas Kvinge
2023-03-25 18:31:21 +01:00
parent 18da55453f
commit 7b610d131c
1 changed files with 29 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

58
src/collection/collectionmodel.cpp
View File

@@ -341,10 +341,10 @@ QString CollectionModel::ContainerKey(const GroupBy group_by, const bool separat
key = PrettyDisc(song.disc()); key = PrettyDisc(song.disc());
break; break;
case GroupBy::Year: case GroupBy::Year:
key = QString::number(qMax(0, song.year())); key = QString::number(std::max(0, song.year()));
break; break;
case GroupBy::OriginalYear: case GroupBy::OriginalYear:
key = QString::number(qMax(0, song.effective_originalyear())); key = QString::number(std::max(0, song.effective_originalyear()));
break; break;
case GroupBy::Genre: case GroupBy::Genre:
key = TextOrUnknown(song.genre()); key = TextOrUnknown(song.genre());
@@ -362,13 +362,13 @@ QString CollectionModel::ContainerKey(const GroupBy group_by, const bool separat
key = song.TextForFiletype(); key = song.TextForFiletype();
break; break;
case GroupBy::Samplerate: case GroupBy::Samplerate:
key = QString::number(qMax(0, song.samplerate())); key = QString::number(std::max(0, song.samplerate()));
break; break;
case GroupBy::Bitdepth: case GroupBy::Bitdepth:
key = QString::number(qMax(0, song.bitdepth())); key = QString::number(std::max(0, song.bitdepth()));
break; break;
case GroupBy::Bitrate: case GroupBy::Bitrate:
key = QString::number(qMax(0, song.bitrate())); key = QString::number(std::max(0, song.bitrate()));
break; break;
case GroupBy::Format: case GroupBy::Format:
if (song.samplerate() <= 0) { if (song.samplerate() <= 0) {
@@ -1252,7 +1252,7 @@ CollectionItem *CollectionModel::ItemFromQuery(const GroupBy group_by, const boo
item->metadata.set_grouping(row.value(3).toString()); item->metadata.set_grouping(row.value(3).toString());
item->key.append(ContainerKey(group_by, separate_albums_by_grouping, item->metadata)); item->key.append(ContainerKey(group_by, separate_albums_by_grouping, item->metadata));
item->display_text = PrettyAlbumDisc(item->metadata.album(), item->metadata.disc()); item->display_text = PrettyAlbumDisc(item->metadata.album(), item->metadata.disc());
item->sort_text = item->metadata.album() + SortTextForNumber(qMax(0, item->metadata.disc())); item->sort_text = item->metadata.album() + SortTextForNumber(std::max(0, item->metadata.disc()));
break; break;
} }
case GroupBy::YearAlbum:{ case GroupBy::YearAlbum:{
@@ -1262,7 +1262,7 @@ CollectionItem *CollectionModel::ItemFromQuery(const GroupBy group_by, const boo
item->metadata.set_grouping(row.value(3).toString()); item->metadata.set_grouping(row.value(3).toString());
item->key.append(ContainerKey(group_by, separate_albums_by_grouping, item->metadata)); item->key.append(ContainerKey(group_by, separate_albums_by_grouping, item->metadata));
item->display_text = PrettyYearAlbum(item->metadata.year(), item->metadata.album()); item->display_text = PrettyYearAlbum(item->metadata.year(), item->metadata.album());
item->sort_text = SortTextForNumber(qMax(0, item->metadata.year())) + item->metadata.grouping() + item->metadata.album(); item->sort_text = SortTextForNumber(std::max(0, item->metadata.year())) + item->metadata.grouping() + item->metadata.album();
break; break;
} }
case GroupBy::YearAlbumDisc:{ case GroupBy::YearAlbumDisc:{
@@ -1273,7 +1273,7 @@ CollectionItem *CollectionModel::ItemFromQuery(const GroupBy group_by, const boo
item->metadata.set_grouping(row.value(4).toString()); item->metadata.set_grouping(row.value(4).toString());
item->key.append(ContainerKey(group_by, separate_albums_by_grouping, item->metadata)); item->key.append(ContainerKey(group_by, separate_albums_by_grouping, item->metadata));
item->display_text = PrettyYearAlbumDisc(item->metadata.year(), item->metadata.album(), item->metadata.disc()); item->display_text = PrettyYearAlbumDisc(item->metadata.year(), item->metadata.album(), item->metadata.disc());
item->sort_text = SortTextForNumber(qMax(0, item->metadata.year())) + item->metadata.album() + SortTextForNumber(qMax(0, item->metadata.disc())); item->sort_text = SortTextForNumber(std::max(0, item->metadata.year())) + item->metadata.album() + SortTextForNumber(std::max(0, item->metadata.disc()));
break; break;
} }
case GroupBy::OriginalYearAlbum:{ case GroupBy::OriginalYearAlbum:{
@@ -1284,7 +1284,7 @@ CollectionItem *CollectionModel::ItemFromQuery(const GroupBy group_by, const boo
item->metadata.set_grouping(row.value(4).toString()); item->metadata.set_grouping(row.value(4).toString());
item->key.append(ContainerKey(group_by, separate_albums_by_grouping, item->metadata)); item->key.append(ContainerKey(group_by, separate_albums_by_grouping, item->metadata));
item->display_text = PrettyYearAlbum(item->metadata.effective_originalyear(), item->metadata.album()); item->display_text = PrettyYearAlbum(item->metadata.effective_originalyear(), item->metadata.album());
item->sort_text = SortTextForNumber(qMax(0, item->metadata.effective_originalyear())) + item->metadata.grouping() + item->metadata.album(); item->sort_text = SortTextForNumber(std::max(0, item->metadata.effective_originalyear())) + item->metadata.grouping() + item->metadata.album();
break; break;
} }
case GroupBy::OriginalYearAlbumDisc:{ case GroupBy::OriginalYearAlbumDisc:{
@@ -1296,13 +1296,13 @@ CollectionItem *CollectionModel::ItemFromQuery(const GroupBy group_by, const boo
item->metadata.set_grouping(row.value(5).toString()); item->metadata.set_grouping(row.value(5).toString());
item->key.append(ContainerKey(group_by, separate_albums_by_grouping, item->metadata)); item->key.append(ContainerKey(group_by, separate_albums_by_grouping, item->metadata));
item->display_text = PrettyYearAlbumDisc(item->metadata.effective_originalyear(), item->metadata.album(), item->metadata.disc()); item->display_text = PrettyYearAlbumDisc(item->metadata.effective_originalyear(), item->metadata.album(), item->metadata.disc());
item->sort_text = SortTextForNumber(qMax(0, item->metadata.effective_originalyear())) + item->metadata.album() + SortTextForNumber(qMax(0, item->metadata.disc())); item->sort_text = SortTextForNumber(std::max(0, item->metadata.effective_originalyear())) + item->metadata.album() + SortTextForNumber(std::max(0, item->metadata.disc()));
break; break;
} }
case GroupBy::Disc:{ case GroupBy::Disc:{
item->metadata.set_disc(row.value(0).toInt()); item->metadata.set_disc(row.value(0).toInt());
item->key.append(ContainerKey(group_by, separate_albums_by_grouping, item->metadata)); item->key.append(ContainerKey(group_by, separate_albums_by_grouping, item->metadata));
const int disc = qMax(0, row.value(0).toInt()); const int disc = std::max(0, row.value(0).toInt());
item->display_text = PrettyDisc(disc); item->display_text = PrettyDisc(disc);
item->sort_text = SortTextForNumber(disc); item->sort_text = SortTextForNumber(disc);
break; break;
@@ -1310,7 +1310,7 @@ CollectionItem *CollectionModel::ItemFromQuery(const GroupBy group_by, const boo
case GroupBy::Year:{ case GroupBy::Year:{
item->metadata.set_year(row.value(0).toInt()); item->metadata.set_year(row.value(0).toInt());
item->key.append(ContainerKey(group_by, separate_albums_by_grouping, item->metadata)); item->key.append(ContainerKey(group_by, separate_albums_by_grouping, item->metadata));
const int year = qMax(0, item->metadata.year()); const int year = std::max(0, item->metadata.year());
item->display_text = QString::number(year); item->display_text = QString::number(year);
item->sort_text = SortTextForNumber(year) + " "; item->sort_text = SortTextForNumber(year) + " ";
break; break;
@@ -1318,7 +1318,7 @@ CollectionItem *CollectionModel::ItemFromQuery(const GroupBy group_by, const boo
case GroupBy::OriginalYear:{ case GroupBy::OriginalYear:{
item->metadata.set_originalyear(row.value(0).toInt()); item->metadata.set_originalyear(row.value(0).toInt());
item->key.append(ContainerKey(group_by, separate_albums_by_grouping, item->metadata)); item->key.append(ContainerKey(group_by, separate_albums_by_grouping, item->metadata));
const int year = qMax(0, item->metadata.originalyear()); const int year = std::max(0, item->metadata.originalyear());
item->display_text = QString::number(year); item->display_text = QString::number(year);
item->sort_text = SortTextForNumber(year) + " "; item->sort_text = SortTextForNumber(year) + " ";
break; break;
@@ -1371,7 +1371,7 @@ CollectionItem *CollectionModel::ItemFromQuery(const GroupBy group_by, const boo
case GroupBy::Samplerate:{ case GroupBy::Samplerate:{
item->metadata.set_samplerate(row.value(0).toInt()); item->metadata.set_samplerate(row.value(0).toInt());
item->key.append(ContainerKey(group_by, separate_albums_by_grouping, item->metadata)); item->key.append(ContainerKey(group_by, separate_albums_by_grouping, item->metadata));
const int samplerate = qMax(0, item->metadata.samplerate()); const int samplerate = std::max(0, item->metadata.samplerate());
item->display_text = QString::number(samplerate); item->display_text = QString::number(samplerate);
item->sort_text = SortTextForNumber(samplerate) + " "; item->sort_text = SortTextForNumber(samplerate) + " ";
break; break;
@@ -1379,7 +1379,7 @@ CollectionItem *CollectionModel::ItemFromQuery(const GroupBy group_by, const boo
case GroupBy::Bitdepth:{ case GroupBy::Bitdepth:{
item->metadata.set_bitdepth(row.value(0).toInt()); item->metadata.set_bitdepth(row.value(0).toInt());
item->key.append(ContainerKey(group_by, separate_albums_by_grouping, item->metadata)); item->key.append(ContainerKey(group_by, separate_albums_by_grouping, item->metadata));
const int bitdepth = qMax(0, item->metadata.bitdepth()); const int bitdepth = std::max(0, item->metadata.bitdepth());
item->display_text = QString::number(bitdepth); item->display_text = QString::number(bitdepth);
item->sort_text = SortTextForNumber(bitdepth) + " "; item->sort_text = SortTextForNumber(bitdepth) + " ";
break; break;
@@ -1387,7 +1387,7 @@ CollectionItem *CollectionModel::ItemFromQuery(const GroupBy group_by, const boo
case GroupBy::Bitrate:{ case GroupBy::Bitrate:{
item->metadata.set_bitrate(row.value(0).toInt()); item->metadata.set_bitrate(row.value(0).toInt());
item->key.append(ContainerKey(group_by, separate_albums_by_grouping, item->metadata)); item->key.append(ContainerKey(group_by, separate_albums_by_grouping, item->metadata));
const int bitrate = qMax(0, item->metadata.bitrate()); const int bitrate = std::max(0, item->metadata.bitrate());
item->display_text = QString::number(bitrate); item->display_text = QString::number(bitrate);
item->sort_text = SortTextForNumber(bitrate) + " "; item->sort_text = SortTextForNumber(bitrate) + " ";
break; break;
@@ -1451,7 +1451,7 @@ CollectionItem *CollectionModel::ItemFromSong(const GroupBy group_by, const bool
item->metadata.set_grouping(s.grouping()); item->metadata.set_grouping(s.grouping());
item->key.append(ContainerKey(group_by, separate_albums_by_grouping, s)); item->key.append(ContainerKey(group_by, separate_albums_by_grouping, s));
item->display_text = PrettyAlbumDisc(s.album(), s.disc()); item->display_text = PrettyAlbumDisc(s.album(), s.disc());
item->sort_text = s.album() + SortTextForNumber(qMax(0, s.disc())); item->sort_text = s.album() + SortTextForNumber(std::max(0, s.disc()));
break; break;
} }
case GroupBy::YearAlbum:{ case GroupBy::YearAlbum:{
@@ -1461,7 +1461,7 @@ CollectionItem *CollectionModel::ItemFromSong(const GroupBy group_by, const bool
item->metadata.set_grouping(s.grouping()); item->metadata.set_grouping(s.grouping());
item->key.append(ContainerKey(group_by, separate_albums_by_grouping, s)); item->key.append(ContainerKey(group_by, separate_albums_by_grouping, s));
item->display_text = PrettyYearAlbum(s.year(), s.album()); item->display_text = PrettyYearAlbum(s.year(), s.album());
item->sort_text = SortTextForNumber(qMax(0, s.year())) + s.grouping() + s.album(); item->sort_text = SortTextForNumber(std::max(0, s.year())) + s.grouping() + s.album();
break; break;
} }
case GroupBy::YearAlbumDisc:{ case GroupBy::YearAlbumDisc:{
@@ -1472,7 +1472,7 @@ CollectionItem *CollectionModel::ItemFromSong(const GroupBy group_by, const bool
item->metadata.set_grouping(s.grouping()); item->metadata.set_grouping(s.grouping());
item->key.append(ContainerKey(group_by, separate_albums_by_grouping, s)); item->key.append(ContainerKey(group_by, separate_albums_by_grouping, s));
item->display_text = PrettyYearAlbumDisc(s.year(), s.album(), s.disc()); item->display_text = PrettyYearAlbumDisc(s.year(), s.album(), s.disc());
item->sort_text = SortTextForNumber(qMax(0, s.year())) + s.album() + SortTextForNumber(qMax(0, s.disc())); item->sort_text = SortTextForNumber(std::max(0, s.year())) + s.album() + SortTextForNumber(std::max(0, s.disc()));
break; break;
} }
case GroupBy::OriginalYearAlbum:{ case GroupBy::OriginalYearAlbum:{
@@ -1483,7 +1483,7 @@ CollectionItem *CollectionModel::ItemFromSong(const GroupBy group_by, const bool
item->metadata.set_grouping(s.grouping()); item->metadata.set_grouping(s.grouping());
item->key.append(ContainerKey(group_by, separate_albums_by_grouping, s)); item->key.append(ContainerKey(group_by, separate_albums_by_grouping, s));
item->display_text = PrettyYearAlbum(s.effective_originalyear(), s.album()); item->display_text = PrettyYearAlbum(s.effective_originalyear(), s.album());
item->sort_text = SortTextForNumber(qMax(0, s.effective_originalyear())) + s.grouping() + s.album(); item->sort_text = SortTextForNumber(std::max(0, s.effective_originalyear())) + s.grouping() + s.album();
break; break;
} }
case GroupBy::OriginalYearAlbumDisc:{ case GroupBy::OriginalYearAlbumDisc:{
@@ -1495,13 +1495,13 @@ CollectionItem *CollectionModel::ItemFromSong(const GroupBy group_by, const bool
item->metadata.set_grouping(s.grouping()); item->metadata.set_grouping(s.grouping());
item->key.append(ContainerKey(group_by, separate_albums_by_grouping, s)); item->key.append(ContainerKey(group_by, separate_albums_by_grouping, s));
item->display_text = PrettyYearAlbumDisc(s.effective_originalyear(), s.album(), s.disc()); item->display_text = PrettyYearAlbumDisc(s.effective_originalyear(), s.album(), s.disc());
item->sort_text = SortTextForNumber(qMax(0, s.effective_originalyear())) + s.album() + SortTextForNumber(qMax(0, s.disc())); item->sort_text = SortTextForNumber(std::max(0, s.effective_originalyear())) + s.album() + SortTextForNumber(std::max(0, s.disc()));
break; break;
} }
case GroupBy::Disc:{ case GroupBy::Disc:{
item->metadata.set_disc(s.disc()); item->metadata.set_disc(s.disc());
item->key.append(ContainerKey(group_by, separate_albums_by_grouping, s)); item->key.append(ContainerKey(group_by, separate_albums_by_grouping, s));
const int disc = qMax(0, s.disc()); const int disc = std::max(0, s.disc());
item->display_text = PrettyDisc(disc); item->display_text = PrettyDisc(disc);
item->sort_text = SortTextForNumber(disc); item->sort_text = SortTextForNumber(disc);
break; break;
@@ -1509,7 +1509,7 @@ CollectionItem *CollectionModel::ItemFromSong(const GroupBy group_by, const bool
case GroupBy::Year:{ case GroupBy::Year:{
item->metadata.set_year(s.year()); item->metadata.set_year(s.year());
item->key.append(ContainerKey(group_by, separate_albums_by_grouping, s)); item->key.append(ContainerKey(group_by, separate_albums_by_grouping, s));
const int year = qMax(0, s.year()); const int year = std::max(0, s.year());
item->display_text = QString::number(year); item->display_text = QString::number(year);
item->sort_text = SortTextForNumber(year) + " "; item->sort_text = SortTextForNumber(year) + " ";
break; break;
@@ -1517,7 +1517,7 @@ CollectionItem *CollectionModel::ItemFromSong(const GroupBy group_by, const bool
case GroupBy::OriginalYear:{ case GroupBy::OriginalYear:{
item->metadata.set_originalyear(s.effective_originalyear()); item->metadata.set_originalyear(s.effective_originalyear());
item->key.append(ContainerKey(group_by, separate_albums_by_grouping, s)); item->key.append(ContainerKey(group_by, separate_albums_by_grouping, s));
const int year = qMax(0, s.effective_originalyear()); const int year = std::max(0, s.effective_originalyear());
item->display_text = QString::number(year); item->display_text = QString::number(year);
item->sort_text = SortTextForNumber(year) + " "; item->sort_text = SortTextForNumber(year) + " ";
break; break;
@@ -1570,7 +1570,7 @@ CollectionItem *CollectionModel::ItemFromSong(const GroupBy group_by, const bool
case GroupBy::Samplerate:{ case GroupBy::Samplerate:{
item->metadata.set_samplerate(s.samplerate()); item->metadata.set_samplerate(s.samplerate());
item->key.append(ContainerKey(group_by, separate_albums_by_grouping, s)); item->key.append(ContainerKey(group_by, separate_albums_by_grouping, s));
const int samplerate = qMax(0, s.samplerate()); const int samplerate = std::max(0, s.samplerate());
item->display_text = QString::number(samplerate); item->display_text = QString::number(samplerate);
item->sort_text = SortTextForNumber(samplerate) + " "; item->sort_text = SortTextForNumber(samplerate) + " ";
break; break;
@@ -1578,7 +1578,7 @@ CollectionItem *CollectionModel::ItemFromSong(const GroupBy group_by, const bool
case GroupBy::Bitdepth:{ case GroupBy::Bitdepth:{
item->metadata.set_bitdepth(s.bitdepth()); item->metadata.set_bitdepth(s.bitdepth());
item->key.append(ContainerKey(group_by, separate_albums_by_grouping, s)); item->key.append(ContainerKey(group_by, separate_albums_by_grouping, s));
const int bitdepth = qMax(0, s.bitdepth()); const int bitdepth = std::max(0, s.bitdepth());
item->display_text = QString::number(bitdepth); item->display_text = QString::number(bitdepth);
item->sort_text = SortTextForNumber(bitdepth) + " "; item->sort_text = SortTextForNumber(bitdepth) + " ";
break; break;
@@ -1586,7 +1586,7 @@ CollectionItem *CollectionModel::ItemFromSong(const GroupBy group_by, const bool
case GroupBy::Bitrate:{ case GroupBy::Bitrate:{
item->metadata.set_bitrate(s.bitrate()); item->metadata.set_bitrate(s.bitrate());
item->key.append(ContainerKey(group_by, separate_albums_by_grouping, s)); item->key.append(ContainerKey(group_by, separate_albums_by_grouping, s));
const int bitrate = qMax(0, s.bitrate()); const int bitrate = std::max(0, s.bitrate());
item->display_text = QString::number(bitrate); item->display_text = QString::number(bitrate);
item->sort_text = SortTextForNumber(bitrate) + " "; item->sort_text = SortTextForNumber(bitrate) + " ";
break; break;
@@ -1685,7 +1685,7 @@ QString CollectionModel::PrettyYearAlbumDisc(const int year, const QString &albu
QString CollectionModel::PrettyDisc(const int disc) { QString CollectionModel::PrettyDisc(const int disc) {
return "Disc " + QString::number(qMax(1, disc)); return "Disc " + QString::number(std::max(1, disc));
} }
@@ -1740,7 +1740,7 @@ QString CollectionModel::SortTextForBitrate(const int bitrate) {
QString CollectionModel::SortTextForSong(const Song &song) { QString CollectionModel::SortTextForSong(const Song &song) {
QString ret = QString::number(qMax(0, song.disc()) * 1000 + qMax(0, song.track())); QString ret = QString::number(std::max(0, song.disc()) * 1000 + std::max(0, song.track()));
ret.prepend(QString("0").repeated(6 - ret.length())); ret.prepend(QString("0").repeated(6 - ret.length()));
ret.append(song.url().toString()); ret.append(song.url().toString());
return ret; return ret;