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

5
tests/src/collectionbackend_test.cpp
View File

@@ -36,6 +36,7 @@
#include "collection/collectionbackend.h"
#include "collection/collection.h"
using namespace Qt::StringLiterals;
using std::make_unique;
using std::make_shared;
@@ -158,7 +159,7 @@ class SingleSong : public CollectionBackendTest {
TEST_F(SingleSong, GetSongWithNoAlbum) {
song_.set_album(QLatin1String(""));
song_.set_album(""_L1);
AddDummySong();
if (HasFatalFailure()) return;
@@ -166,7 +167,7 @@ TEST_F(SingleSong, GetSongWithNoAlbum) {
CollectionBackend::AlbumList albums = backend_->GetAllAlbums();
EXPECT_EQ(1, albums.size());
EXPECT_EQ(QStringLiteral("Artist"), albums[0].album_artist);
EXPECT_EQ(QLatin1String(""), albums[0].album);
EXPECT_EQ(""_L1, albums[0].album);
}

5
tests/src/collectionmodel_test.cpp
View File

@@ -39,6 +39,7 @@
#include "collection/collectionmodel.h"
#include "collection/collectionfilter.h"
using namespace Qt::StringLiterals;
using std::make_unique;
using std::make_shared;
@@ -171,7 +172,7 @@ TEST_F(CollectionModelTest, MixedCaseHeaders) {
TEST_F(CollectionModelTest, UnknownArtists) {
AddSong(QStringLiteral("Title"), QLatin1String(""), QStringLiteral("Album"), 123);
AddSong(QStringLiteral("Title"), ""_L1, QStringLiteral("Album"), 123);
ASSERT_EQ(1, model_->rowCount(QModelIndex()));
QModelIndex unknown_index = model_->index(0, 0, QModelIndex());
@@ -184,7 +185,7 @@ TEST_F(CollectionModelTest, UnknownArtists) {
TEST_F(CollectionModelTest, UnknownAlbums) {
AddSong(QStringLiteral("Title"), QStringLiteral("Artist"), QLatin1String(""), 123);
AddSong(QStringLiteral("Title"), QStringLiteral("Artist"), ""_L1, 123);
AddSong(QStringLiteral("Title"), QStringLiteral("Artist"), QStringLiteral("Album"), 123);
QModelIndex artist_index = model_->index(1, 0, QModelIndex());

4
tests/src/organizeformat_test.cpp
View File

@@ -29,6 +29,8 @@
#include <QUrl>
using namespace Qt::StringLiterals;
// clazy:excludeall=returning-void-expression
class OrganizeFormatTest : public ::testing::Test {
@@ -148,7 +150,7 @@ TEST_F(OrganizeFormatTest, ReplaceNonAscii) {
format_.set_remove_non_ascii(true);
EXPECT_EQ(QStringLiteral("Royksopp"), format_.GetFilenameForSong(song_).filename);
song_.set_artist(QLatin1String(""));
song_.set_artist(""_L1);
EXPECT_EQ(QLatin1String(""), format_.GetFilenameForSong(song_).filename);
song_.set_artist(QStringLiteral("Владимир Высоцкий"));

4
tests/src/songplaylistitem_test.cpp
View File

@@ -54,8 +54,8 @@ class SongPlaylistItemTest : public ::testing::TestWithParam<const char*> {
item_ = make_unique<SongPlaylistItem>(song_);
if (!absolute_file_name_.startsWith(QLatin1Char('/')))
absolute_file_name_.prepend(QLatin1Char('/'));
if (!absolute_file_name_.startsWith(u'/'))
absolute_file_name_.prepend(u'/');
}
Song song_; // NOLINT(cppcoreguidelines-non-private-member-variables-in-classes)

2
tests/src/test_utils.cpp
View File

@@ -62,7 +62,7 @@ void PrintTo(const ::QUrl &url, std::ostream &os) {
TemporaryResource::TemporaryResource(const QString &filename, QObject *parent) : QTemporaryFile(parent) {
setFileTemplate(QDir::tempPath() + QStringLiteral("/strawberry_test-XXXXXX.") + filename.section(QLatin1Char('.'), -1, -1));
setFileTemplate(QDir::tempPath() + QStringLiteral("/strawberry_test-XXXXXX.") + filename.section(u'.', -1, -1));
open();
QFile resource(filename);

42
tests/src/utilities_test.cpp
View File

@@ -38,6 +38,8 @@
#include "core/logging.h"
#include "core/temporaryfile.h"
using namespace Qt::StringLiterals;
TEST(UtilitiesTest, PrettyTimeDelta) {
ASSERT_EQ(Utilities::PrettyTimeDelta(60), QStringLiteral("+1:00"));
@@ -158,7 +160,7 @@ TEST(UtilitiesTest, SetEnvGetEnv) {
Utilities::SetEnv(var.toUtf8().constData(), value);
ASSERT_EQ(Utilities::GetEnv(var), value);
Utilities::SetEnv(var.toUtf8().constData(), QLatin1String(""));
Utilities::SetEnv(var.toUtf8().constData(), ""_L1);
}
@@ -201,24 +203,24 @@ TEST(UtilitiesTest, ReplaceVariable) {
song.set_playcount(90);
song.set_rating(1.0);
ASSERT_EQ(Utilities::ReplaceVariable(QStringLiteral("%title%"), song, QLatin1String("")), song.title());
ASSERT_EQ(Utilities::ReplaceVariable(QStringLiteral("%album%"), song, QLatin1String("")), song.album());
ASSERT_EQ(Utilities::ReplaceVariable(QStringLiteral("%artist%"), song, QLatin1String("")), song.artist());
ASSERT_EQ(Utilities::ReplaceVariable(QStringLiteral("%albumartist%"), song, QLatin1String("")), song.effective_albumartist());
ASSERT_EQ(Utilities::ReplaceVariable(QStringLiteral("%track%"), song, QLatin1String("")), QString::number(song.track()));
ASSERT_EQ(Utilities::ReplaceVariable(QStringLiteral("%disc%"), song, QLatin1String("")), QString::number(song.disc()));
ASSERT_EQ(Utilities::ReplaceVariable(QStringLiteral("%year%"), song, QLatin1String("")), QString::number(song.year()));
ASSERT_EQ(Utilities::ReplaceVariable(QStringLiteral("%originalyear%"), song, QLatin1String("")), QString::number(song.originalyear()));
ASSERT_EQ(Utilities::ReplaceVariable(QStringLiteral("%genre%"), song, QLatin1String("")), song.genre());
ASSERT_EQ(Utilities::ReplaceVariable(QStringLiteral("%composer%"), song, QLatin1String("")), song.composer());
ASSERT_EQ(Utilities::ReplaceVariable(QStringLiteral("%performer%"), song, QLatin1String("")), song.performer());
ASSERT_EQ(Utilities::ReplaceVariable(QStringLiteral("%grouping%"), song, QLatin1String("")), song.grouping());
ASSERT_EQ(Utilities::ReplaceVariable(QStringLiteral("%length%"), song, QLatin1String("")), song.PrettyLength());
ASSERT_EQ(Utilities::ReplaceVariable(QStringLiteral("%filename%"), song, QLatin1String("")), song.basefilename());
ASSERT_EQ(Utilities::ReplaceVariable(QStringLiteral("%url%"), song, QLatin1String("")), song.url().toString());
ASSERT_EQ(Utilities::ReplaceVariable(QStringLiteral("%playcount%"), song, QLatin1String("")), QString::number(song.playcount()));
ASSERT_EQ(Utilities::ReplaceVariable(QStringLiteral("%skipcount%"), song, QLatin1String("")), QString::number(song.skipcount()));
ASSERT_EQ(Utilities::ReplaceVariable(QStringLiteral("%rating%"), song, QLatin1String("")), song.PrettyRating());
ASSERT_EQ(Utilities::ReplaceVariable(QStringLiteral("%title%"), song, ""_L1), song.title());
ASSERT_EQ(Utilities::ReplaceVariable(QStringLiteral("%album%"), song, ""_L1), song.album());
ASSERT_EQ(Utilities::ReplaceVariable(QStringLiteral("%artist%"), song, ""_L1), song.artist());
ASSERT_EQ(Utilities::ReplaceVariable(QStringLiteral("%albumartist%"), song, ""_L1), song.effective_albumartist());
ASSERT_EQ(Utilities::ReplaceVariable(QStringLiteral("%track%"), song, ""_L1), QString::number(song.track()));
ASSERT_EQ(Utilities::ReplaceVariable(QStringLiteral("%disc%"), song, ""_L1), QString::number(song.disc()));
ASSERT_EQ(Utilities::ReplaceVariable(QStringLiteral("%year%"), song, ""_L1), QString::number(song.year()));
ASSERT_EQ(Utilities::ReplaceVariable(QStringLiteral("%originalyear%"), song, ""_L1), QString::number(song.originalyear()));
ASSERT_EQ(Utilities::ReplaceVariable(QStringLiteral("%genre%"), song, ""_L1), song.genre());
ASSERT_EQ(Utilities::ReplaceVariable(QStringLiteral("%composer%"), song, ""_L1), song.composer());
ASSERT_EQ(Utilities::ReplaceVariable(QStringLiteral("%performer%"), song, ""_L1), song.performer());
ASSERT_EQ(Utilities::ReplaceVariable(QStringLiteral("%grouping%"), song, ""_L1), song.grouping());
ASSERT_EQ(Utilities::ReplaceVariable(QStringLiteral("%length%"), song, ""_L1), song.PrettyLength());
ASSERT_EQ(Utilities::ReplaceVariable(QStringLiteral("%filename%"), song, ""_L1), song.basefilename());
ASSERT_EQ(Utilities::ReplaceVariable(QStringLiteral("%url%"), song, ""_L1), song.url().toString());
ASSERT_EQ(Utilities::ReplaceVariable(QStringLiteral("%playcount%"), song, ""_L1), QString::number(song.playcount()));
ASSERT_EQ(Utilities::ReplaceVariable(QStringLiteral("%skipcount%"), song, ""_L1), QString::number(song.skipcount()));
ASSERT_EQ(Utilities::ReplaceVariable(QStringLiteral("%rating%"), song, ""_L1), song.PrettyRating());
}
@@ -243,7 +245,7 @@ TEST(UtilitiesTest, ReplaceMessage) {
song.set_playcount(90);
song.set_rating(1.0);
ASSERT_EQ(Utilities::ReplaceMessage(QStringLiteral("%title% - %artist%"), song, QLatin1String("")), song.title() + QStringLiteral(" - ") + song.artist());
ASSERT_EQ(Utilities::ReplaceMessage(QStringLiteral("%title% - %artist%"), song, ""_L1), song.title() + QStringLiteral(" - ") + song.artist());
}