X-Git-Url: http://sigrok.org/gitweb/?a=blobdiff_plain;f=pv%2Fwidgets%2Fdevicetoolbutton.cpp;h=bb18b792788cd3592eba4b46ddcb967cd17e89a7;hb=HEAD;hp=99335ca18c3afebe2145a19193f94db1d24eddc6;hpb=efdec55aec1a137460fa362a381ed1904182bfed;p=pulseview.git

diff --git a/pv/widgets/devicetoolbutton.cpp b/pv/widgets/devicetoolbutton.cpp
index 99335ca1..2e76f689 100644
--- a/pv/widgets/devicetoolbutton.cpp
+++ b/pv/widgets/devicetoolbutton.cpp
@@ -55,8 +55,13 @@ DeviceToolButton::DeviceToolButton(QWidget *parent,
 	setDefaultAction(connect_action_);
 	setMinimumWidth(QFontMetrics(font()).averageCharWidth() * 24);
 
+#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0)
+	connect(&mapper_, SIGNAL(mappedObject(QObject*)),
+		this, SLOT(on_action(QObject*)));
+#else
 	connect(&mapper_, SIGNAL(mapped(QObject*)),
 		this, SLOT(on_action(QObject*)));
+#endif
 
 	connect(&menu_, SIGNAL(hovered(QAction*)),
 		this, SLOT(on_menu_hovered(QAction*)));
@@ -91,7 +96,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 +105,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 +122,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);
@@ -157,5 +162,5 @@ void DeviceToolButton::on_menu_hover_timeout()
 	QToolTip::showText(QCursor::pos(), device_tooltip_);
 }
 
-} // widgets
-} // pv
+}  // namespace widgets
+}  // namespace pv