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

Replace QLatin1String with operator _L1

Browse Source
This commit is contained in:
Jonas Kvinge
2024-09-07 04:24:14 +02:00
parent e3e6a22172
commit 4270b12cd1
185 changed files with 2429 additions and 2139 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
src/collection/collectionmodel.cpp
View File

@@ -77,6 +77,7 @@
#include "settings/collectionsettingspage.h"
using namespace std::chrono_literals;
using namespace Qt::StringLiterals;
const int CollectionModel::kPrettyCoverSize = 32;
namespace {
@@ -119,7 +120,7 @@ CollectionModel::CollectionModel(SharedPtr<CollectionBackend> backend, Applicati
if (app_ && !sIconCache) {
sIconCache = new QNetworkDiskCache(this);
sIconCache->setCacheDirectory(QStandardPaths::writableLocation(QStandardPaths::CacheLocation) + QLatin1Char('/') + QLatin1String(kPixmapDiskCacheDir));
sIconCache->setCacheDirectory(QStandardPaths::writableLocation(QStandardPaths::CacheLocation) + u'/' + QLatin1String(kPixmapDiskCacheDir));
QObject::connect(app_, &Application::ClearPixmapDiskCache, this, &CollectionModel::ClearDiskCache);
}
@@ -585,7 +586,7 @@ void CollectionModel::AddSongsInternal(const SongList &songs) {
container_key = container->container_key;
}
else {
if (!container_key.isEmpty()) container_key.append(QLatin1Char('-'));
if (!container_key.isEmpty()) container_key.append(u'-');
container_key.append(ContainerKey(group_by, song, has_unique_album_identifier));
if (container_nodes_[i].contains(container_key)) {
container = container_nodes_[i][container_key];
@@ -758,7 +759,7 @@ void CollectionModel::CreateDividerItem(const QString &divider_key, const QStrin
CollectionItem *divider = new CollectionItem(CollectionItem::Type::Divider, root_);
divider->container_key = divider_key;
divider->display_text = display_text;
divider->sort_text = divider_key + QLatin1String(" ");
divider->sort_text = divider_key + " "_L1;
divider_nodes_[divider_key] = divider;
endInsertRows();
@@ -802,7 +803,7 @@ CollectionItem *CollectionModel::CreateCompilationArtistNode(CollectionItem *par
if (parent != root_ && !parent->container_key.isEmpty()) parent->compilation_artist_node_->container_key.append(parent->container_key);
parent->compilation_artist_node_->container_key.append(QLatin1String(kVariousArtists));
parent->compilation_artist_node_->display_text = QLatin1String(kVariousArtists);
parent->compilation_artist_node_->sort_text = QLatin1String(" various");
parent->compilation_artist_node_->sort_text = " various"_L1;
parent->compilation_artist_node_->container_level = parent->container_level + 1;
endInsertRows();
@@ -1056,14 +1057,14 @@ QString CollectionModel::TextOrUnknown(const QString &text) {
QString CollectionModel::PrettyYearAlbum(const int year, const QString &album) {
if (year <= 0) return TextOrUnknown(album);
return QString::number(year) + QLatin1String(" - ") + TextOrUnknown(album);
return QString::number(year) + " - "_L1 + TextOrUnknown(album);
}
QString CollectionModel::PrettyAlbumDisc(const QString &album, const int disc) {
if (disc <= 0 || Song::AlbumContainsDisc(album)) return TextOrUnknown(album);
return TextOrUnknown(album) + QLatin1String(" - (Disc ") + QString::number(disc) + QLatin1String(")");
return TextOrUnknown(album) + " - (Disc "_L1 + QString::number(disc) + ")"_L1;
}
@@ -1072,9 +1073,9 @@ QString CollectionModel::PrettyYearAlbumDisc(const int year, const QString &albu
QString str;
if (year <= 0) str = TextOrUnknown(album);
else str = QString::number(year) + QLatin1String(" - ") + TextOrUnknown(album);
else str = QString::number(year) + " - "_L1 + TextOrUnknown(album);
if (!Song::AlbumContainsDisc(album) && disc > 0) str += QLatin1String(" - (Disc ") + QString::number(disc) + QLatin1String(")");
if (!Song::AlbumContainsDisc(album) && disc > 0) str += " - (Disc "_L1 + QString::number(disc) + ")"_L1;
return str;
@@ -1082,7 +1083,7 @@ QString CollectionModel::PrettyYearAlbumDisc(const int year, const QString &albu
QString CollectionModel::PrettyDisc(const int disc) {
return QLatin1String("Disc ") + QString::number(std::max(1, disc));
return "Disc "_L1 + QString::number(std::max(1, disc));
}
@@ -1159,7 +1160,7 @@ QString CollectionModel::SortText(const GroupBy group_by, const int container_le
QString CollectionModel::SortText(QString text) {
if (text.isEmpty()) {
text = QLatin1String(" unknown");
text = " unknown"_L1;
}
else {
text = text.toLower();
@@ -1179,7 +1180,7 @@ QString CollectionModel::SortTextForArtist(QString artist, const bool skip_artic
for (const auto &i : Song::kArticles) {
if (artist.startsWith(i)) {
qint64 ilen = i.length();
artist = artist.right(artist.length() - ilen) + QLatin1String(", ") + i.left(ilen - 1);
artist = artist.right(artist.length() - ilen) + ", "_L1 + i.left(ilen - 1);
break;
}
}
@@ -1190,7 +1191,6 @@ QString CollectionModel::SortTextForArtist(QString artist, const bool skip_artic
}
QString CollectionModel::SortTextForNumber(const int number) {
return QStringLiteral("%1").arg(number, 4, 10, QLatin1Char('0'));
}
@@ -1318,7 +1318,7 @@ QString CollectionModel::ContainerKey(const GroupBy group_by, const Song &song,
// Make sure we distinguish albums by different artists if the parent group by is not including artist.
if (IsAlbumGroupBy(group_by) && !has_unique_album_identifier && !song.is_compilation() && !song.effective_albumartist().isEmpty()) {
key.prepend(QLatin1Char('-'));
key.prepend(u'-');
key.prepend(TextOrUnknown(song.effective_albumartist()));
has_unique_album_identifier = true;
}
@@ -1348,7 +1348,7 @@ QString CollectionModel::DividerKey(const GroupBy group_by, const Song &song, co
case GroupBy::FileType: {
QChar c = sort_text[0];
if (c.isDigit()) return QStringLiteral("0");
if (c == QLatin1Char(' ')) return QString();
if (c == u' ') return QString();
if (c.decompositionTag() != QChar::NoDecomposition) {
QString decomposition = c.decomposition();
return QChar(decomposition[0]);
@@ -1397,25 +1397,25 @@ QString CollectionModel::DividerDisplayText(const GroupBy group_by, const QStrin
case GroupBy::Genre:
case GroupBy::FileType:
case GroupBy::Format:
if (key == QLatin1String("0")) return QStringLiteral("0-9");
if (key == "0"_L1) return QStringLiteral("0-9");
return key.toUpper();
case GroupBy::YearAlbum:
case GroupBy::YearAlbumDisc:
case GroupBy::OriginalYearAlbum:
case GroupBy::OriginalYearAlbumDisc:
if (key == QLatin1String("0000")) return tr("Unknown");
if (key == "0000"_L1) return tr("Unknown");
return key.toUpper();
case GroupBy::Year:
case GroupBy::OriginalYear:
if (key == QLatin1String("0000")) return tr("Unknown");
if (key == "0000"_L1) return tr("Unknown");
return QString::number(key.toInt()); // To remove leading 0s
case GroupBy::Samplerate:
case GroupBy::Bitdepth:
case GroupBy::Bitrate:
if (key == QLatin1String("000")) return tr("Unknown");
if (key == "000"_L1) return tr("Unknown");
return QString::number(key.toInt()); // To remove leading 0s
case GroupBy::None: