X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=pv%2Fprop%2Fenum.h;h=45454fde41f68e81ae9c997d22fef69bdd58c8b1;hp=a7e6ed8d53f58bdcf8f5418ad7e695b1677e72e3;hb=8dbbc7f0b9ea59d0f0d62225772f8a56eee125f5;hpb=b1fe148e0dce6e369c9d4770ca935a6a9ec94b59

diff --git a/pv/prop/enum.h b/pv/prop/enum.h
index a7e6ed8d..45454fde 100644
--- a/pv/prop/enum.h
+++ b/pv/prop/enum.h
@@ -26,6 +26,10 @@
 
 #include "property.h"
 
+#include <QMetaType>
+
+Q_DECLARE_METATYPE(Glib::VariantBase);
+
 class QComboBox;
 
 namespace pv {
@@ -36,7 +40,7 @@ class Enum : public Property
 	Q_OBJECT;
 
 public:
-	Enum(QString name, std::vector<std::pair<GVariant*, QString> > values,
+	Enum(QString name, std::vector<std::pair<Glib::VariantBase, QString> > values,
 		Getter getter, Setter setter);
 
 	virtual ~Enum();
@@ -45,13 +49,13 @@ public:
 
 	void commit();
 
-private slots:
+private Q_SLOTS:
 	void on_current_item_changed(int);
 
 private:
-	const std::vector< std::pair<GVariant*, QString> > _values;
+	const std::vector< std::pair<Glib::VariantBase, QString> > values_;
 
-	QComboBox *_selector;
+	QComboBox *selector_;
 };
 
 } // prop