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

diff --git a/pv/widgets/decodermenu.cpp b/pv/widgets/decodermenu.cpp
index e3a95333..28b54bab 100644
--- a/pv/widgets/decodermenu.cpp
+++ b/pv/widgets/decodermenu.cpp
@@ -30,9 +30,9 @@ DecoderMenu::DecoderMenu(QWidget *parent, bool first_level_decoder) :
 	QMenu(parent),
 	mapper_(this)
 {
-	GSList *l = g_slist_sort(g_slist_copy(
+	GSList *li = g_slist_sort(g_slist_copy(
 		(GSList*)srd_decoder_list()), decoder_name_cmp);
-	for (; l; l = l->next) {
+	for (GSList *l = li; l; l = l->next) {
 		const srd_decoder *const d = (srd_decoder*)l->data;
 		assert(d);
 
@@ -46,7 +46,7 @@ DecoderMenu::DecoderMenu(QWidget *parent, bool first_level_decoder) :
 				&mapper_, SLOT(map()));
 		}
 	}
-	g_slist_free(l);
+	g_slist_free(li);
 
 	connect(&mapper_, SIGNAL(mapped(QObject*)),
 		this, SLOT(on_action(QObject*)));
@@ -65,8 +65,8 @@ void DecoderMenu::on_action(QObject *action)
 		(srd_decoder*)((QAction*)action)->data().value<void*>();
 	assert(dec);
 
-	decoder_selected(dec);	
+	decoder_selected(dec);
 }
 
-} // widgets
-} // pv
+}  // namespace widgets
+}  // namespace pv