X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=pv%2Fwidgets%2Fdecodermenu.cpp;h=7da77bd3bb08c922bd47d95e9fad480b07fab30f;hp=b90c86d7403e3df7bc7e2848d84d2579bbd74126;hb=7e0c99bf95836c89574b53ae3fa7840e2ddca77d;hpb=943edd769f24a5a17df4f0b5e94d92b1b19c8300 diff --git a/pv/widgets/decodermenu.cpp b/pv/widgets/decodermenu.cpp index b90c86d7..7da77bd3 100644 --- a/pv/widgets/decodermenu.cpp +++ b/pv/widgets/decodermenu.cpp @@ -22,35 +22,34 @@ #include -#include "decodermenu.h" +#include "decodermenu.hpp" namespace pv { namespace widgets { DecoderMenu::DecoderMenu(QWidget *parent, bool first_level_decoder) : QMenu(parent), - _mapper(this) + mapper_(this) { GSList *l = g_slist_sort(g_slist_copy( (GSList*)srd_decoder_list()), decoder_name_cmp); - for(; l; l = l->next) - { + for (; l; l = l->next) { const srd_decoder *const d = (srd_decoder*)l->data; assert(d); - const bool have_probes = (d->channels || d->opt_channels) != 0; - if (first_level_decoder == have_probes) { + const bool have_channels = (d->channels || d->opt_channels) != 0; + if (first_level_decoder == have_channels) { QAction *const action = addAction(QString::fromUtf8(d->name)); action->setData(qVariantFromValue(l->data)); - _mapper.setMapping(action, action); + mapper_.setMapping(action, action); connect(action, SIGNAL(triggered()), - &_mapper, SLOT(map())); + &mapper_, SLOT(map())); } } g_slist_free(l); - connect(&_mapper, SIGNAL(mapped(QObject*)), + connect(&mapper_, SIGNAL(mapped(QObject*)), this, SLOT(on_action(QObject*))); }