X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=pv%2Fmainwindow.cpp;h=9fa4eee6baa2735281a4c3e4dbfda21cc7a3bb62;hp=cc0e0d25cdf550538df677ddf762aac93804cf1c;hb=26e3af6b15f083239981729b2c3c109ed1d87ba8;hpb=51cf49fe312f92cccde3e861d357e4b459976c0d

diff --git a/pv/mainwindow.cpp b/pv/mainwindow.cpp
index cc0e0d25..9fa4eee6 100644
--- a/pv/mainwindow.cpp
+++ b/pv/mainwindow.cpp
@@ -61,7 +61,6 @@
 
 using std::list;
 using std::map;
-using std::pair;
 using std::shared_ptr;
 using std::string;
 
@@ -72,7 +71,7 @@ using sigrok::HardwareDevice;
 namespace pv {
 
 namespace view {
-class SelectableItem;
+class ViewItem;
 }
 
 const char *MainWindow::SettingOpenDirectory = "MainWindow/OpenDirectory";
@@ -411,13 +410,7 @@ void MainWindow::update_device_list()
 		devices.push_back(selected_device);
 	assert(selected_device);
 
-	list< pair< shared_ptr<Device>, string> > device_list;
-
-	for (auto device : devices)
-		device_list.push_back(make_pair(
-			device, device_manager_.get_display_name(device)));
-
-	sampling_bar_->set_device_list(device_list, selected_device);
+	sampling_bar_->set_device_list(devices, selected_device);
 }
 
 void MainWindow::closeEvent(QCloseEvent *event)