X-Git-Url: http://git.code-monkey.de/?p=pulseview.git;a=blobdiff_plain;f=pv%2Fbinding%2Finputoutput.cpp;h=0d9b2d0d72298bc66e18c5f0faa40615c36d091e;hp=df9d3799eb287ccfdb78682d077236aed95cff5f;hb=4e2195c8d934f7f874b612eaace8c6849e8b475d;hpb=9a267f8dec48c9a28472c1a3bb146c624819e98b diff --git a/pv/binding/inputoutput.cpp b/pv/binding/inputoutput.cpp index df9d379..0d9b2d0 100644 --- a/pv/binding/inputoutput.cpp +++ b/pv/binding/inputoutput.cpp @@ -35,7 +35,6 @@ using boost::none; -using std::make_pair; using std::map; using std::pair; using std::shared_ptr; @@ -66,11 +65,12 @@ InputOutput::InputOutput( const QString name = QString::fromStdString(opt->name()); const QString desc = QString::fromStdString(opt->description()); + const VariantBase def_val = opt->default_value(); const vector values = opt->values(); options_[opt->id()] = def_val; - + const Property::Getter get = [&, opt]() { return options_[opt->id()]; }; const Property::Setter set = [&, opt](VariantBase value) { @@ -111,7 +111,7 @@ shared_ptr InputOutput::bind_enum( { vector< pair > enum_vals; for (VariantBase var : values) - enum_vals.push_back(make_pair(var, print_gvariant(var))); + enum_vals.emplace_back(var, print_gvariant(var)); return shared_ptr(new Enum(name, desc, enum_vals, getter, setter)); }