Make member variable underscores a suffix instead of a prefix

[pulseview.git] / pv / prop / enum.h

diff --git a/pv/prop/enum.h b/pv/prop/enum.h
index eff6647afd40974314b8a1218d9182ce98024909..45454fde41f68e81ae9c997d22fef69bdd58c8b1 100644 (file)
--- 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();
@@ -49,9 +53,9 @@ 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