projects
/
pulseview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Adjust pv:prop::Enum to GVariant-based sr_config_* functions
[pulseview.git]
/
pv
/
prop
/
enum.cpp
diff --git
a/pv/prop/enum.cpp
b/pv/prop/enum.cpp
index 54fe5fedca8284b15dc2f051a44a7f5e3e1dba22..894ba9f8e2754ded46f9e07b783484871d25eade 100644
(file)
--- a/
pv/prop/enum.cpp
+++ b/
pv/prop/enum.cpp
@@
-20,6
+20,7
@@
#include <assert.h>
#include <assert.h>
+#include <glib-2.0/glib.h>
#include <QComboBox>
#include "enum.h"
#include <QComboBox>
#include "enum.h"
@@
-32,8
+33,8
@@
namespace prop {
Enum::Enum(QString name,
vector<pair<const void*, QString> > values,
Enum::Enum(QString name,
vector<pair<const void*, QString> > values,
- function<
const void
* ()> getter,
- function<void (
const void
*)> setter) :
+ function<
GVariant
* ()> getter,
+ function<void (
GVariant
*)> setter) :
Property(name),
_values(values),
_getter(getter),
Property(name),
_values(values),
_getter(getter),
@@
-74,7
+75,7
@@
void Enum::commit()
if (index < 0)
return;
if (index < 0)
return;
- _setter(_selector->itemData(index).value<
void
*>());
+ _setter(_selector->itemData(index).value<
GVariant
*>());
}
} // prop
}
} // prop