X-Git-Url: http://git.code-monkey.de/?a=blobdiff_plain;f=pv%2Ftoolbars%2Fsamplingbar.cpp;h=ca0450b43c2f751aff4b9f93383819ef1dfe2a2e;hb=819f4c25391a9c74d3d2f528d462142d5c4aad4d;hp=db7e8e0b1a1dc330397099ea0cfb63794db093a6;hpb=32c81aef875696bdd1b933e20ab91703ad63203d;p=pulseview.git

diff --git a/pv/toolbars/samplingbar.cpp b/pv/toolbars/samplingbar.cpp
index db7e8e0..ca0450b 100644
--- a/pv/toolbars/samplingbar.cpp
+++ b/pv/toolbars/samplingbar.cpp
@@ -34,7 +34,7 @@
 #include <pv/devicemanager.h>
 #include <pv/popups/deviceoptions.h>
 
-using namespace std;
+using std::string;
 
 namespace pv {
 namespace toolbars {
@@ -92,7 +92,7 @@ SamplingBar::SamplingBar(SigSession &session, QWidget *parent) :
 	{
 		const uint64_t &l = RecordLengths[i];
 		char *const text = sr_si_string_u64(l, " samples");
-		_record_length_selector.addItem(QString(text),
+		_record_length_selector.addItem(QString::fromUtf8(text),
 			qVariantFromValue(l));
 		g_free(text);
 
@@ -219,7 +219,7 @@ void SamplingBar::update_sample_rate_selector()
 		for (unsigned int i = 0; i < num_elements; i++)
 		{
 			char *const s = sr_samplerate_string(elements[i]);
-			_sample_rate_list.addItem(QString(s),
+			_sample_rate_list.addItem(QString::fromUtf8(s),
 				qVariantFromValue(elements[i]));
 			g_free(s);
 		}
@@ -303,7 +303,7 @@ void SamplingBar::commit_sample_rate()
 
 void SamplingBar::on_device_selected()
 {
-	using namespace pv::popups;
+	using pv::popups::DeviceOptions;
 
 	if (_updating_device_selector)
 		return;