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

Use QStringLiteral

Browse Source
This commit is contained in:
Jonas Kvinge
2024-04-09 23:20:26 +02:00
parent 3cfffa5fbb
commit 58944993b8
233 changed files with 3885 additions and 3885 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/organize/organize.cpp
View File

@@ -393,6 +393,6 @@ void Organize::timerEvent(QTimerEvent *e) {
void Organize::LogLine(const QString &message) {
QString date(QDateTime::currentDateTime().toString(Qt::TextDate));
log_.append(QString("%1: %2").arg(date, message));
log_.append(QStringLiteral("%1: %2").arg(date, message));
}

48
src/organize/organizedialog.cpp
View File

@@ -91,35 +91,35 @@ OrganizeDialog::OrganizeDialog(SharedPtr<TaskManager> task_manager, SharedPtr<Co
setWindowFlags(windowFlags() | Qt::WindowMaximizeButtonHint);
QPushButton *button_save = ui_->button_box->addButton("Save settings", QDialogButtonBox::ApplyRole);
QPushButton *button_save = ui_->button_box->addButton(QStringLiteral("Save settings"), QDialogButtonBox::ApplyRole);
QObject::connect(button_save, &QPushButton::clicked, this, &OrganizeDialog::SaveSettings);
button_save->setIcon(IconLoader::Load("document-save"));
ui_->button_box->button(QDialogButtonBox::RestoreDefaults)->setIcon(IconLoader::Load("edit-undo"));
button_save->setIcon(IconLoader::Load(QStringLiteral("document-save")));
ui_->button_box->button(QDialogButtonBox::RestoreDefaults)->setIcon(IconLoader::Load(QStringLiteral("edit-undo")));
QObject::connect(ui_->button_box->button(QDialogButtonBox::RestoreDefaults), &QPushButton::clicked, this, &OrganizeDialog::RestoreDefaults);
ui_->aftercopying->setItemIcon(1, IconLoader::Load("edit-delete"));
ui_->aftercopying->setItemIcon(1, IconLoader::Load(QStringLiteral("edit-delete")));
// Valid tags
QMap<QString, QString> tags;
tags[tr("Title")] = "title";
tags[tr("Album")] = "album";
tags[tr("Artist")] = "artist";
tags[tr("Artist's initial")] = "artistinitial";
tags[tr("Album artist")] = "albumartist";
tags[tr("Composer")] = "composer";
tags[tr("Performer")] = "performer";
tags[tr("Grouping")] = "grouping";
tags[tr("Track")] = "track";
tags[tr("Disc")] = "disc";
tags[tr("Year")] = "year";
tags[tr("Original year")] = "originalyear";
tags[tr("Genre")] = "genre";
tags[tr("Comment")] = "comment";
tags[tr("Length")] = "length";
tags[tr("Bitrate", "Refers to bitrate in file organize dialog.")] = "bitrate";
tags[tr("Sample rate")] = "samplerate";
tags[tr("Bit depth")] = "bitdepth";
tags[tr("File extension")] = "extension";
tags[tr("Title")] = QStringLiteral("title");
tags[tr("Album")] = QStringLiteral("album");
tags[tr("Artist")] = QStringLiteral("artist");
tags[tr("Artist's initial")] = QStringLiteral("artistinitial");
tags[tr("Album artist")] = QStringLiteral("albumartist");
tags[tr("Composer")] = QStringLiteral("composer");
tags[tr("Performer")] = QStringLiteral("performer");
tags[tr("Grouping")] = QStringLiteral("grouping");
tags[tr("Track")] = QStringLiteral("track");
tags[tr("Disc")] = QStringLiteral("disc");
tags[tr("Year")] = QStringLiteral("year");
tags[tr("Original year")] = QStringLiteral("originalyear");
tags[tr("Genre")] = QStringLiteral("genre");
tags[tr("Comment")] = QStringLiteral("comment");
tags[tr("Length")] = QStringLiteral("length");
tags[tr("Bitrate", "Refers to bitrate in file organize dialog.")] = QStringLiteral("bitrate");
tags[tr("Sample rate")] = QStringLiteral("samplerate");
tags[tr("Bit depth")] = QStringLiteral("bitdepth");
tags[tr("File extension")] = QStringLiteral("extension");
// Naming scheme input field
new OrganizeFormat::SyntaxHighlighter(ui_->naming);
@@ -530,7 +530,7 @@ void OrganizeDialog::UpdatePreviews() {
if (has_local_destination) {
for (const Organize::NewSongInfo &song_info : new_songs_info_) {
QString filename = storage->LocalPath() + "/" + song_info.new_filename_;
QListWidgetItem *item = new QListWidgetItem(song_info.unique_filename_ ? IconLoader::Load("dialog-ok-apply") : IconLoader::Load("dialog-warning"), QDir::toNativeSeparators(filename), ui_->preview);
QListWidgetItem *item = new QListWidgetItem(song_info.unique_filename_ ? IconLoader::Load(QStringLiteral("dialog-ok-apply")) : IconLoader::Load(QStringLiteral("dialog-warning")), QDir::toNativeSeparators(filename), ui_->preview);
ui_->preview->addItem(item);
if (!song_info.unique_filename_) {
ok = false;

60
src/organize/organizeformat.cpp
View File

@@ -46,29 +46,29 @@
constexpr char OrganizeFormat::kBlockPattern[] = "\\{([^{}]+)\\}";
constexpr char OrganizeFormat::kTagPattern[] = "\\%([a-zA-Z]*)";
const QStringList OrganizeFormat::kKnownTags = QStringList() << "title"
<< "album"
<< "artist"
<< "artistinitial"
<< "albumartist"
<< "composer"
<< "track"
<< "disc"
<< "year"
<< "originalyear"
<< "genre"
<< "comment"
<< "length"
<< "bitrate"
<< "samplerate"
<< "bitdepth"
<< "extension"
<< "performer"
<< "grouping"
<< "lyrics";
const QStringList OrganizeFormat::kKnownTags = QStringList() << QStringLiteral("title")
<< QStringLiteral("album")
<< QStringLiteral("artist")
<< QStringLiteral("artistinitial")
<< QStringLiteral("albumartist")
<< QStringLiteral("composer")
<< QStringLiteral("track")
<< QStringLiteral("disc")
<< QStringLiteral("year")
<< QStringLiteral("originalyear")
<< QStringLiteral("genre")
<< QStringLiteral("comment")
<< QStringLiteral("length")
<< QStringLiteral("bitrate")
<< QStringLiteral("samplerate")
<< QStringLiteral("bitdepth")
<< QStringLiteral("extension")
<< QStringLiteral("performer")
<< QStringLiteral("grouping")
<< QStringLiteral("lyrics");
const QStringList OrganizeFormat::kUniqueTags = QStringList() << "title"
<< "track";
const QStringList OrganizeFormat::kUniqueTags = QStringList() << QStringLiteral("title")
<< QStringLiteral("track");
const QRgb OrganizeFormat::SyntaxHighlighter::kValidTagColorLight = qRgb(64, 64, 255);
const QRgb OrganizeFormat::SyntaxHighlighter::kInvalidTagColorLight = qRgb(255, 64, 64);
@@ -175,7 +175,7 @@ OrganizeFormat::GetFilenameForSongResult OrganizeFormat::GetFilenameForSong(cons
filepath.append(info.completeBaseName());
// Fix any parts of the path that start with dots.
QStringList parts_old = filepath.split("/");
QStringList parts_old = filepath.split(QStringLiteral("/"));
QStringList parts_new;
for (int i = 0; i < parts_old.count(); ++i) {
QString part = parts_old[i];
@@ -188,12 +188,12 @@ OrganizeFormat::GetFilenameForSongResult OrganizeFormat::GetFilenameForSong(cons
part = part.trimmed();
parts_new.append(part);
}
filepath = parts_new.join("/");
filepath = parts_new.join(QStringLiteral("/"));
if (replace_spaces_) filepath.replace(QRegularExpression("\\s"), "_");
if (replace_spaces_) filepath.replace(QRegularExpression(QStringLiteral("\\s")), QStringLiteral("_"));
if (!extension.isEmpty()) {
filepath.append(QString(".%1").arg(extension));
filepath.append(QStringLiteral(".%1").arg(extension));
}
return GetFilenameForSongResult(filepath, unique_filename);
@@ -211,7 +211,7 @@ QString OrganizeFormat::ParseBlock(QString block, const Song &song, bool *have_t
// Recursively parse the block
bool empty = false;
QString value = ParseBlock(re_match.captured(1), song, have_tagdata, &empty);
if (empty) value = "";
if (empty) value = QLatin1String("");
// Replace the block's value
block.replace(pos, re_match.capturedLength(), value);
@@ -306,15 +306,15 @@ QString OrganizeFormat::TagValue(const QString &tag, const Song &song) const {
else if (tag == "artistinitial") {
value = song.effective_albumartist().trimmed();
if (!value.isEmpty()) {
value.replace(QRegularExpression("^the\\s+", QRegularExpression::CaseInsensitiveOption), "");
value.replace(QRegularExpression(QStringLiteral("^the\\s+"), QRegularExpression::CaseInsensitiveOption), QLatin1String(""));
value = value[0].toUpper();
}
}
else if (tag == "albumartist") {
value = song.is_compilation() ? "Various Artists" : song.effective_albumartist();
value = song.is_compilation() ? QStringLiteral("Various Artists") : song.effective_albumartist();
}
if (value == "0" || value == "-1") value = "";
if (value == "0" || value == "-1") value = QLatin1String("");
// Prepend a 0 to single-digit track numbers
if (tag == "track" && value.length() == 1) value.prepend('0');