Moved DevInst into the pv::device namespace

[pulseview.git] / pv / prop / binding / deviceoptions.h

diff --git a/pv/prop/binding/deviceoptions.h b/pv/prop/binding/deviceoptions.h
index ca27a5b7fc69590654316bf08645eb4cf638d1e1..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 device {
 class DevInst;
+}
 
 namespace prop {
 namespace binding {
@@ -43,17 +45,10 @@ namespace binding {
 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:
-
-       static GVariant* config_getter(
-               const sr_dev_inst *sdi, const sr_probe_group *group, int key);
-       static void config_setter(
-               const sr_dev_inst *sdi, const sr_probe_group *group, int key,
-               GVariant* value);
-
        void bind_bool(const QString &name, int key);
        void bind_enum(const QString &name, int key,
                GVariant *const gvar_list,
@@ -68,7 +63,7 @@ private:
        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;
 };