projects
/
pulseview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Moved DevInst into the pv::device namespace
[pulseview.git]
/
pv
/
view
/
logicsignal.cpp
diff --git
a/pv/view/logicsignal.cpp
b/pv/view/logicsignal.cpp
index 7eb56da649b1ab2f68bf05c1819ffd017f5caeff..52cf4ac1ab24af7ae09051d4c30ec93e36b3c819 100644
(file)
--- a/
pv/view/logicsignal.cpp
+++ b/
pv/view/logicsignal.cpp
@@
-29,7
+29,7
@@
#include "view.h"
#include <pv/sigsession.h>
#include "view.h"
#include <pv/sigsession.h>
-#include <pv/devinst.h>
+#include <pv/devi
ce/devi
nst.h>
#include <pv/data/logic.h>
#include <pv/data/logicsnapshot.h>
#include <pv/view/view.h>
#include <pv/data/logic.h>
#include <pv/data/logicsnapshot.h>
#include <pv/view/view.h>
@@
-63,8
+63,8
@@
const QColor LogicSignal::SignalColours[10] = {
QColor(0xEE, 0xEE, 0xEC), // White
};
QColor(0xEE, 0xEE, 0xEC), // White
};
-LogicSignal::LogicSignal(shared_ptr<pv::DevInst> dev_inst,
- sr_probe *const probe, shared_ptr<data::Logic> data) :
+LogicSignal::LogicSignal(shared_ptr<pv::
device::
DevInst> dev_inst,
+
const
sr_probe *const probe, shared_ptr<data::Logic> data) :
Signal(dev_inst, probe),
_data(data),
_trigger_none(NULL),
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);
// 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);
{
const char *const trig_types =
g_variant_get_string(gvar, NULL);