projects
/
pulseview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Update for 'probe_group' -> 'channel_group' rename in libsigrok.
[pulseview.git]
/
pv
/
prop
/
binding
/
deviceoptions.h
diff --git
a/pv/prop/binding/deviceoptions.h
b/pv/prop/binding/deviceoptions.h
index 8814dc344015dbf748d27b746e29bb3a435a3919..445361fd6f80467421d2e90c303719643862268f 100644
(file)
--- a/
pv/prop/binding/deviceoptions.h
+++ b/
pv/prop/binding/deviceoptions.h
@@
-31,11
+31,13
@@
#include <glib.h>
struct sr_dev_inst;
#include <glib.h>
struct sr_dev_inst;
-struct sr_
probe
_group;
+struct sr_
channel
_group;
namespace pv {
namespace pv {
+namespace device {
class DevInst;
class DevInst;
+}
namespace prop {
namespace binding {
namespace prop {
namespace binding {
@@
-43,8
+45,8
@@
namespace binding {
class DeviceOptions : public Binding
{
public:
class DeviceOptions : public Binding
{
public:
- DeviceOptions(boost::shared_ptr<pv::DevInst> dev_inst,
- const sr_
probe
_group *group = NULL);
+ DeviceOptions(boost::shared_ptr<pv::
device::
DevInst> dev_inst,
+ const sr_
channel
_group *group = NULL);
private:
void bind_bool(const QString &name, int key);
private:
void bind_bool(const QString &name, int key);
@@
-54,15
+56,13
@@
private:
void bind_int(const QString &name, int key, QString suffix,
boost::optional< std::pair<int64_t, int64_t> > range);
void bind_int(const QString &name, int key, QString suffix,
boost::optional< std::pair<int64_t, int64_t> > range);
- static QString print_gvariant(GVariant *const gvar);
-
static QString print_timebase(GVariant *const gvar);
static QString print_vdiv(GVariant *const gvar);
static QString print_voltage_threshold(GVariant *const gvar);
protected:
static QString print_timebase(GVariant *const gvar);
static QString print_vdiv(GVariant *const gvar);
static QString print_voltage_threshold(GVariant *const gvar);
protected:
- boost::shared_ptr<DevInst> _dev_inst;
- const sr_
probe
_group *const _group;
+ boost::shared_ptr<
device::
DevInst> _dev_inst;
+ const sr_
channel
_group *const _group;
};
} // binding
};
} // binding