X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=pv%2Fpopups%2Fchannels.cpp;h=ce2e8e98e08e0f7f3e88356b68ddce4aad1d4c66;hb=ef6cbaa21144ff25a74d5940bbe1c11ab2717e42;hp=842a19d29305ba3db38de9a43f096ba22da45490;hpb=49fee853b3f56ba78810260c71c3c402067f09fe;p=pulseview.git

diff --git a/pv/popups/channels.cpp b/pv/popups/channels.cpp
index 842a19d2..ce2e8e98 100644
--- a/pv/popups/channels.cpp
+++ b/pv/popups/channels.cpp
@@ -158,8 +158,13 @@ Channels::Channels(Session &session, QWidget *parent) :
 	layout_.addRow(&filter_buttons_bar_);
 
 	// Connect the check-box signal mapper
+#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0)
+	connect(&check_box_mapper_, SIGNAL(mappedObject(QObject*)),
+		this, SLOT(on_channel_checked(QObject*)));
+#else
 	connect(&check_box_mapper_, SIGNAL(mapped(QWidget*)),
 		this, SLOT(on_channel_checked(QWidget*)));
+#endif
 }
 
 void Channels::set_all_channels(bool set)
@@ -333,11 +338,9 @@ void Channels::showEvent(QShowEvent *event)
 	for (auto& entry : device->channel_groups()) {
 		const shared_ptr<ChannelGroup> group = entry.second;
 
-		try {
-			QLabel* label = group_label_map_.at(group);
+		if (group_label_map_.count(group) > 0) {
+			QLabel* label = group_label_map_[group];
 			label->setText(QString("<h3>%1</h3>").arg(group->name().c_str()));
-		} catch (out_of_range&) {
-			// Do nothing
 		}
 	}
 
@@ -356,7 +359,11 @@ void Channels::showEvent(QShowEvent *event)
 	updating_channels_ = false;
 }
 
+#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0)
+void Channels::on_channel_checked(QObject *widget)
+#else
 void Channels::on_channel_checked(QWidget *widget)
+#endif
 {
 	if (updating_channels_)
 		return;