X-Git-Url: http://git.code-monkey.de/?p=pulseview.git;a=blobdiff_plain;f=pv%2Ftoolbars%2Fsamplingbar.cpp;h=14990d81567704843fc08f05d7fb0ca17a40e430;hp=2350a45f8f76269f6457f67e3cf46d4652f25242;hb=4fe06f499c5dafe187832036b900354f0d1da284;hpb=a4cf020a253c8c874ed8652f38a1c61c9a4754a4

diff --git a/pv/toolbars/samplingbar.cpp b/pv/toolbars/samplingbar.cpp
index 2350a45..14990d8 100644
--- a/pv/toolbars/samplingbar.cpp
+++ b/pv/toolbars/samplingbar.cpp
@@ -109,7 +109,7 @@ SamplingBar::SamplingBar(SigSession &session, QWidget *parent) :
 }
 
 void SamplingBar::set_device_list(
-	const std::map< shared_ptr<Device>, string > &device_names,
+	const std::list< std::pair<std::shared_ptr<sigrok::Device>, std::string> > &devices,
 	shared_ptr<Device> selected)
 {
 	int selected_index = -1;
@@ -120,16 +120,16 @@ void SamplingBar::set_device_list(
 
 	_device_selector.clear();
 
-	for (auto entry : device_names) {
+	for (auto entry : devices) {
 		auto device = entry.first;
-		auto description = entry.second;
+		auto display_name = entry.second;
 
 		assert(device);
 
 		if (selected == device)
 			selected_index = _device_selector.count();
 
-		_device_selector.addItem(description.c_str(),
+		_device_selector.addItem(display_name.c_str(),
 			qVariantFromValue(device));
 	}