From 1ebfa0ad7ea5c7dc64b171b435b560d8d37424a6 Mon Sep 17 00:00:00 2001 From: Jonas Kvinge Date: Fri, 13 Aug 2021 23:32:54 +0200 Subject: [PATCH] Song::kAlbumRemoveDisc is already QRegularExpression --- src/collection/collectionmodel.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/collection/collectionmodel.cpp b/src/collection/collectionmodel.cpp index c0c3d2c86..8adc1bd7f 100644 --- a/src/collection/collectionmodel.cpp +++ b/src/collection/collectionmodel.cpp @@ -1621,7 +1621,7 @@ QString CollectionModel::PrettyYearAlbum(const int year, const QString &album) { QString CollectionModel::PrettyAlbumDisc(const QString &album, const int disc) { - if (disc <= 0 || album.contains(QRegularExpression(Song::kAlbumRemoveDisc))) return TextOrUnknown(album); + if (disc <= 0 || album.contains(Song::kAlbumRemoveDisc)) return TextOrUnknown(album); else return TextOrUnknown(album) + " - (Disc " + QString::number(disc) + ")"; } @@ -1633,7 +1633,7 @@ QString CollectionModel::PrettyYearAlbumDisc(const int year, const QString &albu if (year <= 0) str = TextOrUnknown(album); else str = QString::number(year) + " - " + TextOrUnknown(album); - if (!album.contains(QRegularExpression(Song::kAlbumRemoveDisc)) && disc > 0) str += " - (Disc " + QString::number(disc) + ")"; + if (!album.contains(Song::kAlbumRemoveDisc) && disc > 0) str += " - (Disc " + QString::number(disc) + ")"; return str;