X-Git-Url: http://git.code-monkey.de/?a=blobdiff_plain;f=pv%2Fprop%2Fbinding%2Fdeviceoptions.cpp;h=35541fbf8b8cca292560608c1ac9822c77fc385f;hb=819f4c25391a9c74d3d2f528d462142d5c4aad4d;hp=e8ae002bae8ba0c0339b2da1fb5f9861d71fb5c3;hpb=117ef0090a0c285369ce48bcc7e01d92faa9f329;p=pulseview.git

diff --git a/pv/prop/binding/deviceoptions.cpp b/pv/prop/binding/deviceoptions.cpp
index e8ae002..35541fb 100644
--- a/pv/prop/binding/deviceoptions.cpp
+++ b/pv/prop/binding/deviceoptions.cpp
@@ -32,8 +32,14 @@
 #include <pv/prop/enum.h>
 #include <pv/prop/int.h>
 
-using namespace boost;
-using namespace std;
+using boost::bind;
+using boost::function;
+using boost::optional;
+using boost::shared_ptr;
+using std::make_pair;
+using std::pair;
+using std::string;
+using std::vector;
 
 namespace pv {
 namespace prop {
@@ -66,7 +72,7 @@ DeviceOptions::DeviceOptions(struct sr_dev_inst *sdi) :
 		if (sr_config_list(_sdi->driver, _sdi, NULL, key, &gvar_list) != SR_OK)
 			gvar_list = NULL;
 
-		const QString name(info->name);
+		const QString name = QString::fromUtf8(info->name);
 
 		switch(key)
 		{
@@ -169,11 +175,11 @@ QString DeviceOptions::print_gvariant(GVariant *const gvar)
 	QString s;
 
 	if (g_variant_is_of_type(gvar, G_VARIANT_TYPE("s")))
-		s = QString(g_variant_get_string(gvar, NULL));
+		s = QString::fromUtf8(g_variant_get_string(gvar, NULL));
 	else
 	{
 		gchar *const text = g_variant_print(gvar, FALSE);
-		s = QString(text);
+		s = QString::fromUtf8(text);
 		g_free(text);
 	}
 
@@ -184,14 +190,14 @@ QString DeviceOptions::print_timebase(GVariant *const gvar)
 {
 	uint64_t p, q;
 	g_variant_get(gvar, "(tt)", &p, &q);
-	return QString(sr_period_string(p * q));
+	return QString::fromUtf8(sr_period_string(p * q));
 }
 
 QString DeviceOptions::print_vdiv(GVariant *const gvar)
 {
 	uint64_t p, q;
 	g_variant_get(gvar, "(tt)", &p, &q);
-	return QString(sr_voltage_string(p, q));
+	return QString::fromUtf8(sr_voltage_string(p, q));
 }
 
 QString DeviceOptions::print_voltage_threshold(GVariant *const gvar)
@@ -200,7 +206,7 @@ QString DeviceOptions::print_voltage_threshold(GVariant *const gvar)
 	char buf[64];
 	g_variant_get(gvar, "(dd)", &lo, &hi);
 	snprintf(buf, sizeof(buf), "L<%.1fV H>%.1fV", lo, hi);
-	return QString(buf);
+	return QString::fromUtf8(buf);
 }
 
 } // binding