X-Git-Url: http://git.code-monkey.de/?a=blobdiff_plain;f=pv%2Fwidgets%2Fdecodermenu.cpp;h=28b54babdfb9aad3c0e67e2a732b22ac79cbe918;hb=baef263a884ee4ff4d3dd15cd4d334fa9178b090;hp=ff687e4cb85a6d279d5a532b73c9ba35cebbb92d;hpb=76868203e56032aa21d7909b5fd72c50b5505615;p=pulseview.git
diff --git a/pv/widgets/decodermenu.cpp b/pv/widgets/decodermenu.cpp
index ff687e4..28b54ba 100644
--- a/pv/widgets/decodermenu.cpp
+++ b/pv/widgets/decodermenu.cpp
@@ -14,41 +14,41 @@
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+ * along with this program; if not, see .
*/
+#include
+
#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 *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);
- const bool have_probes = (d->probes || d->opt_probes) != 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);
+ g_slist_free(li);
- connect(&_mapper, SIGNAL(mapped(QObject*)),
+ 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();
assert(dec);
- decoder_selected(dec);
+ decoder_selected(dec);
}
-} // widgets
-} // pv
+} // namespace widgets
+} // namespace pv