projects
/
pulseview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Rename 'probe' to 'channel' (libsigrokdecode change).
[pulseview.git]
/
pv
/
view
/
decodetrace.h
diff --git
a/pv/view/decodetrace.h
b/pv/view/decodetrace.h
index 642f2a0ed4394cec7d2c90f67548f4d027e0396b..9a991fcb436c63596fb3c2d3cedd9fff4b7a3aa3 100644
(file)
--- a/
pv/view/decodetrace.h
+++ b/
pv/view/decodetrace.h
@@
-32,7
+32,7
@@
#include <pv/prop/binding/decoderoptions.h>
#include <pv/prop/binding/decoderoptions.h>
-struct srd_
probe
;
+struct srd_
channel
;
struct srd_decoder;
class QComboBox;
struct srd_decoder;
class QComboBox;
@@
-66,7
+66,7
@@
private:
{
const QComboBox *_combo;
const boost::shared_ptr<pv::data::decode::Decoder> _decoder;
{
const QComboBox *_combo;
const boost::shared_ptr<pv::data::decode::Decoder> _decoder;
- const srd_
probe *_probe
;
+ const srd_
channel *_pdch
;
};
private:
};
private:
@@
-148,7
+148,7
@@
private:
QComboBox* create_probe_selector(QWidget *parent,
const boost::shared_ptr<pv::data::decode::Decoder> &dec,
QComboBox* create_probe_selector(QWidget *parent,
const boost::shared_ptr<pv::data::decode::Decoder> &dec,
- const srd_
probe *const probe
);
+ const srd_
channel *const pdch
);
void commit_decoder_probes(
boost::shared_ptr<data::decode::Decoder> &dec);
void commit_decoder_probes(
boost::shared_ptr<data::decode::Decoder> &dec);