Replaced boost::bind with C++11 lambdas

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

diff --git a/pv/prop/binding/deviceoptions.h b/pv/prop/binding/deviceoptions.h
index f27823bdf08d8a0a10be5a466cae13cd446003aa..a1efd06a3fbc0bed6e42aec944f3315d1b7e3c49 100644 (file)
--- a/pv/prop/binding/deviceoptions.h
+++ b/pv/prop/binding/deviceoptions.h
@@ -21,46 +21,52 @@
 #ifndef PULSEVIEW_PV_PROP_BINDING_DEVICEOPTIONS_H
 #define PULSEVIEW_PV_PROP_BINDING_DEVICEOPTIONS_H
 
-#include <boost/function.hpp>
 #include <boost/optional.hpp>
 
 #include <QString>
 
-#include <libsigrok/libsigrok.h>
+#include <glib.h>
 
 #include "binding.h"
 
+#include <pv/prop/property.h>
+
+struct sr_dev_inst;
+struct sr_channel_group;
+
 namespace pv {
+
+namespace device {
+class DevInst;
+}
+
 namespace prop {
 namespace binding {
 
 class DeviceOptions : public Binding
 {
 public:
-       DeviceOptions(const sr_dev_inst *sdi);
+       DeviceOptions(std::shared_ptr<pv::device::DevInst> dev_inst,
+               const sr_channel_group *group = NULL);
 
 private:
-
-       static GVariant* config_getter(
-               const struct sr_dev_inst *sdi, int key);
-       static void config_setter(
-               const struct sr_dev_inst *sdi, int key, GVariant* value);
-
-       void bind_bool(const QString &name, int key);
+       void bind_bool(const QString &name,
+               Property::Getter getter, Property::Setter setter);
        void bind_enum(const QString &name, int key,
                GVariant *const gvar_list,
-               boost::function<QString (GVariant*)> printer = print_gvariant);
-       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);
+               Property::Getter getter, Property::Setter setter,
+               std::function<QString (GVariant*)> printer = print_gvariant);
+       void bind_int(const QString &name, QString suffix,
+               boost::optional< std::pair<int64_t, int64_t> > range,
+               Property::Getter getter, Property::Setter setter);
 
        static QString print_timebase(GVariant *const gvar);
        static QString print_vdiv(GVariant *const gvar);
        static QString print_voltage_threshold(GVariant *const gvar);
 
 protected:
-       const sr_dev_inst *const _sdi;
+       std::shared_ptr<device::DevInst> _dev_inst;
+       const sr_channel_group *const _group;
 };
 
 } // binding