projects
/
pulseview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Replaced lengthy iterator types with the auto keyword
[pulseview.git]
/
pv
/
prop
/
binding
/
decoderoptions.cpp
diff --git
a/pv/prop/binding/decoderoptions.cpp
b/pv/prop/binding/decoderoptions.cpp
index d9904852ca645e21f6b4b4d447a200860e301d94..6e0630c00dd1d55f853c8614d97589b9566b12b6 100644
(file)
--- a/
pv/prop/binding/decoderoptions.cpp
+++ b/
pv/prop/binding/decoderoptions.cpp
@@
-28,6
+28,7
@@
#include <pv/data/decoderstack.h>
#include <pv/data/decode/decoder.h>
#include <pv/data/decoderstack.h>
#include <pv/data/decode/decoder.h>
+#include <pv/prop/double.h>
#include <pv/prop/enum.h>
#include <pv/prop/int.h>
#include <pv/prop/string.h>
#include <pv/prop/enum.h>
#include <pv/prop/int.h>
#include <pv/prop/string.h>
@@
-72,6
+73,9
@@
DecoderOptions::DecoderOptions(
if (opt->values)
prop = bind_enum(name, opt, getter, setter);
if (opt->values)
prop = bind_enum(name, opt, getter, setter);
+ else if (g_variant_is_of_type(opt->def, G_VARIANT_TYPE("d")))
+ prop = shared_ptr<Property>(new Double(name, 2, "",
+ none, none, getter, setter));
else if (g_variant_is_of_type(opt->def, G_VARIANT_TYPE("x")))
prop = shared_ptr<Property>(
new Int(name, "", none, getter, setter));
else if (g_variant_is_of_type(opt->def, G_VARIANT_TYPE("x")))
prop = shared_ptr<Property>(
new Int(name, "", none, getter, setter));
@@
-107,7
+111,7
@@
GVariant* DecoderOptions::getter(const char *id)
// Get the value from the hash table if it is already present
const map<string, GVariant*>& options = _decoder->options();
// Get the value from the hash table if it is already present
const map<string, GVariant*>& options = _decoder->options();
-
map<string, GVariant*>::const_iterator
iter = options.find(id);
+
const auto
iter = options.find(id);
if (iter != options.end())
val = (*iter).second;
if (iter != options.end())
val = (*iter).second;