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 c2cc63956cde129eac87f05a66959259b6b96cab..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 {
@@ -33,22 +37,25 @@ namespace prop {
 
 class Enum : public Property
 {
+       Q_OBJECT;
+
 public:
-       Enum(QString name,
-               std::vector<std::pair<const void*, QString> > values,
-               boost::function<const void* ()> getter,
-               boost::function<void (const void*)> setter);
+       Enum(QString name, std::vector<std::pair<Glib::VariantBase, QString> > values,
+               Getter getter, Setter setter);
 
-       QWidget* get_widget(QWidget *parent);
+       virtual ~Enum();
+
+       QWidget* get_widget(QWidget *parent, bool auto_commit);
 
        void commit();
 
+private Q_SLOTS:
+       void on_current_item_changed(int);
+
 private:
-       const std::vector< std::pair<const void*, QString> > _values;
-       boost::function<const void* ()> _getter;
-       boost::function<void (const void*)> _setter;
+       const std::vector< std::pair<Glib::VariantBase, QString> > values_;
 
-       QComboBox *_selector;
+       QComboBox *selector_;
 };
 
 } // prop