X-Git-Url: http://git.code-monkey.de/?a=blobdiff_plain;f=pv%2Fview%2Flogicsignal.cpp;h=52cf4ac1ab24af7ae09051d4c30ec93e36b3c819;hb=945745012eb57cefa1ef457daf48cfffa99f9ec2;hp=7eb56da649b1ab2f68bf05c1819ffd017f5caeff;hpb=83c23cc9fa0d4501d9e6b8759251fa6337f5d491;p=pulseview.git diff --git a/pv/view/logicsignal.cpp b/pv/view/logicsignal.cpp index 7eb56da..52cf4ac 100644 --- a/pv/view/logicsignal.cpp +++ b/pv/view/logicsignal.cpp @@ -29,7 +29,7 @@ #include "view.h" #include -#include +#include #include #include #include @@ -63,8 +63,8 @@ const QColor LogicSignal::SignalColours[10] = { QColor(0xEE, 0xEE, 0xEC), // White }; -LogicSignal::LogicSignal(shared_ptr dev_inst, - sr_probe *const probe, shared_ptr data) : +LogicSignal::LogicSignal(shared_ptr dev_inst, + const sr_probe *const probe, shared_ptr data) : Signal(dev_inst, probe), _data(data), _trigger_none(NULL), @@ -248,7 +248,7 @@ void LogicSignal::populate_popup_form(QWidget *parent, QFormLayout *form) // Add the trigger actions assert(_dev_inst); - if (!(gvar = _dev_inst->list_config(NULL, SR_CONF_TRIGGER_TYPE))) + if ((gvar = _dev_inst->list_config(NULL, SR_CONF_TRIGGER_TYPE))) { const char *const trig_types = g_variant_get_string(gvar, NULL);