Added some missing fromUtf8s

This fixes the issues mentioned in #307

diff --git a/pv/prop/binding/decoderoptions.cpp b/pv/prop/binding/decoderoptions.cpp
index e29436768ab499d8364790cd9605335b00f810ad..8738300ee9550007486c2b81f2fee1749f0293c5 100644 (file)
--- a/pv/prop/binding/decoderoptions.cpp
+++ b/pv/prop/binding/decoderoptions.cpp
@@ -57,7 +57,7 @@ DecoderOptions::DecoderOptions(
                const srd_decoder_option *const opt =
                        (srd_decoder_option*)l->data;
 
                const srd_decoder_option *const opt =
                        (srd_decoder_option*)l->data;
 

-               const QString name(opt->desc);
+               const QString name = QString::fromUtf8(opt->desc);

 
                const Property::Getter getter = bind(
                        &DecoderOptions::getter, this, opt->id);
 
                const Property::Getter getter = bind(
                        &DecoderOptions::getter, this, opt->id);

diff --git a/pv/view/decodetrace.cpp b/pv/view/decodetrace.cpp
index 2ec84481b407c847996ca3c69e22075997b883c6..d27f1ae01796a06c20e82eeba18ef3005f69ab3d 100644 (file)
--- a/pv/view/decodetrace.cpp
+++ b/pv/view/decodetrace.cpp
@@ -494,7 +494,8 @@ void DecodeTrace::create_decoder_form(int index,
                connect(combo, SIGNAL(currentIndexChanged(int)),
                        this, SLOT(on_probe_selected(int)));
                decoder_form->addRow(tr("<b>%1</b> (%2) *")
                connect(combo, SIGNAL(currentIndexChanged(int)),
                        this, SLOT(on_probe_selected(int)));
                decoder_form->addRow(tr("<b>%1</b> (%2) *")

-                       .arg(p->name).arg(p->desc), combo);
+                       .arg(QString::fromUtf8(p->name))
+                       .arg(QString::fromUtf8(p->desc)), combo);

 
                const ProbeSelector s = {combo, dec, p};
                _probe_selectors.push_back(s);
 
                const ProbeSelector s = {combo, dec, p};
                _probe_selectors.push_back(s);


@@ -508,7 +509,8 @@ void DecodeTrace::create_decoder_form(int index,
                connect(combo, SIGNAL(currentIndexChanged(int)),
                        this, SLOT(on_probe_selected(int)));
                decoder_form->addRow(tr("<b>%1</b> (%2)")
                connect(combo, SIGNAL(currentIndexChanged(int)),
                        this, SLOT(on_probe_selected(int)));
                decoder_form->addRow(tr("<b>%1</b> (%2)")

-                       .arg(p->name).arg(p->desc), combo);
+                       .arg(QString::fromUtf8(p->name))
+                       .arg(QString::fromUtf8(p->desc)), combo);

 
                const ProbeSelector s = {combo, dec, p};
                _probe_selectors.push_back(s);
 
                const ProbeSelector s = {combo, dec, p};
                _probe_selectors.push_back(s);