From: Joel Holdsworth <redacted>
Date: Sat, 8 Feb 2014 16:13:17 +0000 (+0000)
Subject: Added some missing fromUtf8s
X-Git-Tag: pulseview-0.2.0~85
X-Git-Url: https://sigrok.org/gitaction?a=commitdiff_plain;h=636782c1f942d1acdb56a0561c2e0fd52cc39ddb;p=pulseview.git

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 e2943676..8738300e 100644
--- 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 QString name(opt->desc);
+		const QString name = QString::fromUtf8(opt->desc);
 
 		const Property::Getter getter = bind(
 			&DecoderOptions::getter, this, opt->id);
diff --git a/pv/view/decodetrace.cpp b/pv/view/decodetrace.cpp
index 2ec84481..d27f1ae0 100644
--- 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) *")
-			.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);
@@ -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)")
-			.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);