projects
/
pulseview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Drop a few more unneeded 'extern "C"'.
[pulseview.git]
/
pv
/
prop
/
enum.h
diff --git
a/pv/prop/enum.h
b/pv/prop/enum.h
index 2350fef886917ad884639938c0f5b106a00a6c70..c2cc63956cde129eac87f05a66959259b6b96cab 100644
(file)
--- a/
pv/prop/enum.h
+++ b/
pv/prop/enum.h
@@
-34,12
+34,19
@@
namespace prop {
class Enum : public Property
{
public:
class Enum : public Property
{
public:
- Enum(QString name, std::vector<std::pair<int, QString> > values);
+ Enum(QString name,
+ std::vector<std::pair<const void*, QString> > values,
+ boost::function<const void* ()> getter,
+ boost::function<void (const void*)> setter);
QWidget* get_widget(QWidget *parent);
QWidget* get_widget(QWidget *parent);
+ void commit();
+
private:
private:
- const std::vector< std::pair<int, QString> > _values;
+ const std::vector< std::pair<const void*, QString> > _values;
+ boost::function<const void* ()> _getter;
+ boost::function<void (const void*)> _setter;
QComboBox *_selector;
};
QComboBox *_selector;
};