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

10
src/core/commandlineoptions.cpp
View File

@@ -46,6 +46,8 @@
#include <getopt.h>
using namespace Qt::Literals::StringLiterals;
namespace {
constexpr char kHelpText[] =
@@ -113,11 +115,11 @@ CommandlineOptions::CommandlineOptions(int argc, char **argv)
#ifdef Q_OS_MACOS
// Remove -psn_xxx option that Mac passes when opened from Finder.
RemoveArg(QStringLiteral("-psn"), 1);
RemoveArg(u"-psn"_s, 1);
#endif
// Remove the -session option that KDE passes
RemoveArg(QStringLiteral("-session"), 2);
RemoveArg(u"-session"_s, 2);
}
@@ -306,10 +308,10 @@ bool CommandlineOptions::Parse() {
volume_modifier_ = -4;
break;
case LongOptions::Quiet:
log_levels_ = QStringLiteral("1");
log_levels_ = u"1"_s;
break;
case LongOptions::Verbose:
log_levels_ = QStringLiteral("3");
log_levels_ = u"3"_s;
break;
case LongOptions::LogLevels:
log_levels_ = OptArgToString(optarg);

42
src/core/database.cpp
View File

@@ -129,12 +129,12 @@ QSqlDatabase Database::Connect() {
db = QSqlDatabase::database(connection_id);
}
else {
db = QSqlDatabase::addDatabase(QStringLiteral("QSQLITE"), connection_id);
db = QSqlDatabase::addDatabase(u"QSQLITE"_s, connection_id);
}
if (db.isOpen()) {
return db;
}
db.setConnectOptions(QStringLiteral("QSQLITE_BUSY_TIMEOUT=30000"));
db.setConnectOptions(u"QSQLITE_BUSY_TIMEOUT=30000"_s);
//qLog(Debug) << "Opened database with connection id" << connection_id;
if (injected_database_name_.isNull()) {
@@ -145,7 +145,7 @@ QSqlDatabase Database::Connect() {
}
if (!db.open()) {
app_->AddError(QStringLiteral("Database: ") + db.lastError().text());
app_->AddError(u"Database: "_s + db.lastError().text());
return db;
}
@@ -168,9 +168,9 @@ QSqlDatabase Database::Connect() {
// Attach the db
SqlQuery q(db);
q.prepare(QStringLiteral("ATTACH DATABASE :filename AS :alias"));
q.BindValue(QStringLiteral(":filename"), filename);
q.BindValue(QStringLiteral(":alias"), key);
q.prepare(u"ATTACH DATABASE :filename AS :alias"_s);
q.BindValue(u":filename"_s, filename);
q.BindValue(u":alias"_s, key);
if (!q.Exec()) {
qFatal("Couldn't attach external database '%s'", key.toLatin1().constData());
}
@@ -225,7 +225,7 @@ int Database::SchemaVersion(QSqlDatabase *db) {
int schema_version = 0;
{
SqlQuery q(*db);
q.prepare(QStringLiteral("SELECT version FROM schema_version"));
q.prepare(u"SELECT version FROM schema_version"_s);
if (q.Exec() && q.next()) {
schema_version = q.value(0).toInt();
}
@@ -266,8 +266,8 @@ void Database::RecreateAttachedDb(const QString &database_name) {
QSqlDatabase db(Connect());
SqlQuery q(db);
q.prepare(QStringLiteral("DETACH DATABASE :alias"));
q.BindValue(QStringLiteral(":alias"), database_name);
q.prepare(u"DETACH DATABASE :alias"_s);
q.BindValue(u":alias"_s, database_name);
if (!q.Exec()) {
qLog(Warning) << "Failed to detach database" << database_name;
return;
@@ -297,9 +297,9 @@ void Database::AttachDatabaseOnDbConnection(const QString &database_name, const
// Attach the db
SqlQuery q(db);
q.prepare(QStringLiteral("ATTACH DATABASE :filename AS :alias"));
q.BindValue(QStringLiteral(":filename"), database.filename_);
q.BindValue(QStringLiteral(":alias"), database_name);
q.prepare(u"ATTACH DATABASE :filename AS :alias"_s);
q.BindValue(u":filename"_s, database.filename_);
q.BindValue(u":alias"_s, database_name);
if (!q.Exec()) {
qFatal("Couldn't attach external database '%s'", database_name.toLatin1().constData());
}
@@ -313,8 +313,8 @@ void Database::DetachDatabase(const QString &database_name) {
QSqlDatabase db(Connect());
SqlQuery q(db);
q.prepare(QStringLiteral("DETACH DATABASE :alias"));
q.BindValue(QStringLiteral(":alias"), database_name);
q.prepare(u"DETACH DATABASE :alias"_s);
q.BindValue(u":alias"_s, database_name);
if (!q.Exec()) {
qLog(Warning) << "Failed to detach database" << database_name;
return;
@@ -329,7 +329,7 @@ void Database::UpdateDatabaseSchema(int version, QSqlDatabase &db) {
QString filename;
if (version == 0) {
filename = QStringLiteral(":/schema/schema.sql");
filename = u":/schema/schema.sql"_s;
}
else {
filename = QStringLiteral(":/schema/schema-%1.sql").arg(version);
@@ -360,8 +360,8 @@ void Database::UrlEncodeFilenameColumn(const QString &table, QSqlDatabase &db) {
const QUrl url = QUrl::fromLocalFile(filename);
update.BindValue(QStringLiteral(":filename"), url.toEncoded());
update.BindValue(QStringLiteral(":id"), rowid);
update.BindValue(u":filename"_s, url.toEncoded());
update.BindValue(u":id"_s, rowid);
if (!update.Exec()) {
ReportErrors(update);
}
@@ -389,7 +389,7 @@ void Database::ExecSchemaCommandsFromFile(QSqlDatabase &db, const QString &filen
void Database::ExecSchemaCommands(QSqlDatabase &db, const QString &schema, int schema_version, bool in_transaction) {
// Run each command
static const QRegularExpression regex_split_commands(QStringLiteral("; *\n\n"));
static const QRegularExpression regex_split_commands(u"; *\n\n"_s);
QStringList commands = schema.split(regex_split_commands);
// We don't want this list to reflect possible DB schema changes, so we initialize it before executing any statements.
@@ -471,7 +471,7 @@ QStringList Database::SongsTables(QSqlDatabase &db, const int schema_version) {
}
}
ret << QStringLiteral("playlist_items");
ret << u"playlist_items"_s;
return ret;
@@ -497,7 +497,7 @@ bool Database::IntegrityCheck(const QSqlDatabase &db) {
bool ok = false;
// Ask for 10 error messages at most.
SqlQuery q(db);
q.prepare(QStringLiteral("PRAGMA integrity_check(10)"));
q.prepare(u"PRAGMA integrity_check(10)"_s);
if (q.Exec()) {
bool error_reported = false;
while (q.next()) {
@@ -510,7 +510,7 @@ bool Database::IntegrityCheck(const QSqlDatabase &db) {
}
else {
if (!error_reported) { app_->AddError(tr("Database corruption detected.")); }
app_->AddError(QStringLiteral("Database: ") + message);
app_->AddError(u"Database: "_s + message);
error_reported = true;
}
}

8
src/core/iconloader.cpp
View File

@@ -36,6 +36,8 @@
#include "settings/appearancesettingspage.h"
#include "iconloader.h"
using namespace Qt::Literals::StringLiterals;
bool IconLoader::system_icons_ = false;
bool IconLoader::custom_icons_ = false;
@@ -49,7 +51,7 @@ void IconLoader::Init() {
#endif
QDir dir;
if (dir.exists(QStandardPaths::writableLocation(QStandardPaths::AppLocalDataLocation) + QStringLiteral("/icons"))) {
if (dir.exists(QStandardPaths::writableLocation(QStandardPaths::AppLocalDataLocation) + u"/icons"_s)) {
custom_icons_ = true;
}
@@ -123,7 +125,7 @@ QIcon IconLoader::Load(const QString &name, const bool system_icon, const int fi
}
if (custom_icons_) {
QString custom_icon_path = QStandardPaths::writableLocation(QStandardPaths::AppLocalDataLocation) + QStringLiteral("/icons/%1x%2/%3.png");
QString custom_icon_path = QStandardPaths::writableLocation(QStandardPaths::AppLocalDataLocation) + u"/icons/%1x%2/%3.png"_s;
for (int s : std::as_const(sizes)) {
QString filename(custom_icon_path.arg(s).arg(s).arg(name));
if (QFile::exists(filename)) ret.addFile(filename, QSize(s, s));
@@ -132,7 +134,7 @@ QIcon IconLoader::Load(const QString &name, const bool system_icon, const int fi
qLog(Warning) << "Couldn't load icon" << name << "from custom icons.";
}
const QString path(QStringLiteral(":/icons/%1x%2/%3.png"));
const QString path(u":/icons/%1x%2/%3.png"_s);
for (int s : std::as_const(sizes)) {
QString filename(path.arg(s).arg(s).arg(name));
if (QFile::exists(filename)) ret.addFile(filename, QSize(s, s));

10
src/core/localredirectserver.cpp
View File

@@ -57,10 +57,10 @@ bool LocalRedirectServer::Listen() {
return false;
}
url_.setScheme(QStringLiteral("http"));
url_.setHost(QStringLiteral("localhost"));
url_.setScheme(u"http"_s);
url_.setHost(u"localhost"_s);
url_.setPort(serverPort());
url_.setPath(QStringLiteral("/"));
url_.setPath(u"/"_s);
QObject::connect(this, &QTcpServer::newConnection, this, &LocalRedirectServer::NewConnection);
return true;
@@ -126,12 +126,12 @@ void LocalRedirectServer::ReadyRead() {
void LocalRedirectServer::WriteTemplate() const {
QFile page_file(QStringLiteral(":/html/oauthsuccess.html"));
QFile page_file(u":/html/oauthsuccess.html"_s);
if (!page_file.open(QIODevice::ReadOnly)) return;
QString page_data = QString::fromUtf8(page_file.readAll());
page_file.close();
static const QRegularExpression tr_regexp(QStringLiteral("tr\\(\"([^\"]+)\"\\)"));
static const QRegularExpression tr_regexp(u"tr\\(\"([^\"]+)\"\\)"_s);
qint64 offset = 0;
Q_FOREVER {
QRegularExpressionMatch re_match = tr_regexp.match(page_data, offset);

6
src/core/logging.cpp
View File

@@ -168,7 +168,7 @@ static void MessageHandler(QtMsgType type, const QMessageLogContext &message_log
const QStringList lines = message.split(u'\n');
for (const QString &line : lines) {
BufferedDebug d = CreateLogger<BufferedDebug>(level, QStringLiteral("unknown"), -1, nullptr);
BufferedDebug d = CreateLogger<BufferedDebug>(level, u"unknown"_s, -1, nullptr);
d << line.toLocal8Bit().constData();
if (d.buf_) {
d.buf_->close();
@@ -295,7 +295,7 @@ static T CreateLogger(Level level, const QString &class_name, int line, const ch
}
T ret(type);
ret.nospace() << QDateTime::currentDateTime().toString(QStringLiteral("hh:mm:ss.zzz")).toLatin1().constData() << level_name << function_line.leftJustified(32).toLatin1().constData();
ret.nospace() << QDateTime::currentDateTime().toString(u"hh:mm:ss.zzz"_s).toLatin1().constData() << level_name << function_line.leftJustified(32).toLatin1().constData();
return ret.space();
@@ -321,7 +321,7 @@ QString CXXDemangle(const QString &mangled_function) {
QString LinuxDemangle(const QString &symbol);
QString LinuxDemangle(const QString &symbol) {
static const QRegularExpression regex_symbol(QStringLiteral("\\(([^+]+)"));
static const QRegularExpression regex_symbol(u"\\(([^+]+)"_s);
QRegularExpressionMatch match = regex_symbol.match(symbol);
if (!match.hasMatch()) {
return symbol;

14
src/core/macsystemtrayicon.mm
View File

@@ -37,6 +37,8 @@
#include "song.h"
#include "iconloader.h"
using namespace Qt::Literals::StringLiterals;
@interface Target :NSObject {
QAction *action_;
}
@@ -70,7 +72,7 @@ class MacSystemTrayIconPrivate {
MacSystemTrayIconPrivate() {
dock_menu_ = [[NSMenu alloc] initWithTitle:@"DockMenu"];
QString title = QT_TR_NOOP(QStringLiteral("Now Playing"));
QString title = QT_TR_NOOP(u"Now Playing"_s);
NSString *t = [[NSString alloc] initWithUTF8String:title.toUtf8().constData()];
now_playing_ = [[NSMenuItem alloc] initWithTitle:t action:nullptr keyEquivalent:@""];
now_playing_artist_ = [[NSMenuItem alloc] initWithTitle:@"Nothing to see here" action:nullptr keyEquivalent:@""];
@@ -89,7 +91,7 @@ class MacSystemTrayIconPrivate {
void AddMenuItem(QAction *action) {
// Strip accelarators from name.
QString text = action->text().remove(QLatin1Char('&'));
QString text = action->text().remove(u'&');
NSString *title = [[NSString alloc] initWithUTF8String: text.toUtf8().constData()];
// Create an object that can receive user clicks and pass them on to the QAction.
Target *target = [[Target alloc] initWithQAction:action];
@@ -152,10 +154,10 @@ class MacSystemTrayIconPrivate {
SystemTrayIcon::SystemTrayIcon(QObject *parent)
: QObject(parent),
normal_icon_(QPixmap(QStringLiteral(":/pictures/strawberry.png")).scaled(128, 128, Qt::KeepAspectRatio, Qt::SmoothTransformation)),
grey_icon_(QPixmap(QStringLiteral(":/pictures/strawberry-grey.png")).scaled(128, 128, Qt::KeepAspectRatio, Qt::SmoothTransformation)),
playing_icon_(QStringLiteral(":/pictures/tiny-play.png")),
paused_icon_(QStringLiteral(":/pictures/tiny-pause.png")),
normal_icon_(QPixmap(u":/pictures/strawberry.png"_s).scaled(128, 128, Qt::KeepAspectRatio, Qt::SmoothTransformation)),
grey_icon_(QPixmap(u":/pictures/strawberry-grey.png"_s).scaled(128, 128, Qt::KeepAspectRatio, Qt::SmoothTransformation)),
playing_icon_(u":/pictures/tiny-play.png"_s),
paused_icon_(u":/pictures/tiny-pause.png"_s),
trayicon_progress_(false),
song_progress_(0) {

212
src/core/mainwindow.cpp
View File

@@ -364,7 +364,7 @@ MainWindow::MainWindow(Application *app, SharedPtr<SystemTrayIcon> tray_icon, OS
// Initialize the UI
ui_->setupUi(this);
setWindowIcon(IconLoader::Load(QStringLiteral("strawberry")));
setWindowIcon(IconLoader::Load(u"strawberry"_s));
album_cover_choice_controller_->Init(app);
@@ -376,32 +376,32 @@ MainWindow::MainWindow(Application *app, SharedPtr<SystemTrayIcon> tray_icon, OS
StyleHelper::setBaseColor(palette().color(QPalette::Highlight).darker());
// Add tabs to the fancy tab widget
ui_->tabs->AddTab(context_view_, QStringLiteral("context"), IconLoader::Load(QStringLiteral("strawberry"), true, 0, 32), tr("Context"));
ui_->tabs->AddTab(collection_view_, QStringLiteral("collection"), IconLoader::Load(QStringLiteral("library-music"), true, 0, 32), tr("Collection"));
ui_->tabs->AddTab(queue_view_, QStringLiteral("queue"), IconLoader::Load(QStringLiteral("footsteps"), true, 0, 32), tr("Queue"));
ui_->tabs->AddTab(playlist_list_, QStringLiteral("playlists"), IconLoader::Load(QStringLiteral("view-media-playlist"), true, 0, 32), tr("Playlists"));
ui_->tabs->AddTab(smartplaylists_view_, QStringLiteral("smartplaylists"), IconLoader::Load(QStringLiteral("view-media-playlist"), true, 0, 32), tr("Smart playlists"));
ui_->tabs->AddTab(file_view_, QStringLiteral("files"), IconLoader::Load(QStringLiteral("document-open"), true, 0, 32), tr("Files"));
ui_->tabs->AddTab(radio_view_, QStringLiteral("radios"), IconLoader::Load(QStringLiteral("radio"), true, 0, 32), tr("Radios"));
ui_->tabs->AddTab(context_view_, u"context"_s, IconLoader::Load(u"strawberry"_s, true, 0, 32), tr("Context"));
ui_->tabs->AddTab(collection_view_, u"collection"_s, IconLoader::Load(u"library-music"_s, true, 0, 32), tr("Collection"));
ui_->tabs->AddTab(queue_view_, u"queue"_s, IconLoader::Load(u"footsteps"_s, true, 0, 32), tr("Queue"));
ui_->tabs->AddTab(playlist_list_, u"playlists"_s, IconLoader::Load(u"view-media-playlist"_s, true, 0, 32), tr("Playlists"));
ui_->tabs->AddTab(smartplaylists_view_, u"smartplaylists"_s, IconLoader::Load(u"view-media-playlist"_s, true, 0, 32), tr("Smart playlists"));
ui_->tabs->AddTab(file_view_, u"files"_s, IconLoader::Load(u"document-open"_s, true, 0, 32), tr("Files"));
ui_->tabs->AddTab(radio_view_, u"radios"_s, IconLoader::Load(u"radio"_s, true, 0, 32), tr("Radios"));
#ifndef Q_OS_WIN
ui_->tabs->AddTab(device_view_, QStringLiteral("devices"), IconLoader::Load(QStringLiteral("device"), true, 0, 32), tr("Devices"));
ui_->tabs->AddTab(device_view_, u"devices"_s, IconLoader::Load(u"device"_s, true, 0, 32), tr("Devices"));
#endif
#ifdef HAVE_SUBSONIC
ui_->tabs->AddTab(subsonic_view_, QStringLiteral("subsonic"), IconLoader::Load(QStringLiteral("subsonic"), true, 0, 32), tr("Subsonic"));
ui_->tabs->AddTab(subsonic_view_, u"subsonic"_s, IconLoader::Load(u"subsonic"_s, true, 0, 32), tr("Subsonic"));
#endif
#ifdef HAVE_TIDAL
ui_->tabs->AddTab(tidal_view_, QStringLiteral("tidal"), IconLoader::Load(QStringLiteral("tidal"), true, 0, 32), tr("Tidal"));
ui_->tabs->AddTab(tidal_view_, u"tidal"_s, IconLoader::Load(u"tidal"_s, true, 0, 32), tr("Tidal"));
#endif
#ifdef HAVE_SPOTIFY
ui_->tabs->AddTab(spotify_view_, QStringLiteral("spotify"), IconLoader::Load(QStringLiteral("spotify"), true, 0, 32), tr("Spotify"));
ui_->tabs->AddTab(spotify_view_, u"spotify"_s, IconLoader::Load(u"spotify"_s, true, 0, 32), tr("Spotify"));
#endif
#ifdef HAVE_QOBUZ
ui_->tabs->AddTab(qobuz_view_, QStringLiteral("qobuz"), IconLoader::Load(QStringLiteral("qobuz"), true, 0, 32), tr("Qobuz"));
ui_->tabs->AddTab(qobuz_view_, u"qobuz"_s, IconLoader::Load(u"qobuz"_s, true, 0, 32), tr("Qobuz"));
#endif
// Add the playing widget to the fancy tab widget
ui_->tabs->AddBottomWidget(ui_->widget_playing);
ui_->tabs->SetBackgroundPixmap(QPixmap(QStringLiteral(":/pictures/sidebar-background.png")));
ui_->tabs->SetBackgroundPixmap(QPixmap(u":/pictures/sidebar-background.png"_s));
ui_->tabs->LoadSettings(QLatin1String(kSettingsGroup));
track_position_timer_->setInterval(kTrackPositionUpdateTimeMs);
@@ -441,59 +441,59 @@ MainWindow::MainWindow(Application *app, SharedPtr<SystemTrayIcon> tray_icon, OS
// Help menu
ui_->action_about_strawberry->setIcon(IconLoader::Load(QStringLiteral("strawberry")));
ui_->action_about_qt->setIcon(QIcon(QStringLiteral(":/qt-project.org/qmessagebox/images/qtlogo-64.png")));
ui_->action_about_strawberry->setIcon(IconLoader::Load(u"strawberry"_s));
ui_->action_about_qt->setIcon(QIcon(u":/qt-project.org/qmessagebox/images/qtlogo-64.png"_s));
// Music menu
ui_->action_open_file->setIcon(IconLoader::Load(QStringLiteral("document-open")));
ui_->action_open_cd->setIcon(IconLoader::Load(QStringLiteral("media-optical")));
ui_->action_previous_track->setIcon(IconLoader::Load(QStringLiteral("media-skip-backward")));
ui_->action_play_pause->setIcon(IconLoader::Load(QStringLiteral("media-playback-start")));
ui_->action_stop->setIcon(IconLoader::Load(QStringLiteral("media-playback-stop")));
ui_->action_stop_after_this_track->setIcon(IconLoader::Load(QStringLiteral("media-playback-stop")));
ui_->action_next_track->setIcon(IconLoader::Load(QStringLiteral("media-skip-forward")));
ui_->action_quit->setIcon(IconLoader::Load(QStringLiteral("application-exit")));
ui_->action_open_file->setIcon(IconLoader::Load(u"document-open"_s));
ui_->action_open_cd->setIcon(IconLoader::Load(u"media-optical"_s));
ui_->action_previous_track->setIcon(IconLoader::Load(u"media-skip-backward"_s));
ui_->action_play_pause->setIcon(IconLoader::Load(u"media-playback-start"_s));
ui_->action_stop->setIcon(IconLoader::Load(u"media-playback-stop"_s));
ui_->action_stop_after_this_track->setIcon(IconLoader::Load(u"media-playback-stop"_s));
ui_->action_next_track->setIcon(IconLoader::Load(u"media-skip-forward"_s));
ui_->action_quit->setIcon(IconLoader::Load(u"application-exit"_s));
// Playlist
ui_->action_add_file->setIcon(IconLoader::Load(QStringLiteral("document-open")));
ui_->action_add_folder->setIcon(IconLoader::Load(QStringLiteral("document-open-folder")));
ui_->action_add_stream->setIcon(IconLoader::Load(QStringLiteral("document-open-remote")));
ui_->action_shuffle_mode->setIcon(IconLoader::Load(QStringLiteral("media-playlist-shuffle")));
ui_->action_repeat_mode->setIcon(IconLoader::Load(QStringLiteral("media-playlist-repeat")));
ui_->action_new_playlist->setIcon(IconLoader::Load(QStringLiteral("document-new")));
ui_->action_save_playlist->setIcon(IconLoader::Load(QStringLiteral("document-save")));
ui_->action_load_playlist->setIcon(IconLoader::Load(QStringLiteral("document-open")));
ui_->action_jump->setIcon(IconLoader::Load(QStringLiteral("go-jump")));
ui_->action_clear_playlist->setIcon(IconLoader::Load(QStringLiteral("edit-clear-list")));
ui_->action_shuffle->setIcon(IconLoader::Load(QStringLiteral("media-playlist-shuffle")));
ui_->action_remove_duplicates->setIcon(IconLoader::Load(QStringLiteral("list-remove")));
ui_->action_remove_unavailable->setIcon(IconLoader::Load(QStringLiteral("list-remove")));
ui_->action_remove_from_playlist->setIcon(IconLoader::Load(QStringLiteral("list-remove")));
ui_->action_save_all_playlists->setIcon(IconLoader::Load(QStringLiteral("document-save-all")));
ui_->action_add_file->setIcon(IconLoader::Load(u"document-open"_s));
ui_->action_add_folder->setIcon(IconLoader::Load(u"document-open-folder"_s));
ui_->action_add_stream->setIcon(IconLoader::Load(u"document-open-remote"_s));
ui_->action_shuffle_mode->setIcon(IconLoader::Load(u"media-playlist-shuffle"_s));
ui_->action_repeat_mode->setIcon(IconLoader::Load(u"media-playlist-repeat"_s));
ui_->action_new_playlist->setIcon(IconLoader::Load(u"document-new"_s));
ui_->action_save_playlist->setIcon(IconLoader::Load(u"document-save"_s));
ui_->action_load_playlist->setIcon(IconLoader::Load(u"document-open"_s));
ui_->action_jump->setIcon(IconLoader::Load(u"go-jump"_s));
ui_->action_clear_playlist->setIcon(IconLoader::Load(u"edit-clear-list"_s));
ui_->action_shuffle->setIcon(IconLoader::Load(u"media-playlist-shuffle"_s));
ui_->action_remove_duplicates->setIcon(IconLoader::Load(u"list-remove"_s));
ui_->action_remove_unavailable->setIcon(IconLoader::Load(u"list-remove"_s));
ui_->action_remove_from_playlist->setIcon(IconLoader::Load(u"list-remove"_s));
ui_->action_save_all_playlists->setIcon(IconLoader::Load(u"document-save-all"_s));
// Configure
ui_->action_cover_manager->setIcon(IconLoader::Load(QStringLiteral("document-download")));
ui_->action_edit_track->setIcon(IconLoader::Load(QStringLiteral("edit-rename")));
ui_->action_edit_value->setIcon(IconLoader::Load(QStringLiteral("edit-rename")));
ui_->action_selection_set_value->setIcon(IconLoader::Load(QStringLiteral("edit-rename")));
ui_->action_equalizer->setIcon(IconLoader::Load(QStringLiteral("equalizer")));
ui_->action_transcoder->setIcon(IconLoader::Load(QStringLiteral("tools-wizard")));
ui_->action_update_collection->setIcon(IconLoader::Load(QStringLiteral("view-refresh")));
ui_->action_full_collection_scan->setIcon(IconLoader::Load(QStringLiteral("view-refresh")));
ui_->action_stop_collection_scan->setIcon(IconLoader::Load(QStringLiteral("dialog-error")));
ui_->action_settings->setIcon(IconLoader::Load(QStringLiteral("configure")));
ui_->action_import_data_from_last_fm->setIcon(IconLoader::Load(QStringLiteral("scrobble")));
ui_->action_console->setIcon(IconLoader::Load(QStringLiteral("keyboard")));
ui_->action_toggle_show_sidebar->setIcon(IconLoader::Load(QStringLiteral("view-choose")));
ui_->action_auto_complete_tags->setIcon(IconLoader::Load(QStringLiteral("musicbrainz")));
ui_->action_cover_manager->setIcon(IconLoader::Load(u"document-download"_s));
ui_->action_edit_track->setIcon(IconLoader::Load(u"edit-rename"_s));
ui_->action_edit_value->setIcon(IconLoader::Load(u"edit-rename"_s));
ui_->action_selection_set_value->setIcon(IconLoader::Load(u"edit-rename"_s));
ui_->action_equalizer->setIcon(IconLoader::Load(u"equalizer"_s));
ui_->action_transcoder->setIcon(IconLoader::Load(u"tools-wizard"_s));
ui_->action_update_collection->setIcon(IconLoader::Load(u"view-refresh"_s));
ui_->action_full_collection_scan->setIcon(IconLoader::Load(u"view-refresh"_s));
ui_->action_stop_collection_scan->setIcon(IconLoader::Load(u"dialog-error"_s));
ui_->action_settings->setIcon(IconLoader::Load(u"configure"_s));
ui_->action_import_data_from_last_fm->setIcon(IconLoader::Load(u"scrobble"_s));
ui_->action_console->setIcon(IconLoader::Load(u"keyboard"_s));
ui_->action_toggle_show_sidebar->setIcon(IconLoader::Load(u"view-choose"_s));
ui_->action_auto_complete_tags->setIcon(IconLoader::Load(u"musicbrainz"_s));
// Scrobble
ui_->action_toggle_scrobbling->setIcon(IconLoader::Load(QStringLiteral("scrobble-disabled")));
ui_->action_love->setIcon(IconLoader::Load(QStringLiteral("love")));
ui_->action_toggle_scrobbling->setIcon(IconLoader::Load(u"scrobble-disabled"_s));
ui_->action_love->setIcon(IconLoader::Load(u"love"_s));
// File view connections
QObject::connect(file_view_, &FileView::AddToPlaylist, this, &MainWindow::AddToPlaylist);
@@ -545,15 +545,15 @@ MainWindow::MainWindow(Application *app, SharedPtr<SystemTrayIcon> tray_icon, OS
QObject::connect(ui_->action_full_collection_scan, &QAction::triggered, &*app_->collection(), &SCollection::FullScan);
QObject::connect(ui_->action_stop_collection_scan, &QAction::triggered, &*app_->collection(), &SCollection::StopScan);
QObject::connect(ui_->action_add_files_to_transcoder, &QAction::triggered, this, &MainWindow::AddFilesToTranscoder);
ui_->action_add_files_to_transcoder->setIcon(IconLoader::Load(QStringLiteral("tools-wizard")));
ui_->action_add_files_to_transcoder->setIcon(IconLoader::Load(u"tools-wizard"_s));
QObject::connect(ui_->action_toggle_scrobbling, &QAction::triggered, &*app_->scrobbler(), &AudioScrobbler::ToggleScrobbling);
QObject::connect(ui_->action_love, &QAction::triggered, this, &MainWindow::Love);
QObject::connect(&*app_->scrobbler(), &AudioScrobbler::ErrorMessage, this, &MainWindow::ShowErrorDialog);
// Playlist view actions
ui_->action_next_playlist->setShortcuts(QList<QKeySequence>() << QKeySequence::fromString(QStringLiteral("Ctrl+Tab")) << QKeySequence::fromString(QStringLiteral("Ctrl+PgDown")));
ui_->action_previous_playlist->setShortcuts(QList<QKeySequence>() << QKeySequence::fromString(QStringLiteral("Ctrl+Shift+Tab")) << QKeySequence::fromString(QStringLiteral("Ctrl+PgUp")));
ui_->action_next_playlist->setShortcuts(QList<QKeySequence>() << QKeySequence::fromString(u"Ctrl+Tab"_s) << QKeySequence::fromString(u"Ctrl+PgDown"_s));
ui_->action_previous_playlist->setShortcuts(QList<QKeySequence>() << QKeySequence::fromString(u"Ctrl+Shift+Tab"_s) << QKeySequence::fromString(u"Ctrl+PgUp"_s));
// Actions for switching tabs will be global to the entire window, so adding them here
addAction(ui_->action_next_playlist);
@@ -673,7 +673,7 @@ MainWindow::MainWindow(Application *app, SharedPtr<SystemTrayIcon> tray_icon, OS
QObject::connect(collection_view_group, &QActionGroup::triggered, this, &MainWindow::ChangeCollectionFilterMode);
QAction *collection_config_action = new QAction(IconLoader::Load(QStringLiteral("configure")), tr("Configure collection..."), this);
QAction *collection_config_action = new QAction(IconLoader::Load(u"configure"_s), tr("Configure collection..."), this);
QObject::connect(collection_config_action, &QAction::triggered, this, &MainWindow::ShowCollectionConfig);
collection_view_->filter_widget()->SetSettingsGroup(QLatin1String(CollectionSettingsPage::kSettingsGroup));
collection_view_->filter_widget()->Init(app_->collection()->model(), app_->collection()->model()->filter());
@@ -723,14 +723,14 @@ MainWindow::MainWindow(Application *app, SharedPtr<SystemTrayIcon> tray_icon, OS
QObject::connect(playlist_menu_, &QMenu::aboutToHide, this, &MainWindow::PlaylistMenuHidden);
playlist_play_pause_ = playlist_menu_->addAction(tr("Play"), this, &MainWindow::PlaylistPlay);
playlist_menu_->addAction(ui_->action_stop);
playlist_stop_after_ = playlist_menu_->addAction(IconLoader::Load(QStringLiteral("media-playback-stop")), tr("Stop after this track"), this, &MainWindow::PlaylistStopAfter);
playlist_queue_ = playlist_menu_->addAction(IconLoader::Load(QStringLiteral("go-next")), tr("Toggle queue status"), this, &MainWindow::PlaylistQueue);
playlist_queue_->setShortcut(QKeySequence(QStringLiteral("Ctrl+D")));
playlist_stop_after_ = playlist_menu_->addAction(IconLoader::Load(u"media-playback-stop"_s), tr("Stop after this track"), this, &MainWindow::PlaylistStopAfter);
playlist_queue_ = playlist_menu_->addAction(IconLoader::Load(u"go-next"_s), tr("Toggle queue status"), this, &MainWindow::PlaylistQueue);
playlist_queue_->setShortcut(QKeySequence(u"Ctrl+D"_s));
ui_->playlist->addAction(playlist_queue_);
playlist_queue_play_next_ = playlist_menu_->addAction(IconLoader::Load(QStringLiteral("go-next")), tr("Queue selected tracks to play next"), this, &MainWindow::PlaylistQueuePlayNext);
playlist_queue_play_next_->setShortcut(QKeySequence(QStringLiteral("Ctrl+Shift+D")));
playlist_queue_play_next_ = playlist_menu_->addAction(IconLoader::Load(u"go-next"_s), tr("Queue selected tracks to play next"), this, &MainWindow::PlaylistQueuePlayNext);
playlist_queue_play_next_->setShortcut(QKeySequence(u"Ctrl+Shift+D"_s));
ui_->playlist->addAction(playlist_queue_play_next_);
playlist_skip_ = playlist_menu_->addAction(IconLoader::Load(QStringLiteral("media-skip-forward")), tr("Toggle skip status"), this, &MainWindow::PlaylistSkip);
playlist_skip_ = playlist_menu_->addAction(IconLoader::Load(u"media-skip-forward"_s), tr("Toggle skip status"), this, &MainWindow::PlaylistSkip);
ui_->playlist->addAction(playlist_skip_);
playlist_menu_->addSeparator();
@@ -743,20 +743,20 @@ MainWindow::MainWindow(Application *app, SharedPtr<SystemTrayIcon> tray_icon, OS
#ifdef HAVE_MUSICBRAINZ
playlist_menu_->addAction(ui_->action_auto_complete_tags);
#endif
playlist_rescan_songs_ = playlist_menu_->addAction(IconLoader::Load(QStringLiteral("view-refresh")), tr("Rescan song(s)..."), this, &MainWindow::RescanSongs);
playlist_rescan_songs_ = playlist_menu_->addAction(IconLoader::Load(u"view-refresh"_s), tr("Rescan song(s)..."), this, &MainWindow::RescanSongs);
playlist_menu_->addAction(playlist_rescan_songs_);
playlist_menu_->addAction(ui_->action_add_files_to_transcoder);
playlist_menu_->addSeparator();
playlist_copy_url_ = playlist_menu_->addAction(IconLoader::Load(QStringLiteral("edit-copy")), tr("Copy URL(s)..."), this, &MainWindow::PlaylistCopyUrl);
playlist_show_in_collection_ = playlist_menu_->addAction(IconLoader::Load(QStringLiteral("edit-find")), tr("Show in collection..."), this, &MainWindow::ShowInCollection);
playlist_open_in_browser_ = playlist_menu_->addAction(IconLoader::Load(QStringLiteral("document-open-folder")), tr("Show in file browser..."), this, &MainWindow::PlaylistOpenInBrowser);
playlist_organize_ = playlist_menu_->addAction(IconLoader::Load(QStringLiteral("edit-copy")), tr("Organize files..."), this, &MainWindow::PlaylistMoveToCollection);
playlist_copy_to_collection_ = playlist_menu_->addAction(IconLoader::Load(QStringLiteral("edit-copy")), tr("Copy to collection..."), this, &MainWindow::PlaylistCopyToCollection);
playlist_move_to_collection_ = playlist_menu_->addAction(IconLoader::Load(QStringLiteral("go-jump")), tr("Move to collection..."), this, &MainWindow::PlaylistMoveToCollection);
playlist_copy_url_ = playlist_menu_->addAction(IconLoader::Load(u"edit-copy"_s), tr("Copy URL(s)..."), this, &MainWindow::PlaylistCopyUrl);
playlist_show_in_collection_ = playlist_menu_->addAction(IconLoader::Load(u"edit-find"_s), tr("Show in collection..."), this, &MainWindow::ShowInCollection);
playlist_open_in_browser_ = playlist_menu_->addAction(IconLoader::Load(u"document-open-folder"_s), tr("Show in file browser..."), this, &MainWindow::PlaylistOpenInBrowser);
playlist_organize_ = playlist_menu_->addAction(IconLoader::Load(u"edit-copy"_s), tr("Organize files..."), this, &MainWindow::PlaylistMoveToCollection);
playlist_copy_to_collection_ = playlist_menu_->addAction(IconLoader::Load(u"edit-copy"_s), tr("Copy to collection..."), this, &MainWindow::PlaylistCopyToCollection);
playlist_move_to_collection_ = playlist_menu_->addAction(IconLoader::Load(u"go-jump"_s), tr("Move to collection..."), this, &MainWindow::PlaylistMoveToCollection);
#ifndef Q_OS_WIN
playlist_copy_to_device_ = playlist_menu_->addAction(IconLoader::Load(QStringLiteral("device")), tr("Copy to device..."), this, &MainWindow::PlaylistCopyToDevice);
playlist_copy_to_device_ = playlist_menu_->addAction(IconLoader::Load(u"device"_s), tr("Copy to device..."), this, &MainWindow::PlaylistCopyToDevice);
#endif
playlist_delete_ = playlist_menu_->addAction(IconLoader::Load(QStringLiteral("edit-delete")), tr("Delete from disk..."), this, &MainWindow::PlaylistDelete);
playlist_delete_ = playlist_menu_->addAction(IconLoader::Load(u"edit-delete"_s), tr("Delete from disk..."), this, &MainWindow::PlaylistDelete);
playlist_menu_->addSeparator();
playlistitem_actions_separator_ = playlist_menu_->addSeparator();
playlist_menu_->addAction(ui_->action_clear_playlist);
@@ -845,7 +845,7 @@ MainWindow::MainWindow(Application *app, SharedPtr<SystemTrayIcon> tray_icon, OS
QObject::connect(ui_->analyzer, &AnalyzerContainer::WheelEvent, this, &MainWindow::VolumeWheelEvent);
// Statusbar widgets
ui_->playlist_summary->setMinimumWidth(QFontMetrics(font()).horizontalAdvance(QStringLiteral("WW selected of WW tracks - [ WW:WW ]")));
ui_->playlist_summary->setMinimumWidth(QFontMetrics(font()).horizontalAdvance(u"WW selected of WW tracks - [ WW:WW ]"_s));
ui_->status_bar_stack->setCurrentWidget(ui_->playlist_summary_page);
QObject::connect(ui_->multi_loading_indicator, &MultiLoadingIndicator::TaskCountChange, this, &MainWindow::TaskCountChanged);
@@ -872,7 +872,7 @@ MainWindow::MainWindow(Application *app, SharedPtr<SystemTrayIcon> tray_icon, OS
PlayingWidgetPositionChanged(ui_->widget_playing->show_above_status_bar());
StyleSheetLoader *css_loader = new StyleSheetLoader(this);
css_loader->SetStyleSheet(this, QStringLiteral(":/style/strawberry.css"));
css_loader->SetStyleSheet(this, u":/style/strawberry.css"_s);
// Load playlists
app_->playlist_manager()->Init(app_->collection_backend(), app_->playlist_backend(), ui_->playlist_sequence, ui_->playlist);
@@ -991,7 +991,7 @@ MainWindow::MainWindow(Application *app, SharedPtr<SystemTrayIcon> tray_icon, OS
QObject::connect(close_window_shortcut, &QShortcut::activated, this, &MainWindow::ToggleHide);
QAction *action_focus_search = new QAction(this);
action_focus_search->setShortcuts(QList<QKeySequence>() << QKeySequence(QStringLiteral("Ctrl+F")));
action_focus_search->setShortcuts(QList<QKeySequence>() << QKeySequence(u"Ctrl+F"_s));
addAction(action_focus_search);
QObject::connect(action_focus_search, &QAction::triggered, this, &MainWindow::FocusSearchField);
@@ -1014,7 +1014,7 @@ MainWindow::MainWindow(Application *app, SharedPtr<SystemTrayIcon> tray_icon, OS
#endif
#ifdef Q_OS_LINUX
if (!Utilities::GetEnv(QStringLiteral("SNAP")).isEmpty() && !Utilities::GetEnv(QStringLiteral("SNAP_NAME")).isEmpty()) {
if (!Utilities::GetEnv(u"SNAP"_s).isEmpty() && !Utilities::GetEnv(u"SNAP_NAME"_s).isEmpty()) {
Settings s;
s.beginGroup(kSettingsGroup);
const bool ignore_snap = s.value("ignore_snap", false).toBool();
@@ -1036,9 +1036,9 @@ MainWindow::MainWindow(Application *app, SharedPtr<SystemTrayIcon> tray_icon, OS
if (!ignore_rosetta) {
MessageDialog *rosetta_message = new MessageDialog(this);
rosetta_message->set_settings_group(QLatin1String(kSettingsGroup));
rosetta_message->set_do_not_show_message_again(QStringLiteral("ignore_rosetta"));
rosetta_message->set_do_not_show_message_again(u"ignore_rosetta"_s);
rosetta_message->setAttribute(Qt::WA_DeleteOnClose);
rosetta_message->ShowMessage(tr("Strawberry running under Rosetta"), tr("You are running Strawberry under Rosetta. Running Strawberry under Rosetta is unsupported and known to have issues. You should download Strawberry for the correct CPU architecture from %1").arg(QLatin1String("<a href=\"https://downloads.strawberrymusicplayer.org/\">downloads.strawberrymusicplayer.org</a>")), IconLoader::Load(QStringLiteral("dialog-warning")));
rosetta_message->ShowMessage(tr("Strawberry running under Rosetta"), tr("You are running Strawberry under Rosetta. Running Strawberry under Rosetta is unsupported and known to have issues. You should download Strawberry for the correct CPU architecture from %1").arg(QLatin1String("<a href=\"https://downloads.strawberrymusicplayer.org/\">downloads.strawberrymusicplayer.org</a>")), IconLoader::Load(u"dialog-warning"_s));
}
}
#endif
@@ -1061,7 +1061,7 @@ MainWindow::MainWindow(Application *app, SharedPtr<SystemTrayIcon> tray_icon, OS
sponsor_message->set_settings_group(QLatin1String(kSettingsGroup));
sponsor_message->set_do_not_show_message_again(QLatin1String(do_not_show_sponsor_message_key));
sponsor_message->setAttribute(Qt::WA_DeleteOnClose);
sponsor_message->ShowMessage(tr("Sponsoring Strawberry"), tr("Strawberry is free and open source software. If you like Strawberry, please consider sponsoring the project. For more information about sponsorship see our website %1").arg(QStringLiteral("<a href= \"https://www.strawberrymusicplayer.org/\">www.strawberrymusicplayer.org</a>")), IconLoader::Load(QStringLiteral("dialog-information")));
sponsor_message->ShowMessage(tr("Sponsoring Strawberry"), tr("Strawberry is free and open source software. If you like Strawberry, please consider sponsoring the project. For more information about sponsorship see our website %1").arg(u"<a href= \"https://www.strawberrymusicplayer.org/\">www.strawberrymusicplayer.org</a>"_s), IconLoader::Load(u"dialog-information"_s));
}
}
}
@@ -1330,11 +1330,11 @@ void MainWindow::EngineChanged(const EngineBase::Type enginetype) {
void MainWindow::MediaStopped() {
setWindowTitle(QStringLiteral("Strawberry Music Player"));
setWindowTitle(u"Strawberry Music Player"_s);
ui_->action_stop->setEnabled(false);
ui_->action_stop_after_this_track->setEnabled(false);
ui_->action_play_pause->setIcon(IconLoader::Load(QStringLiteral("media-playback-start")));
ui_->action_play_pause->setIcon(IconLoader::Load(u"media-playback-start"_s));
ui_->action_play_pause->setText(tr("Play"));
ui_->action_play_pause->setEnabled(true);
@@ -1371,7 +1371,7 @@ void MainWindow::MediaPaused() {
ui_->action_stop->setEnabled(true);
ui_->action_stop_after_this_track->setEnabled(true);
ui_->action_play_pause->setIcon(IconLoader::Load(QStringLiteral("media-playback-start")));
ui_->action_play_pause->setIcon(IconLoader::Load(u"media-playback-start"_s));
ui_->action_play_pause->setText(tr("Play"));
ui_->action_play_pause->setEnabled(true);
@@ -1391,7 +1391,7 @@ void MainWindow::MediaPlaying() {
ui_->action_stop->setEnabled(true);
ui_->action_stop_after_this_track->setEnabled(true);
ui_->action_play_pause->setIcon(IconLoader::Load(QStringLiteral("media-playback-pause")));
ui_->action_play_pause->setIcon(IconLoader::Load(u"media-playback-pause"_s));
ui_->action_play_pause->setText(tr("Pause"));
bool enable_play_pause(false);
@@ -1713,11 +1713,11 @@ void MainWindow::UpdateTrackSliderPosition() {
void MainWindow::UpdateTaskbarProgress(const bool visible, const double progress) {
QVariantMap map;
QDBusMessage msg = QDBusMessage::createSignal(QStringLiteral("/org/strawberrymusicplayer/strawberry"), QStringLiteral("com.canonical.Unity.LauncherEntry"), QStringLiteral("Update"));
QDBusMessage msg = QDBusMessage::createSignal(u"/org/strawberrymusicplayer/strawberry"_s, u"com.canonical.Unity.LauncherEntry"_s, u"Update"_s);
map.insert(QStringLiteral("progress-visible"), visible);
map.insert(QStringLiteral("progress"), progress);
msg << QStringLiteral("application://org.strawberrymusicplayer.strawberry.desktop") << map;
map.insert(u"progress-visible"_s, visible);
map.insert(u"progress"_s, progress);
msg << u"application://org.strawberrymusicplayer.strawberry.desktop"_s << map;
QDBusConnection::sessionBus().send(msg);
@@ -1849,11 +1849,11 @@ void MainWindow::PlaylistRightClick(const QPoint global_pos, const QModelIndex &
// Is this song currently playing?
if (app_->playlist_manager()->current()->current_row() == source_index.row() && app_->player()->GetState() == EngineBase::State::Playing) {
playlist_play_pause_->setText(tr("Pause"));
playlist_play_pause_->setIcon(IconLoader::Load(QStringLiteral("media-playback-pause")));
playlist_play_pause_->setIcon(IconLoader::Load(u"media-playback-pause"_s));
}
else {
playlist_play_pause_->setText(tr("Play"));
playlist_play_pause_->setIcon(IconLoader::Load(QStringLiteral("media-playback-start")));
playlist_play_pause_->setIcon(IconLoader::Load(u"media-playback-start"_s));
}
// Are we allowed to pause?
@@ -1965,11 +1965,11 @@ void MainWindow::PlaylistRightClick(const QPoint global_pos, const QModelIndex &
else playlist_skip_->setText(tr("Toggle skip status"));
}
if (not_in_queue == 0) playlist_queue_->setIcon(IconLoader::Load(QStringLiteral("go-previous")));
else playlist_queue_->setIcon(IconLoader::Load(QStringLiteral("go-next")));
if (not_in_queue == 0) playlist_queue_->setIcon(IconLoader::Load(u"go-previous"_s));
else playlist_queue_->setIcon(IconLoader::Load(u"go-next"_s));
if (in_skipped < selected) playlist_skip_->setIcon(IconLoader::Load(QStringLiteral("media-skip-forward")));
else playlist_skip_->setIcon(IconLoader::Load(QStringLiteral("media-playback-start")));
if (in_skipped < selected) playlist_skip_->setIcon(IconLoader::Load(u"media-skip-forward"_s));
else playlist_skip_->setIcon(IconLoader::Load(u"media-playback-start"_s));
if (!index.isValid()) {
@@ -1986,7 +1986,7 @@ void MainWindow::PlaylistRightClick(const QPoint global_pos, const QModelIndex &
QString column_name = Playlist::column_name(column);
QString column_value = app_->playlist_manager()->current()->data(source_index).toString();
if (column_value.length() > 25) column_value = column_value.left(25) + QStringLiteral("...");
if (column_value.length() > 25) column_value = column_value.left(25) + u"..."_s;
ui_->action_selection_set_value->setText(tr("Set %1 to \"%2\"...").arg(column_name.toLower(), column_value));
ui_->action_edit_value->setText(tr("Edit tag \"%1\"...").arg(column_name));
@@ -2030,7 +2030,7 @@ void MainWindow::PlaylistRightClick(const QPoint global_pos, const QModelIndex &
// Create the playlist submenu if songs are selected.
if (selected > 0) {
QMenu *add_to_another_menu = new QMenu(tr("Add to another playlist"), this);
add_to_another_menu->setIcon(IconLoader::Load(QStringLiteral("list-add")));
add_to_another_menu->setIcon(IconLoader::Load(u"list-add"_s));
const QList<int> playlist_ids = app_->playlist_manager()->playlist_ids();
for (const int playlist_id : playlist_ids) {
@@ -2884,7 +2884,7 @@ void MainWindow::CheckFullRescanRevisions() {
// If we have any...
if (!reasons.isEmpty()) {
QString message = tr("The version of Strawberry you've just updated to requires a full collection rescan because of the new features listed below:") + QStringLiteral("<ul>");
QString message = tr("The version of Strawberry you've just updated to requires a full collection rescan because of the new features listed below:") + u"<ul>"_s;
for (const QString &reason : reasons) {
message += "<li>"_L1 + reason + "</li>"_L1;
}
@@ -2996,10 +2996,10 @@ void MainWindow::HandleNotificationPreview(const OSDBase::Behaviour type, const
qLog(Debug) << "The current playlist is empty, showing a fake song";
// Create a fake song
Song fake(Song::Source::LocalFile);
fake.Init(QStringLiteral("Title"), QStringLiteral("Artist"), QStringLiteral("Album"), 123);
fake.set_genre(QStringLiteral("Classical"));
fake.set_composer(QStringLiteral("Anonymous"));
fake.set_performer(QStringLiteral("Anonymous"));
fake.Init(u"Title"_s, u"Artist"_s, u"Album"_s, 123);
fake.set_genre(u"Classical"_s);
fake.set_composer(u"Anonymous"_s);
fake.set_performer(u"Anonymous"_s);
fake.set_track(1);
fake.set_disc(1);
fake.set_year(2011);
@@ -3142,12 +3142,12 @@ void MainWindow::SetToggleScrobblingIcon(const bool value) {
if (value) {
if (app_->playlist_manager()->active() && app_->playlist_manager()->active()->scrobbled())
ui_->action_toggle_scrobbling->setIcon(IconLoader::Load(QStringLiteral("scrobble"), true, 22));
ui_->action_toggle_scrobbling->setIcon(IconLoader::Load(u"scrobble"_s, true, 22));
else
ui_->action_toggle_scrobbling->setIcon(IconLoader::Load(QStringLiteral("scrobble"), true, 22)); // TODO: Create a faint version of the icon
ui_->action_toggle_scrobbling->setIcon(IconLoader::Load(u"scrobble"_s, true, 22)); // TODO: Create a faint version of the icon
}
else {
ui_->action_toggle_scrobbling->setIcon(IconLoader::Load(QStringLiteral("scrobble-disabled"), true, 22));
ui_->action_toggle_scrobbling->setIcon(IconLoader::Load(u"scrobble-disabled"_s, true, 22));
}
}
@@ -3193,7 +3193,7 @@ void MainWindow::PlaylistDelete() {
app_->player()->Next();
}
SharedPtr<MusicStorage> storage = make_shared<FilesystemMusicStorage>(Song::Source::LocalFile, QStringLiteral("/"));
SharedPtr<MusicStorage> storage = make_shared<FilesystemMusicStorage>(Song::Source::LocalFile, u"/"_s);
DeleteFiles *delete_files = new DeleteFiles(app_->task_manager(), storage, true);
QObject::connect(delete_files, &DeleteFiles::Finished, this, &MainWindow::DeleteFilesFinished);
delete_files->Start(selected_songs);

4
src/core/networkaccessmanager.cpp
View File

@@ -33,6 +33,8 @@
#include "networkaccessmanager.h"
#include "threadsafenetworkdiskcache.h"
using namespace Qt::Literals::StringLiterals;
NetworkAccessManager::NetworkAccessManager(QObject *parent)
: QNetworkAccessManager(parent) {
@@ -56,7 +58,7 @@ QNetworkReply *NetworkAccessManager::createRequest(Operation op, const QNetworkR
new_request.setHeader(QNetworkRequest::UserAgentHeader, user_agent);
if (op == QNetworkAccessManager::PostOperation && !new_request.header(QNetworkRequest::ContentTypeHeader).isValid()) {
new_request.setHeader(QNetworkRequest::ContentTypeHeader, QStringLiteral("application/x-www-form-urlencoded"));
new_request.setHeader(QNetworkRequest::ContentTypeHeader, u"application/x-www-form-urlencoded"_s);
}
// Prefer the cache unless the caller has changed the setting already

16
src/core/qtsystemtrayicon.cpp
View File

@@ -34,12 +34,14 @@
#include "iconloader.h"
#include "qtsystemtrayicon.h"
using namespace Qt::Literals::StringLiterals;
SystemTrayIcon::SystemTrayIcon(QObject *parent)
: QSystemTrayIcon(parent),
menu_(new QMenu),
app_name_(QCoreApplication::applicationName()),
pixmap_playing_(QStringLiteral(":/pictures/tiny-play.png")),
pixmap_paused_(QStringLiteral(":/pictures/tiny-pause.png")),
pixmap_playing_(u":/pictures/tiny-play.png"_s),
pixmap_paused_(u":/pictures/tiny-pause.png"_s),
action_play_pause_(nullptr),
action_stop_(nullptr),
action_stop_after_this_track_(nullptr),
@@ -51,8 +53,8 @@ SystemTrayIcon::SystemTrayIcon(QObject *parent)
app_name_[0] = app_name_[0].toUpper();
const QIcon icon = IconLoader::Load(QStringLiteral("strawberry"));
const QIcon icon_grey = IconLoader::Load(QStringLiteral("strawberry-grey"));
const QIcon icon = IconLoader::Load(u"strawberry"_s);
const QIcon icon_grey = IconLoader::Load(u"strawberry-grey"_s);
pixmap_normal_ = icon.pixmap(48, QIcon::Normal);
if (icon_grey.isNull()) {
pixmap_grey_ = icon.pixmap(48, QIcon::Disabled);
@@ -143,7 +145,7 @@ void SystemTrayIcon::SetPlaying(bool enable_play_pause) {
action_stop_->setEnabled(true);
action_stop_after_this_track_->setEnabled(true);
action_play_pause_->setIcon(IconLoader::Load(QStringLiteral("media-playback-pause")));
action_play_pause_->setIcon(IconLoader::Load(u"media-playback-pause"_s));
action_play_pause_->setText(tr("Pause"));
action_play_pause_->setEnabled(enable_play_pause);
@@ -156,7 +158,7 @@ void SystemTrayIcon::SetPaused() {
action_stop_->setEnabled(true);
action_stop_after_this_track_->setEnabled(true);
action_play_pause_->setIcon(IconLoader::Load(QStringLiteral("media-playback-start")));
action_play_pause_->setIcon(IconLoader::Load(u"media-playback-start"_s));
action_play_pause_->setText(tr("Play"));
action_play_pause_->setEnabled(true);
@@ -170,7 +172,7 @@ void SystemTrayIcon::SetStopped() {
action_stop_->setEnabled(false);
action_stop_after_this_track_->setEnabled(false);
action_play_pause_->setIcon(IconLoader::Load(QStringLiteral("media-playback-start")));
action_play_pause_->setIcon(IconLoader::Load(u"media-playback-start"_s));
action_play_pause_->setText(tr("Play"));
action_play_pause_->setEnabled(true);

28
src/core/songloader.cpp
View File

@@ -47,11 +47,9 @@
#include "song.h"
#include "songloader.h"
#include "database.h"
#include "sqlrow.h"
#include "engine/enginebase.h"
#include "tagreader/tagreaderclient.h"
#include "collection/collectionbackend.h"
#include "collection/collectionquery.h"
#include "playlistparsers/cueparser.h"
#include "playlistparsers/parserbase.h"
#include "playlistparsers/playlistparser.h"
@@ -60,6 +58,8 @@
# include "device/cddasongloader.h"
#endif
using namespace Qt::Literals::StringLiterals;
namespace {
constexpr int kDefaultTimeout = 5000;
}
@@ -81,15 +81,15 @@ SongLoader::SongLoader(SharedPtr<CollectionBackendInterface> collection_backend,
success_(false) {
if (sRawUriSchemes.isEmpty()) {
sRawUriSchemes << QStringLiteral("udp")
<< QStringLiteral("mms")
<< QStringLiteral("mmsh")
<< QStringLiteral("mmst")
<< QStringLiteral("mmsu")
<< QStringLiteral("rtsp")
<< QStringLiteral("rtspu")
<< QStringLiteral("rtspt")
<< QStringLiteral("rtsph");
sRawUriSchemes << u"udp"_s
<< u"mms"_s
<< u"mmsh"_s
<< u"mmst"_s
<< u"mmsu"_s
<< u"rtsp"_s
<< u"rtspu"_s
<< u"rtspt"_s
<< u"rtsph"_s;
}
timeout_timer_->setSingleShot(true);
@@ -537,7 +537,7 @@ void SongLoader::TypeFound(GstElement *typefind, const uint probability, GstCaps
// Check the mimetype
instance->mime_type_ = QString::fromUtf8(gst_structure_get_name(gst_caps_get_structure(caps, 0)));
qLog(Debug) << "Mime type is" << instance->mime_type_;
if (instance->mime_type_ == QStringLiteral("text/plain") || instance->mime_type_ == QStringLiteral("text/uri-list")) {
if (instance->mime_type_ == u"text/plain"_s || instance->mime_type_ == u"text/uri-list"_s) {
// Yeah it might be a playlist, let's get some data and have a better look
instance->state_ = State::WaitingForMagic;
return;
@@ -688,10 +688,10 @@ void SongLoader::MagicReady() {
qLog(Debug) << "Magic says" << parser_->name();
if (parser_->name() == QStringLiteral("ASX/INI") && url_.scheme() == QStringLiteral("http")) {
if (parser_->name() == u"ASX/INI"_s && url_.scheme() == u"http"_s) {
// This is actually a weird MS-WMSP stream. Changing the protocol to MMS from HTTP makes it playable.
parser_ = nullptr;
url_.setScheme(QStringLiteral("mms"));
url_.setScheme(u"mms"_s);
StopTypefindAsync(true);
}

46
src/core/stylesheetloader.cpp
View File

@@ -95,26 +95,26 @@ void StyleSheetLoader::UpdateStyleSheet(QWidget *widget, SharedPtr<StyleSheetDat
stylesheet.replace("%palette-alternate-base"_L1, QStringLiteral("rgba(%1,%2,%3,%4)").arg(alt.red()).arg(alt.green()).arg(alt.blue()).arg(alt.alpha()));
}
ReplaceColor(&stylesheet, QStringLiteral("Window"), p, QPalette::Window);
ReplaceColor(&stylesheet, QStringLiteral("Background"), p, QPalette::Window);
ReplaceColor(&stylesheet, QStringLiteral("WindowText"), p, QPalette::WindowText);
ReplaceColor(&stylesheet, QStringLiteral("Base"), p, QPalette::Base);
ReplaceColor(&stylesheet, QStringLiteral("AlternateBase"), p, QPalette::AlternateBase);
ReplaceColor(&stylesheet, QStringLiteral("ToolTipBase"), p, QPalette::ToolTipBase);
ReplaceColor(&stylesheet, QStringLiteral("ToolTipText"), p, QPalette::ToolTipText);
ReplaceColor(&stylesheet, QStringLiteral("Text"), p, QPalette::Text);
ReplaceColor(&stylesheet, QStringLiteral("Button"), p, QPalette::Button);
ReplaceColor(&stylesheet, QStringLiteral("ButtonText"), p, QPalette::ButtonText);
ReplaceColor(&stylesheet, QStringLiteral("BrightText"), p, QPalette::BrightText);
ReplaceColor(&stylesheet, QStringLiteral("Light"), p, QPalette::Light);
ReplaceColor(&stylesheet, QStringLiteral("Midlight"), p, QPalette::Midlight);
ReplaceColor(&stylesheet, QStringLiteral("Dark"), p, QPalette::Dark);
ReplaceColor(&stylesheet, QStringLiteral("Mid"), p, QPalette::Mid);
ReplaceColor(&stylesheet, QStringLiteral("Shadow"), p, QPalette::Shadow);
ReplaceColor(&stylesheet, QStringLiteral("Highlight"), p, QPalette::Highlight);
ReplaceColor(&stylesheet, QStringLiteral("HighlightedText"), p, QPalette::HighlightedText);
ReplaceColor(&stylesheet, QStringLiteral("Link"), p, QPalette::Link);
ReplaceColor(&stylesheet, QStringLiteral("LinkVisited"), p, QPalette::LinkVisited);
ReplaceColor(&stylesheet, u"Window"_s, p, QPalette::Window);
ReplaceColor(&stylesheet, u"Background"_s, p, QPalette::Window);
ReplaceColor(&stylesheet, u"WindowText"_s, p, QPalette::WindowText);
ReplaceColor(&stylesheet, u"Base"_s, p, QPalette::Base);
ReplaceColor(&stylesheet, u"AlternateBase"_s, p, QPalette::AlternateBase);
ReplaceColor(&stylesheet, u"ToolTipBase"_s, p, QPalette::ToolTipBase);
ReplaceColor(&stylesheet, u"ToolTipText"_s, p, QPalette::ToolTipText);
ReplaceColor(&stylesheet, u"Text"_s, p, QPalette::Text);
ReplaceColor(&stylesheet, u"Button"_s, p, QPalette::Button);
ReplaceColor(&stylesheet, u"ButtonText"_s, p, QPalette::ButtonText);
ReplaceColor(&stylesheet, u"BrightText"_s, p, QPalette::BrightText);
ReplaceColor(&stylesheet, u"Light"_s, p, QPalette::Light);
ReplaceColor(&stylesheet, u"Midlight"_s, p, QPalette::Midlight);
ReplaceColor(&stylesheet, u"Dark"_s, p, QPalette::Dark);
ReplaceColor(&stylesheet, u"Mid"_s, p, QPalette::Mid);
ReplaceColor(&stylesheet, u"Shadow"_s, p, QPalette::Shadow);
ReplaceColor(&stylesheet, u"Highlight"_s, p, QPalette::Highlight);
ReplaceColor(&stylesheet, u"HighlightedText"_s, p, QPalette::HighlightedText);
ReplaceColor(&stylesheet, u"Link"_s, p, QPalette::Link);
ReplaceColor(&stylesheet, u"LinkVisited"_s, p, QPalette::LinkVisited);
#ifdef Q_OS_MACOS
stylesheet.replace(QLatin1String("macos"), QLatin1String("*"));
@@ -129,9 +129,9 @@ void StyleSheetLoader::UpdateStyleSheet(QWidget *widget, SharedPtr<StyleSheetDat
void StyleSheetLoader::ReplaceColor(QString *css, const QString &name, const QPalette &palette, const QPalette::ColorRole role) {
css->replace(QStringLiteral("%palette-") + name + QStringLiteral("-lighter"), palette.color(role).lighter().name(), Qt::CaseInsensitive);
css->replace(QStringLiteral("%palette-") + name + QStringLiteral("-darker"), palette.color(role).darker().name(), Qt::CaseInsensitive);
css->replace(QStringLiteral("%palette-") + name, palette.color(role).name(), Qt::CaseInsensitive);
css->replace(u"%palette-"_s + name + u"-lighter"_s, palette.color(role).lighter().name(), Qt::CaseInsensitive);
css->replace(u"%palette-"_s + name + u"-darker"_s, palette.color(role).darker().name(), Qt::CaseInsensitive);
css->replace(u"%palette-"_s + name, palette.color(role).name(), Qt::CaseInsensitive);
}

4
src/core/temporaryfile.cpp
View File

@@ -25,6 +25,8 @@
#include "temporaryfile.h"
using namespace Qt::Literals::StringLiterals;
TemporaryFile::TemporaryFile(const QString &filename_pattern) {
int i = 0;
@@ -56,7 +58,7 @@ TemporaryFile::~TemporaryFile() {
QString TemporaryFile::GenerateFilename(const QString &filename_pattern) const {
static const QString random_chars = QStringLiteral("abcdefghijklmnopqrstuvwxyz0123456789");
static const QString random_chars = u"abcdefghijklmnopqrstuvwxyz0123456789"_s;
QString filename = filename_pattern;

6
src/core/threadsafenetworkdiskcache.cpp
View File

@@ -34,6 +34,8 @@
#include "threadsafenetworkdiskcache.h"
using namespace Qt::Literals::StringLiterals;
QMutex ThreadSafeNetworkDiskCache::sMutex;
int ThreadSafeNetworkDiskCache::sInstances = 0;
QNetworkDiskCache *ThreadSafeNetworkDiskCache::sCache = nullptr;
@@ -46,9 +48,9 @@ ThreadSafeNetworkDiskCache::ThreadSafeNetworkDiskCache(QObject *parent) : QAbstr
if (!sCache) {
sCache = new QNetworkDiskCache;
#ifdef Q_OS_WIN32
sCache->setCacheDirectory(QStandardPaths::writableLocation(QStandardPaths::TempLocation) + QStringLiteral("/strawberry/networkcache"));
sCache->setCacheDirectory(QStandardPaths::writableLocation(QStandardPaths::TempLocation) + u"/strawberry/networkcache"_s);
#else
sCache->setCacheDirectory(QStandardPaths::writableLocation(QStandardPaths::CacheLocation) + QStringLiteral("/networkcache"));
sCache->setCacheDirectory(QStandardPaths::writableLocation(QStandardPaths::CacheLocation) + u"/networkcache"_s);
#endif
}