From: Bert Vermeulen <redacted>
Date: Mon, 1 Apr 2013 15:07:10 +0000 (+0100)
Subject: Adjust pv:prop::Enum to GVariant-based sr_config_* functions
X-Git-Tag: pulseview-0.1.0~52
X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=commitdiff_plain;h=2db7704ab7ca681917b0eb091ea49378fe18c4a8;hp=488f5d3fee3a3ec602718d59edf8a61b6888470c;ds=sidebyside

Adjust pv:prop::Enum to GVariant-based sr_config_* functions
---

diff --git a/pv/prop/enum.cpp b/pv/prop/enum.cpp
index 54fe5fed..894ba9f8 100644
--- a/pv/prop/enum.cpp
+++ b/pv/prop/enum.cpp
@@ -20,6 +20,7 @@
 
 #include <assert.h>
 
+#include <glib-2.0/glib.h>
 #include <QComboBox>
 
 #include "enum.h"
@@ -32,8 +33,8 @@ namespace prop {
 
 Enum::Enum(QString name,
 	vector<pair<const void*, QString> > values,
-	function<const void* ()> getter,
-	function<void (const void*)> setter) :
+	function<GVariant* ()> getter,
+	function<void (GVariant*)> setter) :
 	Property(name),
 	_values(values),
 	_getter(getter),
@@ -74,7 +75,7 @@ void Enum::commit()
 	if (index < 0)
 		return;
 
-	_setter(_selector->itemData(index).value<void*>());
+	_setter(_selector->itemData(index).value<GVariant*>());
 }
 
 } // prop
diff --git a/pv/prop/enum.h b/pv/prop/enum.h
index c2cc6395..02b60df5 100644
--- a/pv/prop/enum.h
+++ b/pv/prop/enum.h
@@ -24,6 +24,7 @@
 #include <utility>
 #include <vector>
 
+#include <glib-2.0/glib.h>
 #include "property.h"
 
 class QComboBox;
@@ -36,8 +37,8 @@ class Enum : public Property
 public:
 	Enum(QString name,
 		std::vector<std::pair<const void*, QString> > values,
-		boost::function<const void* ()> getter,
-		boost::function<void (const void*)> setter);
+		boost::function<GVariant* ()> getter,
+		boost::function<void (GVariant*)> setter);
 
 	QWidget* get_widget(QWidget *parent);
 
@@ -45,8 +46,8 @@ public:
 
 private:
 	const std::vector< std::pair<const void*, QString> > _values;
-	boost::function<const void* ()> _getter;
-	boost::function<void (const void*)> _setter;
+	boost::function<GVariant* ()> _getter;
+	boost::function<void (GVariant*)> _setter;
 
 	QComboBox *_selector;
 };