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

Port to QStringLiteral operator

Browse Source
This commit is contained in:
Jonas Kvinge
2024-10-20 06:38:55 +02:00
parent 722035913e
commit ef9ef63f02
202 changed files with 2036 additions and 1889 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/smartplaylists/smartplaylistsearch.cpp
View File

@@ -65,7 +65,7 @@ QString SmartPlaylistSearch::ToSql(const QString &songs_table) const {
if (!terms_.isEmpty() && search_type_ != SearchType::All) {
QString boolean_op = search_type_ == SearchType::And ? " AND "_L1 : " OR "_L1;
where_clauses << QStringLiteral("(") + term_where_clauses.join(boolean_op) + QStringLiteral(")");
where_clauses << u"("_s + term_where_clauses.join(boolean_op) + u")"_s;
}
// Restrict the IDs of songs if we're making a dynamic playlist
@@ -74,12 +74,12 @@ QString SmartPlaylistSearch::ToSql(const QString &songs_table) const {
for (int id : id_not_in_) {
numbers += (numbers.isEmpty() ? ""_L1 : ","_L1) + QString::number(id);
}
where_clauses << QStringLiteral("(ROWID NOT IN (") + numbers + QStringLiteral("))");
where_clauses << u"(ROWID NOT IN ("_s + numbers + u"))"_s;
}
// 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 << QStringLiteral("unavailable = 0");
where_clauses << u"unavailable = 0"_s;
if (!where_clauses.isEmpty()) {
sql += " WHERE "_L1 + where_clauses.join(" AND "_L1);

62
src/smartplaylists/smartplaylistsearchterm.cpp
View File

@@ -304,57 +304,57 @@ QString SmartPlaylistSearchTerm::FieldColumnName(const Field field) {
switch (field) {
case Field::AlbumArtist:
return QStringLiteral("albumartist");
return u"albumartist"_s;
case Field::Artist:
return QStringLiteral("artist");
return u"artist"_s;
case Field::Album:
return QStringLiteral("album");
return u"album"_s;
case Field::Title:
return QStringLiteral("title");
return u"title"_s;
case Field::Track:
return QStringLiteral("track");
return u"track"_s;
case Field::Disc:
return QStringLiteral("disc");
return u"disc"_s;
case Field::Year:
return QStringLiteral("year");
return u"year"_s;
case Field::OriginalYear:
return QStringLiteral("originalyear");
return u"originalyear"_s;
case Field::Genre:
return QStringLiteral("genre");
return u"genre"_s;
case Field::Composer:
return QStringLiteral("composer");
return u"composer"_s;
case Field::Performer:
return QStringLiteral("performer");
return u"performer"_s;
case Field::Grouping:
return QStringLiteral("grouping");
return u"grouping"_s;
case Field::Comment:
return QStringLiteral("comment");
return u"comment"_s;
case Field::Length:
return QStringLiteral("length");
return u"length"_s;
case Field::Filepath:
return QStringLiteral("url");
return u"url"_s;
case Field::Filetype:
return QStringLiteral("filetype");
return u"filetype"_s;
case Field::Filesize:
return QStringLiteral("filesize");
return u"filesize"_s;
case Field::DateCreated:
return QStringLiteral("ctime");
return u"ctime"_s;
case Field::DateModified:
return QStringLiteral("mtime");
return u"mtime"_s;
case Field::PlayCount:
return QStringLiteral("playcount");
return u"playcount"_s;
case Field::SkipCount:
return QStringLiteral("skipcount");
return u"skipcount"_s;
case Field::LastPlayed:
return QStringLiteral("lastplayed");
return u"lastplayed"_s;
case Field::Rating:
return QStringLiteral("rating");
return u"rating"_s;
case Field::Samplerate:
return QStringLiteral("samplerate");
return u"samplerate"_s;
case Field::Bitdepth:
return QStringLiteral("bitdepth");
return u"bitdepth"_s;
case Field::Bitrate:
return QStringLiteral("bitrate");
return u"bitrate"_s;
case Field::FieldCount:
Q_ASSERT(0);
}
@@ -450,15 +450,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 ? QStringLiteral("hours") : QObject::tr("Hours"));
return (forQuery ? u"hours"_s : QObject::tr("Hours"));
case DateType::Day:
return (forQuery ? QStringLiteral("days") : QObject::tr("Days"));
return (forQuery ? u"days"_s : QObject::tr("Days"));
case DateType::Week:
return (forQuery ? QStringLiteral("weeks") : QObject::tr("Weeks"));
return (forQuery ? u"weeks"_s : QObject::tr("Weeks"));
case DateType::Month:
return (forQuery ? QStringLiteral("months") : QObject::tr("Months"));
return (forQuery ? u"months"_s : QObject::tr("Months"));
case DateType::Year:
return (forQuery ? QStringLiteral("years") : QObject::tr("Years"));
return (forQuery ? u"years"_s : QObject::tr("Years"));
}
return QString();

6
src/smartplaylists/smartplaylistsearchtermwidget.cpp
View File

@@ -91,10 +91,10 @@ SmartPlaylistSearchTermWidget::SmartPlaylistSearchTermWidget(SharedPtr<Collectio
}
// Icons on the buttons
ui_->remove->setIcon(IconLoader::Load(QStringLiteral("list-remove")));
ui_->remove->setIcon(IconLoader::Load(u"list-remove"_s));
// Set stylesheet
QFile stylesheet_file(QStringLiteral(":/style/smartplaylistsearchterm.css"));
QFile stylesheet_file(u":/style/smartplaylistsearchterm.css"_s);
if (stylesheet_file.open(QIODevice::ReadOnly)) {
QString stylesheet = QString::fromLatin1(stylesheet_file.readAll());
stylesheet_file.close();
@@ -389,7 +389,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, QStringLiteral("Strawberry"), tr("The second value must be greater than the first one!"));
QMessageBox::warning(this, u"Strawberry"_s, tr("The second value must be greater than the first one!"));
}
// Emit the signal in any case, so the Next button will be disabled
Q_EMIT Changed();

4
src/smartplaylists/smartplaylistsearchtermwidgetoverlay.cpp
View File

@@ -31,6 +31,8 @@
#include "smartplaylistsearchtermwidget.h"
#include "smartplaylistsearchtermwidgetoverlay.h"
using namespace Qt::Literals::StringLiterals;
const int SmartPlaylistSearchTermWidgetOverlay::kSpacing = 6;
const int SmartPlaylistSearchTermWidgetOverlay::kIconSize = 22;
@@ -42,7 +44,7 @@ SmartPlaylistSearchTermWidgetOverlay::SmartPlaylistSearchTermWidgetOverlay(Smart
parent_(parent),
opacity_(0.0),
text_(tr("Add search term")),
icon_(IconLoader::Load(QStringLiteral("list-add")).pixmap(kIconSize)) {
icon_(IconLoader::Load(u"list-add"_s).pixmap(kIconSize)) {
raise();
setFocusPolicy(Qt::TabFocus);

10
src/smartplaylists/smartplaylistsmodel.cpp
View File

@@ -44,6 +44,8 @@
#include "playlistgeneratormimedata.h"
#include "playlistquerygenerator.h"
using namespace Qt::Literals::StringLiterals;
const char *SmartPlaylistsModel::kSettingsGroup = "SerializedSmartPlaylists";
const char *SmartPlaylistsModel::kSmartPlaylistsMimeType = "application/x-strawberry-smart-playlist-generator";
const int SmartPlaylistsModel::kSmartPlaylistsVersion = 1;
@@ -51,7 +53,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(QStringLiteral("view-media-playlist"))) {}
icon_(IconLoader::Load(u"view-media-playlist"_s)) {}
SmartPlaylistsModel::~SmartPlaylistsModel() { delete root_; }
@@ -117,7 +119,7 @@ void SmartPlaylistsModel::Init() {
Settings s;
s.beginGroup(kSettingsGroup);
int version = s.value(collection_backend_->songs_table() + QStringLiteral("_version"), 0).toInt();
int version = s.value(collection_backend_->songs_table() + u"_version"_s, 0).toInt();
// How many defaults do we have to write?
int unwritten_defaults = 0;
@@ -142,7 +144,7 @@ void SmartPlaylistsModel::Init() {
s.endArray();
}
s.setValue(collection_backend_->songs_table() + QStringLiteral("_version"), version);
s.setValue(collection_backend_->songs_table() + u"_version"_s, version);
const int count = s.beginReadArray(collection_backend_->songs_table());
for (int i = 0; i < count; ++i) {
@@ -289,7 +291,7 @@ QVariant SmartPlaylistsModel::data(const QModelIndex &idx, const int role) const
}
QStringList SmartPlaylistsModel::mimeTypes() const {
return QStringList() << QStringLiteral("text/uri-list");
return QStringList() << u"text/uri-list"_s;
}
QMimeData *SmartPlaylistsModel::mimeData(const QModelIndexList &indexes) const {

24
src/smartplaylists/smartplaylistsviewcontainer.cpp
View File

@@ -28,17 +28,17 @@
#include "core/iconloader.h"
#include "core/mimedata.h"
#include "core/settings.h"
#include "collection/collectionbackend.h"
#include "settings/appearancesettingspage.h"
#include "smartplaylistsviewcontainer.h"
#include "smartplaylistsmodel.h"
#include "smartplaylistsview.h"
#include "smartplaylistwizard.h"
#include "playlistgenerator_fwd.h"
#include "ui_smartplaylistsviewcontainer.h"
using namespace Qt::Literals::StringLiterals;
SmartPlaylistsViewContainer::SmartPlaylistsViewContainer(Application *app, QWidget *parent)
: QWidget(parent),
ui_(new Ui_SmartPlaylistsViewContainer),
@@ -61,27 +61,27 @@ SmartPlaylistsViewContainer::SmartPlaylistsViewContainer(Application *app, QWidg
model_->Init();
action_new_smart_playlist_ = context_menu_->addAction(IconLoader::Load(QStringLiteral("document-new")), tr("New smart playlist..."), this, &SmartPlaylistsViewContainer::NewSmartPlaylist);
action_new_smart_playlist_ = context_menu_->addAction(IconLoader::Load(u"document-new"_s), tr("New smart playlist..."), this, &SmartPlaylistsViewContainer::NewSmartPlaylist);
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);
action_append_to_playlist_ = context_menu_selected_->addAction(IconLoader::Load(u"media-playback-start"_s), tr("Append to current playlist"), this, &SmartPlaylistsViewContainer::AppendToPlaylist);
action_replace_current_playlist_ = context_menu_selected_->addAction(IconLoader::Load(u"media-playback-start"_s), tr("Replace current playlist"), this, &SmartPlaylistsViewContainer::ReplaceCurrentPlaylist);
action_open_in_new_playlist_ = context_menu_selected_->addAction(IconLoader::Load(u"document-new"_s), tr("Open in new playlist"), this, &SmartPlaylistsViewContainer::OpenInNewPlaylist);
context_menu_selected_->addSeparator();
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);
action_add_to_playlist_enqueue_ = context_menu_selected_->addAction(IconLoader::Load(u"go-next"_s), tr("Queue track"), this, &SmartPlaylistsViewContainer::AddToPlaylistEnqueue);
action_add_to_playlist_enqueue_next_ = context_menu_selected_->addAction(IconLoader::Load(u"go-next"_s), 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(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);
action_edit_smart_playlist_ = context_menu_selected_->addAction(IconLoader::Load(u"edit-rename"_s), tr("Edit smart playlist..."), this, &SmartPlaylistsViewContainer::EditSmartPlaylistFromContext);
action_delete_smart_playlist_ = context_menu_selected_->addAction(IconLoader::Load(u"edit-delete"_s), tr("Delete smart playlist"), this, &SmartPlaylistsViewContainer::DeleteSmartPlaylistFromContext);
context_menu_selected_->addSeparator();
ui_->new_->setDefaultAction(action_new_smart_playlist_);
ui_->edit_->setIcon(IconLoader::Load(QStringLiteral("edit-rename")));
ui_->delete_->setIcon(IconLoader::Load(QStringLiteral("edit-delete")));
ui_->edit_->setIcon(IconLoader::Load(u"edit-rename"_s));
ui_->delete_->setIcon(IconLoader::Load(u"edit-delete"_s));
QObject::connect(ui_->edit_, &QToolButton::clicked, this, &SmartPlaylistsViewContainer::EditSmartPlaylistFromButton);
QObject::connect(ui_->delete_, &QToolButton::clicked, this, &SmartPlaylistsViewContainer::DeleteSmartPlaylistFromButton);

10
src/smartplaylists/smartplaylistwizard.cpp
View File

@@ -38,6 +38,8 @@
#include "smartplaylistwizardfinishpage.h"
#include "ui_smartplaylistwizardfinishpage.h"
using namespace Qt::Literals::StringLiterals;
SmartPlaylistWizard::SmartPlaylistWizard(Application *app, SharedPtr<CollectionBackend> collection_backend, QWidget *parent)
: QWizard(parent),
app_(app),
@@ -46,7 +48,7 @@ SmartPlaylistWizard::SmartPlaylistWizard(Application *app, SharedPtr<CollectionB
finish_page_(new SmartPlaylistWizardFinishPage(this)),
type_index_(-1) {
setWindowIcon(IconLoader::Load(QStringLiteral("strawberry")));
setWindowIcon(IconLoader::Load(u"strawberry"_s));
setWindowTitle(tr("Smart playlist"));
resize(788, 628);
@@ -56,7 +58,7 @@ SmartPlaylistWizard::SmartPlaylistWizard(Application *app, SharedPtr<CollectionB
setWizardStyle(QWizard::ClassicStyle);
#endif
#ifdef Q_OS_WIN32
if (QApplication::style() && QApplication::style()->objectName() == QStringLiteral("fusion")) {
if (QApplication::style() && QApplication::style()->objectName() == u"fusion"_s) {
setWizardStyle(QWizard::ClassicStyle);
}
#endif
@@ -64,7 +66,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(QStringLiteral("QRadioButton { font-weight: bold; } QLabel { margin-bottom: 1em; margin-left: 24px; }"));
type_page_->setStyleSheet(u"QRadioButton { font-weight: bold; } QLabel { margin-bottom: 1em; margin-left: 24px; }"_s);
addPage(type_page_);
// Finish page
@@ -102,7 +104,7 @@ void SmartPlaylistWizard::SetGenerator(PlaylistGeneratorPtr gen) {
// Set the name
if (!gen->name().isEmpty()) {
setWindowTitle(windowTitle() + QStringLiteral(" - ") + gen->name());
setWindowTitle(windowTitle() + u" - "_s + gen->name());
}
finish_page_->ui_->name->setText(gen->name());
finish_page_->ui_->dynamic->setChecked(gen->is_dynamic());