X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=pv%2Fprop%2Fbinding%2Fdeviceoptions.h;h=a1efd06a3fbc0bed6e42aec944f3315d1b7e3c49;hp=445361fd6f80467421d2e90c303719643862268f;hb=6db7315814ee9d2f92d4b326be7c5b9e6e4b789b;hpb=2445160a5d1eb98196d2a1d57246d4c37dd13811

diff --git a/pv/prop/binding/deviceoptions.h b/pv/prop/binding/deviceoptions.h
index 445361fd..a1efd06a 100644
--- a/pv/prop/binding/deviceoptions.h
+++ b/pv/prop/binding/deviceoptions.h
@@ -21,14 +21,15 @@
 #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 <glib.h>
+
 #include "binding.h"
 
-#include <glib.h>
+#include <pv/prop/property.h>
 
 struct sr_dev_inst;
 struct sr_channel_group;
@@ -45,23 +46,26 @@ namespace binding {
 class DeviceOptions : public Binding
 {
 public:
-	DeviceOptions(boost::shared_ptr<pv::device::DevInst> dev_inst,
+	DeviceOptions(std::shared_ptr<pv::device::DevInst> dev_inst,
 		const sr_channel_group *group = NULL);
 
 private:
-	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);
+		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:
-	boost::shared_ptr<device::DevInst> _dev_inst;
+	std::shared_ptr<device::DevInst> _dev_inst;
 	const sr_channel_group *const _group;
 };