X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=pv%2Fwidgets%2Fdevicetoolbutton.cpp;h=d700b8b57cc0bdf471452ab6a8806e787c63f19c;hp=bb18b792788cd3592eba4b46ddcb967cd17e89a7;hb=009fc9ae42ecccd3802f549b39c19a2ba895959d;hpb=870ea3dbf35b182e120c5d84ab89bf9cb7691232

diff --git a/pv/widgets/devicetoolbutton.cpp b/pv/widgets/devicetoolbutton.cpp
index bb18b792..d700b8b5 100644
--- a/pv/widgets/devicetoolbutton.cpp
+++ b/pv/widgets/devicetoolbutton.cpp
@@ -91,7 +91,7 @@ void DeviceToolButton::update_device_list()
 	menu_.setDefaultAction(connect_action_);
 	menu_.addSeparator();
 
-	for (weak_ptr<Device> dev_weak_ptr : devices_) {
+	for (weak_ptr<Device>& dev_weak_ptr : devices_) {
 		shared_ptr<Device> dev(dev_weak_ptr.lock());
 		if (!dev)
 			continue;
@@ -100,7 +100,7 @@ void DeviceToolButton::update_device_list()
 			dev->display_name(device_manager_)), this);
 		a->setCheckable(true);
 		a->setChecked(selected_device_ == dev);
-		a->setData(qVariantFromValue((void*)dev.get()));
+		a->setData(QVariant::fromValue((void*)dev.get()));
 		a->setToolTip(QString::fromStdString(dev->full_name()));
 		mapper_.setMapping(a, a);
 
@@ -117,7 +117,7 @@ void DeviceToolButton::on_action(QObject *action)
 	selected_device_.reset();
 
 	Device *const dev = (Device*)((QAction*)action)->data().value<void*>();
-	for (weak_ptr<Device> dev_weak_ptr : devices_) {
+	for (weak_ptr<Device>& dev_weak_ptr : devices_) {
 		shared_ptr<Device> dev_ptr(dev_weak_ptr);
 		if (dev_ptr.get() == dev) {
 			selected_device_ = shared_ptr<Device>(dev_ptr);