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

10
src/smartplaylists/smartplaylistsearch.cpp
View File

@@ -62,7 +62,7 @@ QString SmartPlaylistSearch::ToSql(const QString &songs_table) const {
}
if (!terms_.isEmpty() && search_type_ != SearchType::All) {
QString boolean_op = search_type_ == SearchType::And ? " AND " : " OR ";
QString boolean_op = search_type_ == SearchType::And ? QStringLiteral(" AND ") : QStringLiteral(" OR ");
where_clauses << "(" + term_where_clauses.join(boolean_op) + ")";
}
@@ -77,15 +77,15 @@ QString SmartPlaylistSearch::ToSql(const QString &songs_table) const {
// We never want to include songs that have been deleted,
// but are still kept in the database in case the directory containing them has just been unmounted.
where_clauses << "unavailable = 0";
where_clauses << QStringLiteral("unavailable = 0");
if (!where_clauses.isEmpty()) {
sql += " WHERE " + where_clauses.join(" AND ");
sql += " WHERE " + where_clauses.join(QStringLiteral(" AND "));
}
// Add sort by
if (sort_type_ == SortType::Random) {
sql += " ORDER BY random()";
sql += QLatin1String(" ORDER BY random()");
}
else {
sql += " ORDER BY " + SmartPlaylistSearchTerm::FieldColumnName(sort_field_) + (sort_type_ == SortType::FieldAsc ? " ASC" : " DESC");
@@ -93,7 +93,7 @@ QString SmartPlaylistSearch::ToSql(const QString &songs_table) const {
// Add limit
if (first_item_ > 0) {
sql += QString(" LIMIT %1 OFFSET %2").arg(limit_).arg(first_item_);
sql += QStringLiteral(" LIMIT %1 OFFSET %2").arg(limit_).arg(first_item_);
}
else if (limit_ != -1) {
sql += " LIMIT " + QString::number(limit_);

68
src/smartplaylists/smartplaylistsearchterm.cpp
View File

@@ -39,7 +39,7 @@ QString SmartPlaylistSearchTerm::ToSql() const {
QString col = FieldColumnName(field_);
QString date = DateName(datetype_, true);
QString value = value_.toString();
value.replace('\'', "''");
value.replace('\'', QLatin1String("''"));
if (field_ == Field::Filetype) {
Song::FileType filetype = Song::FiletypeByExtension(value);
@@ -64,10 +64,10 @@ QString SmartPlaylistSearchTerm::ToSql() const {
// We have a numeric date, consider also the time for more precision
col = "DATETIME(" + col + ", 'unixepoch', 'localtime')";
second_value = second_value_.toString();
second_value.replace('\'', "''");
second_value.replace('\'', QLatin1String("''"));
if (date == "weeks") {
// Sqlite doesn't know weeks, transform them to days
date = "days";
date = QStringLiteral("days");
value = QString::number(value_.toInt() * 7);
second_value = QString::number(second_value_.toInt() * 7);
}
@@ -302,57 +302,57 @@ QString SmartPlaylistSearchTerm::FieldColumnName(const Field field) {
switch (field) {
case Field::AlbumArtist:
return "albumartist";
return QStringLiteral("albumartist");
case Field::Artist:
return "artist";
return QStringLiteral("artist");
case Field::Album:
return "album";
return QStringLiteral("album");
case Field::Title:
return "title";
return QStringLiteral("title");
case Field::Track:
return "track";
return QStringLiteral("track");
case Field::Disc:
return "disc";
return QStringLiteral("disc");
case Field::Year:
return "year";
return QStringLiteral("year");
case Field::OriginalYear:
return "originalyear";
return QStringLiteral("originalyear");
case Field::Genre:
return "genre";
return QStringLiteral("genre");
case Field::Composer:
return "composer";
return QStringLiteral("composer");
case Field::Performer:
return "performer";
return QStringLiteral("performer");
case Field::Grouping:
return "grouping";
return QStringLiteral("grouping");
case Field::Comment:
return "comment";
return QStringLiteral("comment");
case Field::Length:
return "length";
return QStringLiteral("length");
case Field::Filepath:
return "url";
return QStringLiteral("url");
case Field::Filetype:
return "filetype";
return QStringLiteral("filetype");
case Field::Filesize:
return "filesize";
return QStringLiteral("filesize");
case Field::DateCreated:
return "ctime";
return QStringLiteral("ctime");
case Field::DateModified:
return "mtime";
return QStringLiteral("mtime");
case Field::PlayCount:
return "playcount";
return QStringLiteral("playcount");
case Field::SkipCount:
return "skipcount";
return QStringLiteral("skipcount");
case Field::LastPlayed:
return "lastplayed";
return QStringLiteral("lastplayed");
case Field::Rating:
return "rating";
return QStringLiteral("rating");
case Field::Samplerate:
return "samplerate";
return QStringLiteral("samplerate");
case Field::Bitdepth:
return "bitdepth";
return QStringLiteral("bitdepth");
case Field::Bitrate:
return "bitrate";
return QStringLiteral("bitrate");
case Field::FieldCount:
Q_ASSERT(0);
}
@@ -446,15 +446,15 @@ QString SmartPlaylistSearchTerm::DateName(const DateType datetype, const bool fo
// If forQuery is true, untranslated keywords are returned
switch (datetype) {
case DateType::Hour:
return (forQuery ? "hours" : QObject::tr("Hours"));
return (forQuery ? QStringLiteral("hours") : QObject::tr("Hours"));
case DateType::Day:
return (forQuery ? "days" : QObject::tr("Days"));
return (forQuery ? QStringLiteral("days") : QObject::tr("Days"));
case DateType::Week:
return (forQuery ? "weeks" : QObject::tr("Weeks"));
return (forQuery ? QStringLiteral("weeks") : QObject::tr("Weeks"));
case DateType::Month:
return (forQuery ? "months" : QObject::tr("Months"));
return (forQuery ? QStringLiteral("months") : QObject::tr("Months"));
case DateType::Year:
return (forQuery ? "years" : QObject::tr("Years"));
return (forQuery ? QStringLiteral("years") : QObject::tr("Years"));
}
return QString();

18
src/smartplaylists/smartplaylistsearchtermwidget.cpp
View File

@@ -122,18 +122,18 @@ SmartPlaylistSearchTermWidget::SmartPlaylistSearchTermWidget(SharedPtr<Collectio
}
// Icons on the buttons
ui_->remove->setIcon(IconLoader::Load("list-remove"));
ui_->remove->setIcon(IconLoader::Load(QStringLiteral("list-remove")));
// Set stylesheet
QFile stylesheet_file(":/style/smartplaylistsearchterm.css");
QFile stylesheet_file(QStringLiteral(":/style/smartplaylistsearchterm.css"));
if (stylesheet_file.open(QIODevice::ReadOnly)) {
QString stylesheet = QString::fromLatin1(stylesheet_file.readAll());
stylesheet_file.close();
const QColor base(222, 97, 97, 128);
stylesheet.replace("%light2", Utilities::ColorToRgba(base.lighter(140)));
stylesheet.replace("%light", Utilities::ColorToRgba(base.lighter(120)));
stylesheet.replace("%dark", Utilities::ColorToRgba(base.darker(120)));
stylesheet.replace("%base", Utilities::ColorToRgba(base));
stylesheet.replace(QLatin1String("%light2"), Utilities::ColorToRgba(base.lighter(140)));
stylesheet.replace(QLatin1String("%light"), Utilities::ColorToRgba(base.lighter(120)));
stylesheet.replace(QLatin1String("%dark"), Utilities::ColorToRgba(base.darker(120)));
stylesheet.replace(QLatin1String("%base"), Utilities::ColorToRgba(base));
setStyleSheet(stylesheet);
}
@@ -326,7 +326,7 @@ void SmartPlaylistSearchTermWidget::SetTerm(const SmartPlaylistSearchTerm &term)
switch (SmartPlaylistSearchTerm::TypeOf(term.field_)) {
case SmartPlaylistSearchTerm::Type::Text:
if (ui_->value_stack->currentWidget() == ui_->page_empty) {
ui_->value_text->setText("");
ui_->value_text->setText(QLatin1String(""));
}
else {
ui_->value_text->setText(term.value_.toString());
@@ -418,7 +418,7 @@ void SmartPlaylistSearchTermWidget::RelativeValueChanged() {
}
// Explain the user why he can't proceed
if (ui_->value_date_numeric1->value() >= ui_->value_date_numeric2->value()) {
QMessageBox::warning(this, "Strawberry", tr("The second value must be greater than the first one!"));
QMessageBox::warning(this, QStringLiteral("Strawberry"), tr("The second value must be greater than the first one!"));
}
// Emit the signal in any case, so the Next button will be disabled
emit Changed();
@@ -430,7 +430,7 @@ SmartPlaylistSearchTermWidget::Overlay::Overlay(SmartPlaylistSearchTermWidget *p
parent_(parent),
opacity_(0.0),
text_(tr("Add search term")),
icon_(IconLoader::Load("list-add").pixmap(kIconSize)) {
icon_(IconLoader::Load(QStringLiteral("list-add")).pixmap(kIconSize)) {
raise();
setFocusPolicy(Qt::TabFocus);

4
src/smartplaylists/smartplaylistsmodel.cpp
View File

@@ -48,7 +48,7 @@ const int SmartPlaylistsModel::kSmartPlaylistsVersion = 1;
SmartPlaylistsModel::SmartPlaylistsModel(SharedPtr<CollectionBackend> collection_backend, QObject *parent)
: SimpleTreeModel<SmartPlaylistsItem>(new SmartPlaylistsItem(this), parent),
collection_backend_(collection_backend),
icon_(IconLoader::Load("view-media-playlist")) {
icon_(IconLoader::Load(QStringLiteral("view-media-playlist"))) {
root_->lazy_loaded = true;
@@ -289,7 +289,7 @@ QVariant SmartPlaylistsModel::data(const QModelIndex &idx, const int role) const
}
QStringList SmartPlaylistsModel::mimeTypes() const {
return QStringList() << "text/uri-list";
return QStringList() << QStringLiteral("text/uri-list");
}
QMimeData *SmartPlaylistsModel::mimeData(const QModelIndexList &indexes) const {

20
src/smartplaylists/smartplaylistsviewcontainer.cpp
View File

@@ -60,27 +60,27 @@ SmartPlaylistsViewContainer::SmartPlaylistsViewContainer(Application *app, QWidg
model_->Init();
action_new_smart_playlist_ = context_menu_->addAction(IconLoader::Load("document-new"), tr("New smart playlist..."), this, &SmartPlaylistsViewContainer::NewSmartPlaylist);
action_new_smart_playlist_ = context_menu_->addAction(IconLoader::Load(QStringLiteral("document-new")), tr("New smart playlist..."), this, &SmartPlaylistsViewContainer::NewSmartPlaylist);
action_append_to_playlist_ = context_menu_selected_->addAction(IconLoader::Load("media-playback-start"), tr("Append to current playlist"), this, &SmartPlaylistsViewContainer::AppendToPlaylist);
action_replace_current_playlist_ = context_menu_selected_->addAction(IconLoader::Load("media-playback-start"), tr("Replace current playlist"), this, &SmartPlaylistsViewContainer::ReplaceCurrentPlaylist);
action_open_in_new_playlist_ = context_menu_selected_->addAction(IconLoader::Load("document-new"), tr("Open in new playlist"), this, &SmartPlaylistsViewContainer::OpenInNewPlaylist);
action_append_to_playlist_ = context_menu_selected_->addAction(IconLoader::Load(QStringLiteral("media-playback-start")), tr("Append to current playlist"), this, &SmartPlaylistsViewContainer::AppendToPlaylist);
action_replace_current_playlist_ = context_menu_selected_->addAction(IconLoader::Load(QStringLiteral("media-playback-start")), tr("Replace current playlist"), this, &SmartPlaylistsViewContainer::ReplaceCurrentPlaylist);
action_open_in_new_playlist_ = context_menu_selected_->addAction(IconLoader::Load(QStringLiteral("document-new")), tr("Open in new playlist"), this, &SmartPlaylistsViewContainer::OpenInNewPlaylist);
context_menu_selected_->addSeparator();
action_add_to_playlist_enqueue_ = context_menu_selected_->addAction(IconLoader::Load("go-next"), tr("Queue track"), this, &SmartPlaylistsViewContainer::AddToPlaylistEnqueue);
action_add_to_playlist_enqueue_next_ = context_menu_selected_->addAction(IconLoader::Load("go-next"), tr("Play next"), this, &SmartPlaylistsViewContainer::AddToPlaylistEnqueueNext);
action_add_to_playlist_enqueue_ = context_menu_selected_->addAction(IconLoader::Load(QStringLiteral("go-next")), tr("Queue track"), this, &SmartPlaylistsViewContainer::AddToPlaylistEnqueue);
action_add_to_playlist_enqueue_next_ = context_menu_selected_->addAction(IconLoader::Load(QStringLiteral("go-next")), tr("Play next"), this, &SmartPlaylistsViewContainer::AddToPlaylistEnqueueNext);
context_menu_selected_->addSeparator();
context_menu_selected_->addSeparator();
context_menu_selected_->addActions(QList<QAction*>() << action_new_smart_playlist_);
action_edit_smart_playlist_ = context_menu_selected_->addAction(IconLoader::Load("edit-rename"), tr("Edit smart playlist..."), this, &SmartPlaylistsViewContainer::EditSmartPlaylistFromContext);
action_delete_smart_playlist_ = context_menu_selected_->addAction(IconLoader::Load("edit-delete"), tr("Delete smart playlist"), this, &SmartPlaylistsViewContainer::DeleteSmartPlaylistFromContext);
action_edit_smart_playlist_ = context_menu_selected_->addAction(IconLoader::Load(QStringLiteral("edit-rename")), tr("Edit smart playlist..."), this, &SmartPlaylistsViewContainer::EditSmartPlaylistFromContext);
action_delete_smart_playlist_ = context_menu_selected_->addAction(IconLoader::Load(QStringLiteral("edit-delete")), tr("Delete smart playlist"), this, &SmartPlaylistsViewContainer::DeleteSmartPlaylistFromContext);
context_menu_selected_->addSeparator();
ui_->new_->setDefaultAction(action_new_smart_playlist_);
ui_->edit_->setIcon(IconLoader::Load("edit-rename"));
ui_->delete_->setIcon(IconLoader::Load("edit-delete"));
ui_->edit_->setIcon(IconLoader::Load(QStringLiteral("edit-rename")));
ui_->delete_->setIcon(IconLoader::Load(QStringLiteral("edit-delete")));
QObject::connect(ui_->edit_, &QToolButton::clicked, this, &SmartPlaylistsViewContainer::EditSmartPlaylistFromButton);
QObject::connect(ui_->delete_, &QToolButton::clicked, this, &SmartPlaylistsViewContainer::DeleteSmartPlaylistFromButton);

4
src/smartplaylists/smartplaylistwizard.cpp
View File

@@ -68,7 +68,7 @@ SmartPlaylistWizard::SmartPlaylistWizard(Application *app, SharedPtr<CollectionB
finish_page_(new FinishPage(this)),
type_index_(-1) {
setWindowIcon(IconLoader::Load("strawberry"));
setWindowIcon(IconLoader::Load(QStringLiteral("strawberry")));
setWindowTitle(tr("Smart playlist"));
resize(788, 628);
@@ -86,7 +86,7 @@ SmartPlaylistWizard::SmartPlaylistWizard(Application *app, SharedPtr<CollectionB
// Type page
type_page_->setTitle(tr("Playlist type"));
type_page_->setSubTitle(tr("A smart playlist is a dynamic list of songs that come from your collection. There are different types of smart playlist that offer different ways of selecting songs."));
type_page_->setStyleSheet("QRadioButton { font-weight: bold; } QLabel { margin-bottom: 1em; margin-left: 24px; }");
type_page_->setStyleSheet(QStringLiteral("QRadioButton { font-weight: bold; } QLabel { margin-bottom: 1em; margin-left: 24px; }"));
addPage(type_page_);
// Finish page