X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=pv%2Fprop%2Fenum.cpp;h=2249b570851fd183aeb943cb857923584902608a;hp=54fe5fedca8284b15dc2f051a44a7f5e3e1dba22;hb=628749849145b9bb2efab38d70962c40b0cf9d13;hpb=793f8096c486d0fba871227d9772a510f7496c08

diff --git a/pv/prop/enum.cpp b/pv/prop/enum.cpp
index 54fe5fed..2249b570 100644
--- a/pv/prop/enum.cpp
+++ b/pv/prop/enum.cpp
@@ -31,35 +31,37 @@ namespace pv {
 namespace prop {
 
 Enum::Enum(QString name,
-	vector<pair<const void*, QString> > values,
-	function<const void* ()> getter,
-	function<void (const void*)> setter) :
-	Property(name),
+	vector<pair<GVariant*, QString> > values,
+	Getter getter, Setter setter) :
+	Property(name, getter, setter),
 	_values(values),
-	_getter(getter),
-	_setter(setter),
 	_selector(NULL)
 {
 }
 
+Enum::~Enum()
+{
+	for (unsigned int i = 0; i < _values.size(); i++)
+		g_variant_unref(_values[i].first);
+}
+
 QWidget* Enum::get_widget(QWidget *parent)
 {
 	if (_selector)
 		return _selector;
 
-	const void *value = NULL;
-	if (_getter)
-		value = _getter();
+	GVariant *const value = _getter ? _getter() : NULL;
 
 	_selector = new QComboBox(parent);
 	for (unsigned int i = 0; i < _values.size(); i++) {
-		const pair<const void*, QString> &v = _values[i];
-		_selector->addItem(v.second,
-			qVariantFromValue((void*)v.first));
-		if (v.first == value)
+		const pair<GVariant*, QString> &v = _values[i];
+		_selector->addItem(v.second, qVariantFromValue((void*)v.first));
+		if (value && g_variant_equal(v.first, value))
 			_selector->setCurrentIndex(i);
 	}
 
+	g_variant_unref(value);
+
 	return _selector;
 }
 
@@ -74,7 +76,7 @@ void Enum::commit()
 	if (index < 0)
 		return;
 
-	_setter(_selector->itemData(index).value<void*>());
+	_setter((GVariant*)_selector->itemData(index).value<void*>());
 }
 
 } // prop