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

8
src/playlist/playlist.cpp
View File

@@ -772,7 +772,7 @@ Qt::ItemFlags Playlist::flags(const QModelIndex &idx) const {
QStringList Playlist::mimeTypes() const {
return QStringList() << "text/uri-list" << kRowsMimetype;
return QStringList() << QStringLiteral("text/uri-list") << kRowsMimetype;
}
@@ -1411,7 +1411,7 @@ QString Playlist::column_name(Column column) {
default: qLog(Error) << "No such column" << column;;
}
return "";
return QLatin1String("");
}
@@ -1424,11 +1424,11 @@ QString Playlist::abbreviated_column_name(const Column column) {
case Column_PlayCount:
case Column_SkipCount:
case Column_Track:
return QString("%1#").arg(column_name[0]);
return QStringLiteral("%1#").arg(column_name[0]);
default:
return column_name;
}
return "";
return QLatin1String("");
}

82
src/playlist/playlistbackend.cpp
View File

@@ -109,14 +109,14 @@ PlaylistBackend::PlaylistList PlaylistBackend::GetPlaylists(const GetPlaylistsFl
QStringList condition_list;
if (flags & GetPlaylistsFlags::GetPlaylists_OpenInUi) {
condition_list << "ui_order != -1";
condition_list << QStringLiteral("ui_order != -1");
}
if (flags & GetPlaylistsFlags::GetPlaylists_Favorite) {
condition_list << "is_favorite != 0";
condition_list << QStringLiteral("is_favorite != 0");
}
QString condition;
if (!condition_list.isEmpty()) {
condition = " WHERE " + condition_list.join(" OR ");
condition = " WHERE " + condition_list.join(QStringLiteral(" OR "));
}
SqlQuery q(db);
@@ -150,9 +150,9 @@ PlaylistBackend::Playlist PlaylistBackend::GetPlaylist(const int id) {
QSqlDatabase db(db_->Connect());
SqlQuery q(db);
q.prepare("SELECT ROWID, name, last_played, special_type, ui_path, is_favorite, dynamic_playlist_type, dynamic_playlist_data, dynamic_playlist_backend FROM playlists WHERE ROWID=:id");
q.prepare(QStringLiteral("SELECT ROWID, name, last_played, special_type, ui_path, is_favorite, dynamic_playlist_type, dynamic_playlist_data, dynamic_playlist_backend FROM playlists WHERE ROWID=:id"));
q.BindValue(":id", id);
q.BindValue(QStringLiteral(":id"), id);
if (!q.Exec()) {
db_->ReportErrors(q);
return Playlist();
@@ -184,12 +184,12 @@ PlaylistItemPtrList PlaylistBackend::GetPlaylistItems(const int playlist) {
QMutexLocker l(db_->Mutex());
QSqlDatabase db(db_->Connect());
QString query = "SELECT songs.ROWID, " + Song::JoinSpec("songs") + ", p.ROWID, " + Song::JoinSpec("p") + ", p.type FROM playlist_items AS p LEFT JOIN songs ON p.collection_id = songs.ROWID WHERE p.playlist = :playlist";
QString query = "SELECT songs.ROWID, " + Song::JoinSpec(QStringLiteral("songs")) + ", p.ROWID, " + Song::JoinSpec(QStringLiteral("p")) + ", p.type FROM playlist_items AS p LEFT JOIN songs ON p.collection_id = songs.ROWID WHERE p.playlist = :playlist";
SqlQuery q(db);
// Forward iterations only may be faster
q.setForwardOnly(true);
q.prepare(query);
q.BindValue(":playlist", playlist);
q.BindValue(QStringLiteral(":playlist"), playlist);
if (!q.Exec()) {
db_->ReportErrors(q);
return PlaylistItemPtrList();
@@ -219,12 +219,12 @@ SongList PlaylistBackend::GetPlaylistSongs(const int playlist) {
QMutexLocker l(db_->Mutex());
QSqlDatabase db(db_->Connect());
QString query = "SELECT songs.ROWID, " + Song::JoinSpec("songs") + ", p.ROWID, " + Song::JoinSpec("p") + ", p.type FROM playlist_items AS p LEFT JOIN songs ON p.collection_id = songs.ROWID WHERE p.playlist = :playlist";
QString query = "SELECT songs.ROWID, " + Song::JoinSpec(QStringLiteral("songs")) + ", p.ROWID, " + Song::JoinSpec(QStringLiteral("p")) + ", p.type FROM playlist_items AS p LEFT JOIN songs ON p.collection_id = songs.ROWID WHERE p.playlist = :playlist";
SqlQuery q(db);
// Forward iterations only may be faster
q.setForwardOnly(true);
q.prepare(query);
q.BindValue(":playlist", playlist);
q.BindValue(QStringLiteral(":playlist"), playlist);
if (!q.Exec()) {
db_->ReportErrors(q);
return SongList();
@@ -337,8 +337,8 @@ void PlaylistBackend::SavePlaylist(int playlist, const PlaylistItemPtrList &item
// Clear the existing items in the playlist
{
SqlQuery q(db);
q.prepare("DELETE FROM playlist_items WHERE playlist = :playlist");
q.BindValue(":playlist", playlist);
q.prepare(QStringLiteral("DELETE FROM playlist_items WHERE playlist = :playlist"));
q.BindValue(QStringLiteral(":playlist"), playlist);
if (!q.Exec()) {
db_->ReportErrors(q);
return;
@@ -349,7 +349,7 @@ void PlaylistBackend::SavePlaylist(int playlist, const PlaylistItemPtrList &item
for (PlaylistItemPtr item : items) { // clazy:exclude=range-loop-reference
SqlQuery q(db);
q.prepare("INSERT INTO playlist_items (playlist, type, collection_id, " + Song::kColumnSpec + ") VALUES (:playlist, :type, :collection_id, " + Song::kBindSpec + ")");
q.BindValue(":playlist", playlist);
q.BindValue(QStringLiteral(":playlist"), playlist);
item->BindToQuery(&q);
if (!q.Exec()) {
@@ -361,19 +361,19 @@ void PlaylistBackend::SavePlaylist(int playlist, const PlaylistItemPtrList &item
// Update the last played track number
{
SqlQuery q(db);
q.prepare("UPDATE playlists SET last_played=:last_played, dynamic_playlist_type=:dynamic_type, dynamic_playlist_data=:dynamic_data, dynamic_playlist_backend=:dynamic_backend WHERE ROWID=:playlist");
q.BindValue(":last_played", last_played);
q.prepare(QStringLiteral("UPDATE playlists SET last_played=:last_played, dynamic_playlist_type=:dynamic_type, dynamic_playlist_data=:dynamic_data, dynamic_playlist_backend=:dynamic_backend WHERE ROWID=:playlist"));
q.BindValue(QStringLiteral(":last_played"), last_played);
if (dynamic) {
q.BindValue(":dynamic_type", static_cast<int>(dynamic->type()));
q.BindValue(":dynamic_data", dynamic->Save());
q.BindValue(":dynamic_backend", dynamic->collection()->songs_table());
q.BindValue(QStringLiteral(":dynamic_type"), static_cast<int>(dynamic->type()));
q.BindValue(QStringLiteral(":dynamic_data"), dynamic->Save());
q.BindValue(QStringLiteral(":dynamic_backend"), dynamic->collection()->songs_table());
}
else {
q.BindValue(":dynamic_type", 0);
q.BindValue(":dynamic_data", QByteArray());
q.BindValue(":dynamic_backend", QString());
q.BindValue(QStringLiteral(":dynamic_type"), 0);
q.BindValue(QStringLiteral(":dynamic_data"), QByteArray());
q.BindValue(QStringLiteral(":dynamic_backend"), QString());
}
q.BindValue(":playlist", playlist);
q.BindValue(QStringLiteral(":playlist"), playlist);
if (!q.Exec()) {
db_->ReportErrors(q);
return;
@@ -390,9 +390,9 @@ int PlaylistBackend::CreatePlaylist(const QString &name, const QString &special_
QSqlDatabase db(db_->Connect());
SqlQuery q(db);
q.prepare("INSERT INTO playlists (name, special_type) VALUES (:name, :special_type)");
q.BindValue(":name", name);
q.BindValue(":special_type", special_type);
q.prepare(QStringLiteral("INSERT INTO playlists (name, special_type) VALUES (:name, :special_type)"));
q.BindValue(QStringLiteral(":name"), name);
q.BindValue(QStringLiteral(":special_type"), special_type);
if (!q.Exec()) {
db_->ReportErrors(q);
return -1;
@@ -411,8 +411,8 @@ void PlaylistBackend::RemovePlaylist(int id) {
{
SqlQuery q(db);
q.prepare("DELETE FROM playlists WHERE ROWID=:id");
q.BindValue(":id", id);
q.prepare(QStringLiteral("DELETE FROM playlists WHERE ROWID=:id"));
q.BindValue(QStringLiteral(":id"), id);
if (!q.Exec()) {
db_->ReportErrors(q);
return;
@@ -421,8 +421,8 @@ void PlaylistBackend::RemovePlaylist(int id) {
{
SqlQuery q(db);
q.prepare("DELETE FROM playlist_items WHERE playlist=:id");
q.BindValue(":id", id);
q.prepare(QStringLiteral("DELETE FROM playlist_items WHERE playlist=:id"));
q.BindValue(QStringLiteral(":id"), id);
if (!q.Exec()) {
db_->ReportErrors(q);
return;
@@ -438,9 +438,9 @@ void PlaylistBackend::RenamePlaylist(const int id, const QString &new_name) {
QMutexLocker l(db_->Mutex());
QSqlDatabase db(db_->Connect());
SqlQuery q(db);
q.prepare("UPDATE playlists SET name=:name WHERE ROWID=:id");
q.BindValue(":name", new_name);
q.BindValue(":id", id);
q.prepare(QStringLiteral("UPDATE playlists SET name=:name WHERE ROWID=:id"));
q.BindValue(QStringLiteral(":name"), new_name);
q.BindValue(QStringLiteral(":id"), id);
if (!q.Exec()) {
db_->ReportErrors(q);
@@ -453,9 +453,9 @@ void PlaylistBackend::FavoritePlaylist(const int id, const bool is_favorite) {
QMutexLocker l(db_->Mutex());
QSqlDatabase db(db_->Connect());
SqlQuery q(db);
q.prepare("UPDATE playlists SET is_favorite=:is_favorite WHERE ROWID=:id");
q.BindValue(":is_favorite", is_favorite ? 1 : 0);
q.BindValue(":id", id);
q.prepare(QStringLiteral("UPDATE playlists SET is_favorite=:is_favorite WHERE ROWID=:id"));
q.BindValue(QStringLiteral(":is_favorite"), is_favorite ? 1 : 0);
q.BindValue(QStringLiteral(":id"), id);
if (!q.Exec()) {
db_->ReportErrors(q);
@@ -470,16 +470,16 @@ void PlaylistBackend::SetPlaylistOrder(const QList<int> &ids) {
ScopedTransaction transaction(&db);
SqlQuery q(db);
q.prepare("UPDATE playlists SET ui_order=-1");
q.prepare(QStringLiteral("UPDATE playlists SET ui_order=-1"));
if (!q.Exec()) {
db_->ReportErrors(q);
return;
}
q.prepare("UPDATE playlists SET ui_order=:index WHERE ROWID=:id");
q.prepare(QStringLiteral("UPDATE playlists SET ui_order=:index WHERE ROWID=:id"));
for (int i = 0; i < ids.count(); ++i) {
q.BindValue(":index", i);
q.BindValue(":id", ids[i]);
q.BindValue(QStringLiteral(":index"), i);
q.BindValue(QStringLiteral(":id"), ids[i]);
if (!q.Exec()) {
db_->ReportErrors(q);
return;
@@ -495,12 +495,12 @@ void PlaylistBackend::SetPlaylistUiPath(const int id, const QString &path) {
QMutexLocker l(db_->Mutex());
QSqlDatabase db(db_->Connect());
SqlQuery q(db);
q.prepare("UPDATE playlists SET ui_path=:path WHERE ROWID=:id");
q.prepare(QStringLiteral("UPDATE playlists SET ui_path=:path WHERE ROWID=:id"));
ScopedTransaction transaction(&db);
q.BindValue(":path", path);
q.BindValue(":id", id);
q.BindValue(QStringLiteral(":path"), path);
q.BindValue(QStringLiteral(":id"), id);
if (!q.Exec()) {
db_->ReportErrors(q);
return;

38
src/playlist/playlistcontainer.cpp
View File

@@ -93,7 +93,7 @@ PlaylistContainer::PlaylistContainer(QWidget *parent)
no_matches_label_->setPalette(no_matches_palette);
// Remove QFrame border
ui_->toolbar->setStyleSheet("QFrame { border: 0px; }");
ui_->toolbar->setStyleSheet(QStringLiteral("QFrame { border: 0px; }"));
// Make it bold
QFont no_matches_font = no_matches_label_->font();
@@ -123,35 +123,35 @@ PlaylistContainer::PlaylistContainer(QWidget *parent)
QObject::connect(ui_->playlist, &PlaylistView::FocusOnFilterSignal, this, &PlaylistContainer::FocusOnFilter);
ui_->search_field->installEventFilter(this);
QString available_fields = PlaylistFilter().column_names().keys().join(", ");
QString available_fields = PlaylistFilter().column_names().keys().join(QStringLiteral(", "));
ui_->search_field->setToolTip(
QString("<html><head/><body><p>") +
QStringLiteral("<html><head/><body><p>") +
tr("Prefix a search term with a field name to limit the search to that field, e.g.:") +
QString(" ") +
QString("<span style=\"font-weight:600;\">") +
QStringLiteral(" ") +
QStringLiteral("<span style=\"font-weight:600;\">") +
tr("artist") +
QString(":</span><span style=\"font-style:italic;\">Strawbs</span> ") +
tr("searches the playlist for all artists that contain the word %1. ").arg("Strawbs") +
QString("</p><p>") +
QStringLiteral(":</span><span style=\"font-style:italic;\">Strawbs</span> ") +
tr("searches the playlist for all artists that contain the word %1. ").arg(QStringLiteral("Strawbs")) +
QStringLiteral("</p><p>") +
tr("Search terms for numerical fields can be prefixed with %1 or %2 to refine the search, e.g.: ")
.arg(" =, !=, &lt;, &gt;, &lt;=", "&gt;=") +
QString("<span style=\"font-weight:600;\">") +
QStringLiteral("<span style=\"font-weight:600;\">") +
tr("rating") +
QString("</span>") +
QString(":>=") +
QString("<span style=\"font-weight:italic;\">4</span>") +
QString("</p><p>") +
QStringLiteral("</span>") +
QStringLiteral(":>=") +
QStringLiteral("<span style=\"font-weight:italic;\">4</span>") +
QStringLiteral("</p><p>") +
tr("Multiple search terms can also be combined with \"%1\" (default) and \"%2\", as well as grouped with parentheses. ")
.arg("AND", "OR") +
QString("</p><p><span style=\"font-weight:600;\">") +
QStringLiteral("</p><p><span style=\"font-weight:600;\">") +
tr("Available fields") +
QString(": ") + QString("</span><span style=\"font-style:italic;\">") +
QStringLiteral(": ") + QStringLiteral("</span><span style=\"font-style:italic;\">") +
available_fields +
QString("</span>.") +
QString("</p></body></html>")
QStringLiteral("</span>.") +
QStringLiteral("</p></body></html>")
);
@@ -254,9 +254,9 @@ void PlaylistContainer::SetViewModel(Playlist *playlist, const int scroll_positi
delete redo_;
undo_ = playlist->undo_stack()->createUndoAction(this, tr("Undo"));
redo_ = playlist->undo_stack()->createRedoAction(this, tr("Redo"));
undo_->setIcon(IconLoader::Load("edit-undo"));
undo_->setIcon(IconLoader::Load(QStringLiteral("edit-undo")));
undo_->setShortcut(QKeySequence::Undo);
redo_->setIcon(IconLoader::Load("edit-redo"));
redo_->setIcon(IconLoader::Load(QStringLiteral("edit-redo")));
redo_->setShortcut(QKeySequence::Redo);
ui_->undo->setDefaultAction(undo_);

26
src/playlist/playlistdelegates.cpp
View File

@@ -260,10 +260,10 @@ bool PlaylistDelegateBase::helpEvent(QHelpEvent *event, QAbstractItemView *view,
// Special case: we want newlines in the comment tooltip
if (idx.column() == Playlist::Column_Comment) {
text = idx.data(Qt::ToolTipRole).toString().toHtmlEscaped();
text.replace("\\r\\n", "<br />");
text.replace("\\n", "<br />");
text.replace("\r\n", "<br />");
text.replace("\n", "<br />");
text.replace(QLatin1String("\\r\\n"), QLatin1String("<br />"));
text.replace(QLatin1String("\\n"), QLatin1String("<br />"));
text.replace(QLatin1String("\r\n"), QLatin1String("<br />"));
text.replace(QLatin1String("\n"), QLatin1String("<br />"));
}
if (text.isEmpty() || !event) return false;
@@ -381,13 +381,13 @@ TagCompletionModel::TagCompletionModel(SharedPtr<CollectionBackend> backend, con
QString TagCompletionModel::database_column(Playlist::Column column) {
switch (column) {
case Playlist::Column_Artist: return "artist";
case Playlist::Column_Album: return "album";
case Playlist::Column_AlbumArtist: return "albumartist";
case Playlist::Column_Composer: return "composer";
case Playlist::Column_Performer: return "performer";
case Playlist::Column_Grouping: return "grouping";
case Playlist::Column_Genre: return "genre";
case Playlist::Column_Artist: return QStringLiteral("artist");
case Playlist::Column_Album: return QStringLiteral("album");
case Playlist::Column_AlbumArtist: return QStringLiteral("albumartist");
case Playlist::Column_Composer: return QStringLiteral("composer");
case Playlist::Column_Performer: return QStringLiteral("performer");
case Playlist::Column_Grouping: return QStringLiteral("grouping");
case Playlist::Column_Genre: return QStringLiteral("genre");
default:
qLog(Warning) << "Unknown column" << column;
return QString();
@@ -446,7 +446,7 @@ QString NativeSeparatorsDelegate::displayText(const QVariant &value, const QLoca
#endif
url = value.toUrl();
}
else if (string_value.contains("://")) {
else if (string_value.contains(QLatin1String("://"))) {
url = QUrl::fromEncoded(string_value.toLatin1());
}
else {
@@ -470,7 +470,7 @@ QString SongSourceDelegate::displayText(const QVariant &value, const QLocale&) c
QPixmap SongSourceDelegate::LookupPixmap(const Song::Source source, const QSize size, const qreal device_pixel_ratio) const {
QPixmap pixmap;
const QString pixmap_cache_key = QString("%1-%2x%3-%4").arg(Song::TextForSource(source)).arg(size.width()).arg(size.height()).arg(device_pixel_ratio);
const QString pixmap_cache_key = QStringLiteral("%1-%2x%3-%4").arg(Song::TextForSource(source)).arg(size.width()).arg(size.height()).arg(device_pixel_ratio);
if (QPixmapCache::find(pixmap_cache_key, &pixmap)) {
return pixmap;
}

44
src/playlist/playlistfilter.cpp
View File

@@ -37,28 +37,28 @@ PlaylistFilter::PlaylistFilter(QObject *parent)
setDynamicSortFilter(true);
column_names_["title"] = Playlist::Column_Title;
column_names_["name"] = Playlist::Column_Title;
column_names_["artist"] = Playlist::Column_Artist;
column_names_["album"] = Playlist::Column_Album;
column_names_["albumartist"] = Playlist::Column_AlbumArtist;
column_names_["performer"] = Playlist::Column_Performer;
column_names_["composer"] = Playlist::Column_Composer;
column_names_["year"] = Playlist::Column_Year;
column_names_["originalyear"] = Playlist::Column_OriginalYear;
column_names_["track"] = Playlist::Column_Track;
column_names_["disc"] = Playlist::Column_Disc;
column_names_["length"] = Playlist::Column_Length;
column_names_["genre"] = Playlist::Column_Genre;
column_names_["samplerate"] = Playlist::Column_Samplerate;
column_names_["bitdepth"] = Playlist::Column_Bitdepth;
column_names_["bitrate"] = Playlist::Column_Bitrate;
column_names_["filename"] = Playlist::Column_Filename;
column_names_["grouping"] = Playlist::Column_Grouping;
column_names_["comment"] = Playlist::Column_Comment;
column_names_["rating"] = Playlist::Column_Rating;
column_names_["playcount"] = Playlist::Column_PlayCount;
column_names_["skipcount"] = Playlist::Column_SkipCount;
column_names_[QStringLiteral("title")] = Playlist::Column_Title;
column_names_[QStringLiteral("name")] = Playlist::Column_Title;
column_names_[QStringLiteral("artist")] = Playlist::Column_Artist;
column_names_[QStringLiteral("album")] = Playlist::Column_Album;
column_names_[QStringLiteral("albumartist")] = Playlist::Column_AlbumArtist;
column_names_[QStringLiteral("performer")] = Playlist::Column_Performer;
column_names_[QStringLiteral("composer")] = Playlist::Column_Composer;
column_names_[QStringLiteral("year")] = Playlist::Column_Year;
column_names_[QStringLiteral("originalyear")] = Playlist::Column_OriginalYear;
column_names_[QStringLiteral("track")] = Playlist::Column_Track;
column_names_[QStringLiteral("disc")] = Playlist::Column_Disc;
column_names_[QStringLiteral("length")] = Playlist::Column_Length;
column_names_[QStringLiteral("genre")] = Playlist::Column_Genre;
column_names_[QStringLiteral("samplerate")] = Playlist::Column_Samplerate;
column_names_[QStringLiteral("bitdepth")] = Playlist::Column_Bitdepth;
column_names_[QStringLiteral("bitrate")] = Playlist::Column_Bitrate;
column_names_[QStringLiteral("filename")] = Playlist::Column_Filename;
column_names_[QStringLiteral("grouping")] = Playlist::Column_Grouping;
column_names_[QStringLiteral("comment")] = Playlist::Column_Comment;
column_names_[QStringLiteral("rating")] = Playlist::Column_Rating;
column_names_[QStringLiteral("playcount")] = Playlist::Column_PlayCount;
column_names_[QStringLiteral("skipcount")] = Playlist::Column_SkipCount;
numerical_columns_ << Playlist::Column_Year
<< Playlist::Column_OriginalYear

4
src/playlist/playlistitem.cpp
View File

@@ -91,8 +91,8 @@ PlaylistItem::~PlaylistItem() = default;
void PlaylistItem::BindToQuery(SqlQuery *query) const {
query->BindValue(":type", static_cast<int>(source_));
query->BindValue(":collection_id", DatabaseValue(Column_CollectionId));
query->BindValue(QStringLiteral(":type"), static_cast<int>(source_));
query->BindValue(QStringLiteral(":collection_id"), DatabaseValue(Column_CollectionId));
DatabaseSongMetadata().BindToQuery(query);

14
src/playlist/playlistlistcontainer.cpp
View File

@@ -167,14 +167,14 @@ void PlaylistListContainer::showEvent(QShowEvent *e) {
if (!loaded_icons_) {
loaded_icons_ = true;
action_new_folder_->setIcon(IconLoader::Load("folder-new"));
action_remove_->setIcon(IconLoader::Load("edit-delete"));
action_save_playlist_->setIcon(IconLoader::Load("document-save"));
action_new_folder_->setIcon(IconLoader::Load(QStringLiteral("folder-new")));
action_remove_->setIcon(IconLoader::Load(QStringLiteral("edit-delete")));
action_save_playlist_->setIcon(IconLoader::Load(QStringLiteral("document-save")));
#ifndef Q_OS_WIN
action_copy_to_device_->setIcon(IconLoader::Load("device"));
action_copy_to_device_->setIcon(IconLoader::Load(QStringLiteral("device")));
#endif
model_->SetIcons(IconLoader::Load("view-media-playlist"), IconLoader::Load("folder"));
model_->SetIcons(IconLoader::Load(QStringLiteral("view-media-playlist")), IconLoader::Load(QStringLiteral("folder")));
// Apply these icons to items that have already been created.
RecursivelySetIcons(model_->invisibleRootItem());
@@ -213,7 +213,7 @@ void PlaylistListContainer::NewFolderClicked() {
return;
}
name.replace("/", " ");
name.replace(QLatin1String("/"), QLatin1String(" "));
model_->invisibleRootItem()->appendRow(model_->NewFolder(name));
@@ -489,7 +489,7 @@ void PlaylistListContainer::contextMenuEvent(QContextMenuEvent *e) {
void PlaylistListContainer::ActivePlaying() {
if (padded_play_icon_.isNull()) {
QPixmap pixmap(":/pictures/tiny-play.png");
QPixmap pixmap(QStringLiteral(":/pictures/tiny-play.png"));
QPixmap new_pixmap(QSize(pixmap.height(), pixmap.height()));
new_pixmap.fill(Qt::transparent);

2
src/playlist/playlistlistmodel.cpp
View File

@@ -68,7 +68,7 @@ QString PlaylistListModel::ItemPath(const QStandardItem *item) {
current = current->parent();
}
return components.join("/");
return components.join(QStringLiteral("/"));
}

2
src/playlist/playlistmanager.cpp
View File

@@ -189,7 +189,7 @@ void PlaylistManager::New(const QString &name, const SongList &songs, const QStr
// If the name is just "Playlist", append the id
if (name == tr("Playlist")) {
Rename(id, QString("%1 %2").arg(name).arg(id));
Rename(id, QStringLiteral("%1 %2").arg(name).arg(id));
}
}

16
src/playlist/playlistsequence.cpp
View File

@@ -52,12 +52,12 @@ PlaylistSequence::PlaylistSequence(QWidget *parent, SettingsProvider *settings)
ui_->setupUi(this);
// Icons
ui_->repeat->setIcon(AddDesaturatedIcon(IconLoader::Load("media-playlist-repeat")));
ui_->shuffle->setIcon(AddDesaturatedIcon(IconLoader::Load("media-playlist-shuffle")));
ui_->repeat->setIcon(AddDesaturatedIcon(IconLoader::Load(QStringLiteral("media-playlist-repeat"))));
ui_->shuffle->setIcon(AddDesaturatedIcon(IconLoader::Load(QStringLiteral("media-playlist-shuffle"))));
// Remove arrow indicators
ui_->repeat->setStyleSheet("QToolButton::menu-indicator { image: none; }");
ui_->shuffle->setStyleSheet("QToolButton::menu-indicator { image: none; }");
ui_->repeat->setStyleSheet(QStringLiteral("QToolButton::menu-indicator { image: none; }"));
ui_->shuffle->setStyleSheet(QStringLiteral("QToolButton::menu-indicator { image: none; }"));
settings_->set_group(kSettingsGroup);
@@ -93,8 +93,8 @@ PlaylistSequence::~PlaylistSequence() {
void PlaylistSequence::Load() {
loading_ = true; // Stops these setter functions calling Save()
SetShuffleMode(static_cast<ShuffleMode>(settings_->value("shuffle_mode", static_cast<int>(ShuffleMode::Off)).toInt()));
SetRepeatMode(static_cast<RepeatMode>(settings_->value("repeat_mode", static_cast<int>(RepeatMode::Off)).toInt()));
SetShuffleMode(static_cast<ShuffleMode>(settings_->value(QStringLiteral("shuffle_mode"), static_cast<int>(ShuffleMode::Off)).toInt()));
SetRepeatMode(static_cast<RepeatMode>(settings_->value(QStringLiteral("repeat_mode"), static_cast<int>(RepeatMode::Off)).toInt()));
loading_ = false;
}
@@ -103,8 +103,8 @@ void PlaylistSequence::Save() {
if (loading_) return;
settings_->setValue("shuffle_mode", static_cast<int>(shuffle_mode_));
settings_->setValue("repeat_mode", static_cast<int>(repeat_mode_));
settings_->setValue(QStringLiteral("shuffle_mode"), static_cast<int>(shuffle_mode_));
settings_->setValue(QStringLiteral("repeat_mode"), static_cast<int>(repeat_mode_));
}

16
src/playlist/playlisttabbar.cpp
View File

@@ -75,10 +75,10 @@ PlaylistTabBar::PlaylistTabBar(QWidget *parent)
setUsesScrollButtons(true);
setTabsClosable(true);
action_star_ = menu_->addAction(IconLoader::Load("star"), tr("Star playlist"), this, &PlaylistTabBar::StarSlot);
action_close_ = menu_->addAction(IconLoader::Load("list-remove"), tr("Close playlist"), this, &PlaylistTabBar::CloseSlot);
action_rename_ = menu_->addAction(IconLoader::Load("edit-rename"), tr("Rename playlist..."), this, &PlaylistTabBar::RenameSlot);
action_save_ = menu_->addAction(IconLoader::Load("document-save"), tr("Save playlist..."), this, &PlaylistTabBar::SaveSlot);
action_star_ = menu_->addAction(IconLoader::Load(QStringLiteral("star")), tr("Star playlist"), this, &PlaylistTabBar::StarSlot);
action_close_ = menu_->addAction(IconLoader::Load(QStringLiteral("list-remove")), tr("Close playlist"), this, &PlaylistTabBar::CloseSlot);
action_rename_ = menu_->addAction(IconLoader::Load(QStringLiteral("edit-rename")), tr("Rename playlist..."), this, &PlaylistTabBar::RenameSlot);
action_save_ = menu_->addAction(IconLoader::Load(QStringLiteral("document-save")), tr("Save playlist..."), this, &PlaylistTabBar::SaveSlot);
menu_->addSeparator();
rename_editor_->setVisible(false);
@@ -159,7 +159,7 @@ void PlaylistTabBar::mouseDoubleClickEvent(QMouseEvent *e) {
else {
menu_index_ = index;
QString new_text = tabText(index);
new_text = new_text.replace("&&", "&");
new_text = new_text.replace(QLatin1String("&&"), QLatin1String("&"));
rename_editor_->setGeometry(tabRect(index));
rename_editor_->setText(new_text);
rename_editor_->setVisible(true);
@@ -176,7 +176,7 @@ void PlaylistTabBar::RenameSlot() {
if (menu_index_ == -1) return;
QString name = tabText(menu_index_);
name = name.replace("&&", "&");
name = name.replace(QLatin1String("&&"), QLatin1String("&"));
QString new_name = QInputDialog::getText(this, tr("Rename playlist"), tr("Enter a new name for this playlist"), QLineEdit::Normal, name);
if (new_name.isEmpty()) return;
@@ -332,7 +332,7 @@ void PlaylistTabBar::RemoveTab(const int id) {
void PlaylistTabBar::set_text_by_id(const int id, const QString &text) {
QString new_text = text;
new_text = new_text.replace("&", "&&");
new_text = new_text.replace(QLatin1String("&"), QLatin1String("&&"));
setTabText(index_of(id), new_text);
setTabToolTip(index_of(id), text);
@@ -346,7 +346,7 @@ void PlaylistTabBar::InsertTab(const int id, const int index, const QString &tex
QString new_text = text;
if (new_text.contains('&')) {
new_text = new_text.replace('&', "&&");
new_text = new_text.replace('&', QLatin1String("&&"));
}
suppress_current_changed_ = true;

20
src/playlist/playlistview.cpp
View File

@@ -127,8 +127,8 @@ PlaylistView::PlaylistView(QWidget *parent)
inhibit_autoscroll_(false),
currently_autoscrolling_(false),
row_height_(-1),
currenttrack_play_(":/pictures/currenttrack_play.png"),
currenttrack_pause_(":/pictures/currenttrack_pause.png"),
currenttrack_play_(QStringLiteral(":/pictures/currenttrack_play.png")),
currenttrack_pause_(QStringLiteral(":/pictures/currenttrack_pause.png")),
cached_current_row_row_(-1),
drop_indicator_row_(-1),
drag_over_(false),
@@ -219,8 +219,8 @@ void PlaylistView::SetItemDelegates() {
setItemDelegateForColumn(Playlist::Column_DateCreated, new DateItemDelegate(this));
setItemDelegateForColumn(Playlist::Column_DateModified, new DateItemDelegate(this));
setItemDelegateForColumn(Playlist::Column_Samplerate, new PlaylistDelegateBase(this, ("Hz")));
setItemDelegateForColumn(Playlist::Column_Bitdepth, new PlaylistDelegateBase(this, ("Bit")));
setItemDelegateForColumn(Playlist::Column_Samplerate, new PlaylistDelegateBase(this, tr("Hz")));
setItemDelegateForColumn(Playlist::Column_Bitdepth, new PlaylistDelegateBase(this, tr("Bit")));
setItemDelegateForColumn(Playlist::Column_Bitrate, new PlaylistDelegateBase(this, tr("kbps")));
setItemDelegateForColumn(Playlist::Column_Filename, new NativeSeparatorsDelegate(this));
@@ -404,9 +404,9 @@ void PlaylistView::RestoreHeaderState() {
void PlaylistView::ReloadBarPixmaps() {
currenttrack_bar_left_ = LoadBarPixmap(":/pictures/currenttrack_bar_left.png", true);
currenttrack_bar_mid_ = LoadBarPixmap(":/pictures/currenttrack_bar_mid.png", false);
currenttrack_bar_right_ = LoadBarPixmap(":/pictures/currenttrack_bar_right.png", true);
currenttrack_bar_left_ = LoadBarPixmap(QStringLiteral(":/pictures/currenttrack_bar_left.png"), true);
currenttrack_bar_mid_ = LoadBarPixmap(QStringLiteral(":/pictures/currenttrack_bar_mid.png"), false);
currenttrack_bar_right_ = LoadBarPixmap(QStringLiteral(":/pictures/currenttrack_bar_right.png"), true);
}
@@ -452,8 +452,8 @@ QList<QPixmap> PlaylistView::LoadBarPixmap(const QString &filename, const bool k
void PlaylistView::LoadTinyPlayPausePixmaps(const int desired_size) {
QImage image_play = QImage(":/pictures/tiny-play.png").scaled(desired_size, desired_size, Qt::KeepAspectRatio, Qt::SmoothTransformation);
QImage image_pause = QImage(":/pictures/tiny-pause.png").scaled(desired_size, desired_size, Qt::KeepAspectRatio, Qt::SmoothTransformation);
QImage image_play = QImage(QStringLiteral(":/pictures/tiny-play.png")).scaled(desired_size, desired_size, Qt::KeepAspectRatio, Qt::SmoothTransformation);
QImage image_pause = QImage(QStringLiteral(":/pictures/tiny-pause.png")).scaled(desired_size, desired_size, Qt::KeepAspectRatio, Qt::SmoothTransformation);
pixmap_tinyplay_ = QPixmap::fromImage(image_play);
pixmap_tinypause_ = QPixmap::fromImage(image_pause);
@@ -1397,7 +1397,7 @@ void PlaylistView::CopyCurrentSongToClipboard() const {
QMimeData *mime_data = new QMimeData;
mime_data->setUrls(QList<QUrl>() << url);
mime_data->setText(columns.join(" - "));
mime_data->setText(columns.join(QStringLiteral(" - ")));
QApplication::clipboard()->setMimeData(mime_data);