From 116bbec73eae284d4eecef2ce66f99944144155b Mon Sep 17 00:00:00 2001 From: Jonas Kvinge Date: Mon, 13 May 2024 00:05:58 +0200 Subject: [PATCH] Replace qPrintable with qUtf8Printable Fixes #1440 --- src/equalizer/equalizer.cpp | 8 ++++---- src/smartplaylists/smartplaylistsmodel.cpp | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/equalizer/equalizer.cpp b/src/equalizer/equalizer.cpp index 2d189ef0c..b0f4b6633 100644 --- a/src/equalizer/equalizer.cpp +++ b/src/equalizer/equalizer.cpp @@ -114,7 +114,7 @@ void Equalizer::ReloadSettings() { // Selected preset QString selected_preset = s.value("selected_preset", QStringLiteral("Custom")).toString(); - QString selected_preset_display_name = tr(qPrintable(selected_preset)); + QString selected_preset_display_name = tr(qUtf8Printable(selected_preset)); int selected_index = ui_->preset->findText(selected_preset_display_name); if (selected_index != -1) ui_->preset->setCurrentIndex(selected_index); @@ -160,7 +160,7 @@ void Equalizer::LoadDefaultPresets() { void Equalizer::AddPreset(const QString &name, const Params ¶ms) { - QString name_displayed = tr(qPrintable(name)); + QString name_displayed = tr(qUtf8Printable(name)); presets_[name] = params; if (ui_->preset->findText(name_displayed) == -1) { @@ -201,14 +201,14 @@ void Equalizer::SavePreset() { QString name = SaveCurrentPreset(); if (!name.isEmpty()) { last_preset_ = name; - ui_->preset->setCurrentIndex(ui_->preset->findText(tr(qPrintable(name)))); + ui_->preset->setCurrentIndex(ui_->preset->findText(tr(qUtf8Printable(name)))); } } QString Equalizer::SaveCurrentPreset() { - QString name = QInputDialog::getText(this, tr("Save preset"), tr("Name"), QLineEdit::Normal, tr(qPrintable(last_preset_))); + QString name = QInputDialog::getText(this, tr("Save preset"), tr("Name"), QLineEdit::Normal, tr(qUtf8Printable(last_preset_))); if (name.isEmpty()) { return QString(); } diff --git a/src/smartplaylists/smartplaylistsmodel.cpp b/src/smartplaylists/smartplaylistsmodel.cpp index c29d4a6f2..36365d2b2 100644 --- a/src/smartplaylists/smartplaylistsmodel.cpp +++ b/src/smartplaylists/smartplaylistsmodel.cpp @@ -160,7 +160,7 @@ void SmartPlaylistsModel::Init() { void SmartPlaylistsModel::ItemFromSmartPlaylist(const Settings &s, const bool notify) { SmartPlaylistsItem *item = new SmartPlaylistsItem(SmartPlaylistsItem::Type_SmartPlaylist, notify ? nullptr : root_); - item->display_text = tr(qPrintable(s.value("name").toString())); + item->display_text = tr(qUtf8Printable(s.value("name").toString())); item->sort_text = item->display_text; item->smart_playlist_type = PlaylistGenerator::Type(s.value("type").toInt()); item->smart_playlist_data = s.value("data").toByteArray();