X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=pv%2Fprop%2Fenum.cpp;h=71ed19e6e2c12de2ff5cc4900417e8a46cd0357d;hp=9044c6bae9d3c6335589c26e7be65835186a7b81;hb=c6246dc56ed01d7e99aa65ab88b8c191300b1ebd;hpb=f352b9bbeafc33fab0d003573b86ceed17565b5e

diff --git a/pv/prop/enum.cpp b/pv/prop/enum.cpp
index 9044c6ba..71ed19e6 100644
--- a/pv/prop/enum.cpp
+++ b/pv/prop/enum.cpp
@@ -22,7 +22,7 @@
 
 #include <QComboBox>
 
-#include "enum.h"
+#include "enum.hpp"
 
 using std::pair;
 using std::vector;
@@ -31,58 +31,53 @@ namespace pv {
 namespace prop {
 
 Enum::Enum(QString name,
-	vector<pair<GVariant*, QString> > values,
+	vector<pair<Glib::VariantBase, QString> > values,
 	Getter getter, Setter setter) :
 	Property(name, getter, setter),
-	_values(values),
-	_selector(NULL)
+	values_(values),
+	selector_(nullptr)
 {
 }
 
-Enum::~Enum()
-{
-	for (unsigned int i = 0; i < _values.size(); i++)
-		g_variant_unref(_values[i].first);
-}
-
 QWidget* Enum::get_widget(QWidget *parent, bool auto_commit)
 {
-	if (_selector)
-		return _selector;
-
-	GVariant *const value = _getter ? _getter() : NULL;
-	if (!value)
-		return NULL;
-
-	_selector = new QComboBox(parent);
-	for (unsigned int i = 0; i < _values.size(); i++) {
-		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);
+	if (selector_)
+		return selector_;
+
+	if (!getter_)
+		return nullptr;
+
+	Glib::VariantBase variant = getter_();
+	if (!variant.gobj())
+		return nullptr;
+
+	selector_ = new QComboBox(parent);
+	for (unsigned int i = 0; i < values_.size(); i++) {
+		const pair<Glib::VariantBase, QString> &v = values_[i];
+		selector_->addItem(v.second, qVariantFromValue(v.first));
+		if (v.first.equal(variant))
+			selector_->setCurrentIndex(i);
 	}
 
-	g_variant_unref(value);
-
 	if (auto_commit)
-		connect(_selector, SIGNAL(currentIndexChanged(int)),
+		connect(selector_, SIGNAL(currentIndexChanged(int)),
 			this, SLOT(on_current_item_changed(int)));
 
-	return _selector;
+	return selector_;
 }
 
 void Enum::commit()
 {
-	assert(_setter);
+	assert(setter_);
 
-	if (!_selector)
+	if (!selector_)
 		return;
 
-	const int index = _selector->currentIndex();
+	const int index = selector_->currentIndex();
 	if (index < 0)
 		return;
 
-	_setter((GVariant*)_selector->itemData(index).value<void*>());
+	setter_(selector_->itemData(index).value<Glib::VariantBase>());
 }
 
 void Enum::on_current_item_changed(int)