X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=pv%2Fprop%2Fenum.h;h=402798c08aed26a2c5b5a8c088704528b6eb5bb2;hp=02b60df5dd5ee982ace26230f89a1b2ba6e2b34c;hb=9b25892767cee1d871ac18beb025033e905b28ae;hpb=2db7704ab7ca681917b0eb091ea49378fe18c4a8

diff --git a/pv/prop/enum.h b/pv/prop/enum.h
index 02b60df5..402798c0 100644
--- a/pv/prop/enum.h
+++ b/pv/prop/enum.h
@@ -24,7 +24,6 @@
 #include <utility>
 #include <vector>
 
-#include <glib-2.0/glib.h>
 #include "property.h"
 
 class QComboBox;
@@ -35,19 +34,17 @@ namespace prop {
 class Enum : public Property
 {
 public:
-	Enum(QString name,
-		std::vector<std::pair<const void*, QString> > values,
-		boost::function<GVariant* ()> getter,
-		boost::function<void (GVariant*)> setter);
+	Enum(QString name, std::vector<std::pair<GVariant*, QString> > values,
+		Getter getter, Setter setter);
+
+	virtual ~Enum();
 
 	QWidget* get_widget(QWidget *parent);
 
 	void commit();
 
 private:
-	const std::vector< std::pair<const void*, QString> > _values;
-	boost::function<GVariant* ()> _getter;
-	boost::function<void (GVariant*)> _setter;
+	const std::vector< std::pair<GVariant*, QString> > _values;
 
 	QComboBox *_selector;
 };