X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=pv%2Fprop%2Fbinding%2Fdeviceoptions.h;h=1e422f67161d48d8349970cc4f04a52499073cae;hp=341d3d93ded3973b895aa2e5a29f383109b09adf;hb=d23445348bf04a698e062a3b917360313ecbcaad;hpb=5b1994c45194a95069dfcadf637723f3db8249da

diff --git a/pv/prop/binding/deviceoptions.h b/pv/prop/binding/deviceoptions.h
index 341d3d93..1e422f67 100644
--- a/pv/prop/binding/deviceoptions.h
+++ b/pv/prop/binding/deviceoptions.h
@@ -21,7 +21,6 @@
 #ifndef PULSEVIEW_PV_PROP_BINDING_DEVICEOPTIONS_H
 #define PULSEVIEW_PV_PROP_BINDING_DEVICEOPTIONS_H
 
-#include <boost/function.hpp>
 #include <boost/optional.hpp>
 
 #include <QString>
@@ -31,7 +30,7 @@
 #include <glib.h>
 
 struct sr_dev_inst;
-struct sr_probe_group;
+struct sr_channel_group;
 
 namespace pv {
 
@@ -45,14 +44,14 @@ namespace binding {
 class DeviceOptions : public Binding
 {
 public:
-	DeviceOptions(boost::shared_ptr<pv::device::DevInst> dev_inst,
-		const sr_probe_group *group = NULL);
+	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_enum(const QString &name, int key,
 		GVariant *const gvar_list,
-		boost::function<QString (GVariant*)> printer = print_gvariant);
+		std::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);
 
@@ -61,8 +60,8 @@ private:
 	static QString print_voltage_threshold(GVariant *const gvar);
 
 protected:
-	boost::shared_ptr<device::DevInst> _dev_inst;
-	const sr_probe_group *const _group;
+	std::shared_ptr<device::DevInst> _dev_inst;
+	const sr_channel_group *const _group;
 };
 
 } // binding