From 900cbcf001c6c309838b32d97dc3cfb0b31f5e0b Mon Sep 17 00:00:00 2001
From: Arnaud Bienner <arnaud.bienner@gmail.com>
Date: Sat, 26 Mar 2011 19:03:59 +0000
Subject: [PATCH] Using trUf8 instead of classic tr. Now displays the already
 translated strings (utf8) correctly. Fixes issue 1620

---
 src/ui/equalizer.cpp | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/ui/equalizer.cpp b/src/ui/equalizer.cpp
index a898f3438..f7e8a899c 100644
--- a/src/ui/equalizer.cpp
+++ b/src/ui/equalizer.cpp
@@ -92,7 +92,7 @@ void Equalizer::ReloadSettings() {
 
   // Selected preset
   QString selected_preset = s.value("selected_preset", "Custom").toString();
-  QString selected_preset_display_name = QString(tr(selected_preset.toStdString().c_str()));
+  QString selected_preset_display_name = QString(trUtf8(qPrintable(selected_preset)));
   int selected_index = ui_->preset->findText(selected_preset_display_name);
   if (selected_index != -1)
     ui_->preset->setCurrentIndex(selected_index);
@@ -127,7 +127,7 @@ void Equalizer::LoadDefaultPresets() {
 }
 
 void Equalizer::AddPreset(const QString& name, const Params& params) {
-  QString name_displayed = tr(name.toStdString().c_str());
+  QString name_displayed = trUtf8(qPrintable(name));
   presets_[name] = params;
   if (ui_->preset->findText(name_displayed) == -1) {
     ui_->preset->addItem(name_displayed, // name to display (translated)
@@ -164,14 +164,14 @@ void Equalizer::SavePreset() {
   QString name = SaveCurrentPreset();
   if (!name.isEmpty()) {
     last_preset_ = name;
-    ui_->preset->setCurrentIndex(ui_->preset->findText(tr(name.toStdString().c_str())));
+    ui_->preset->setCurrentIndex(ui_->preset->findText(trUtf8(qPrintable(name))));
   }
 }
 
 QString Equalizer::SaveCurrentPreset() {
   QString name = QInputDialog::getText(this, tr("Save preset"), tr("Name"),
                                        QLineEdit::Normal,
-                                       tr(last_preset_.toStdString().c_str()));
+                                       trUtf8(qPrintable(last_preset_)));;
   if (name.isEmpty())
     return QString();