projects
/
pulseview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Use boost::filesystem::path to get the filename from a path
[pulseview.git]
/
pv
/
prop
/
binding
/
deviceoptions.h
diff --git
a/pv/prop/binding/deviceoptions.h
b/pv/prop/binding/deviceoptions.h
index 8814dc344015dbf748d27b746e29bb3a435a3919..4a6eff2eb1694f07ef61aa43b7feef2d95f191e2 100644
(file)
--- a/
pv/prop/binding/deviceoptions.h
+++ b/
pv/prop/binding/deviceoptions.h
@@
-35,7
+35,9
@@
struct sr_probe_group;
namespace pv {
namespace pv {
+namespace device {
class DevInst;
class DevInst;
+}
namespace prop {
namespace binding {
namespace prop {
namespace binding {
@@
-43,7
+45,7
@@
namespace binding {
class DeviceOptions : public Binding
{
public:
class DeviceOptions : public Binding
{
public:
- DeviceOptions(boost::shared_ptr<pv::DevInst> dev_inst,
+ DeviceOptions(boost::shared_ptr<pv::
device::
DevInst> dev_inst,
const sr_probe_group *group = NULL);
private:
const sr_probe_group *group = NULL);
private:
@@
-61,7
+63,7
@@
private:
static QString print_voltage_threshold(GVariant *const gvar);
protected:
static QString print_voltage_threshold(GVariant *const gvar);
protected:
- boost::shared_ptr<DevInst> _dev_inst;
+ boost::shared_ptr<
device::
DevInst> _dev_inst;
const sr_probe_group *const _group;
};
const sr_probe_group *const _group;
};