projects
/
pulseview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
MainBar: Fix warning message introduced by bc4b9ccfc78d9d0
[pulseview.git]
/
pv
/
widgets
/
decodermenu.cpp
diff --git
a/pv/widgets/decodermenu.cpp
b/pv/widgets/decodermenu.cpp
index ff687e4cb85a6d279d5a532b73c9ba35cebbb92d..5e54589372c98373b79fef15db8a7b47ce339016 100644
(file)
--- 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
* 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 <http://www.gnu.org/licenses/>.
*/
*/
+#include <cassert>
+
#include <libsigrokdecode/libsigrokdecode.h>
#include <libsigrokdecode/libsigrokdecode.h>
-#include "decodermenu.h"
+#include "decodermenu.h
pp
"
namespace pv {
namespace widgets {
DecoderMenu::DecoderMenu(QWidget *parent, bool first_level_decoder) :
QMenu(parent),
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);
{
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 srd_decoder *const d = (srd_decoder*)l->data;
assert(d);
- const bool have_
probes = (d->probes || d->opt_probe
s) != 0;
- if (first_level_decoder == have_
probe
s) {
+ const bool have_
channels = (d->channels || d->opt_channel
s) != 0;
+ if (first_level_decoder == have_
channel
s) {
QAction *const action =
addAction(QString::fromUtf8(d->name));
action->setData(qVariantFromValue(l->data));
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()),
connect(action, SIGNAL(triggered()),
- &
_mapper
, SLOT(map()));
+ &
mapper_
, SLOT(map()));
}
}
g_slist_free(l);
}
}
g_slist_free(l);
- connect(&
_mapper
, SIGNAL(mapped(QObject*)),
+ connect(&
mapper_
, SIGNAL(mapped(QObject*)),
this, SLOT(on_action(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);
(srd_decoder*)((QAction*)action)->data().value<void*>();
assert(dec);
- decoder_selected(dec);
+ decoder_selected(dec);
}
}
-}
//
widgets
-}
//
pv
+}
// namespace
widgets
+}
// namespace
pv