X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=pv%2Fwidgets%2Fdecodermenu.cpp;h=28b54babdfb9aad3c0e67e2a732b22ac79cbe918;hb=HEAD;hp=9fcc0cf077c5e7a00b6a0e7ccadc0cb3e7590383;hpb=cf0a3c9c7a8763eeb4427e4fb6fe2c921ae38f09;p=pulseview.git

diff --git a/pv/widgets/decodermenu.cpp b/pv/widgets/decodermenu.cpp
index 9fcc0cf0..5cf99e52 100644
--- a/pv/widgets/decodermenu.cpp
+++ b/pv/widgets/decodermenu.cpp
@@ -30,8 +30,8 @@ DecoderMenu::DecoderMenu(QWidget *parent, const char* input, bool first_level_de
 	QMenu(parent),
 	mapper_(this)
 {
-	GSList *li = g_slist_sort(g_slist_copy(
-		(GSList*)srd_decoder_list()), decoder_name_cmp);
+	GSList *li = g_slist_sort(g_slist_copy((GSList*)srd_decoder_list()), decoder_name_cmp);
+
 	for (GSList *l = li; l; l = l->next) {
 		const srd_decoder *const d = (srd_decoder*)l->data;
 		assert(d);
@@ -50,30 +50,30 @@ DecoderMenu::DecoderMenu(QWidget *parent, const char* input, bool first_level_de
 				continue;
 		}
 
-		QAction *const action =
-			addAction(QString::fromUtf8(d->name));
-		action->setData(qVariantFromValue(l->data));
+		QAction *const action = addAction(QString::fromUtf8(d->name));
+		action->setData(QVariant::fromValue(l->data));
 		mapper_.setMapping(action, action);
-		connect(action, SIGNAL(triggered()),
-			&mapper_, SLOT(map()));
+		connect(action, SIGNAL(triggered()), &mapper_, SLOT(map()));
 	}
 	g_slist_free(li);
 
-	connect(&mapper_, SIGNAL(mapped(QObject*)),
-		this, SLOT(on_action(QObject*)));
+#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
 }
 
 int DecoderMenu::decoder_name_cmp(const void *a, const void *b)
 {
-	return strcmp(((const srd_decoder*)a)->name,
-		((const srd_decoder*)b)->name);
+	return strcmp(((const srd_decoder*)a)->name, ((const srd_decoder*)b)->name);
 }
 
 void DecoderMenu::on_action(QObject *action)
 {
 	assert(action);
-	srd_decoder *const dec =
-		(srd_decoder*)((QAction*)action)->data().value<void*>();
+
+	srd_decoder *const dec = (srd_decoder*)((QAction*)action)->data().value<void*>();
 	assert(dec);
 
 	decoder_selected(dec);