X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=pv%2Fbinding%2Finputoutput.cpp;h=0d9b2d0d72298bc66e18c5f0faa40615c36d091e;hb=581724de334181fc5338f1efa87954264cf90520;hp=9d2299afaf95fd767a5d7142fb71a606e3d97f0f;hpb=bb19aac49414cc772a2a1e52730cbb2ca24b425c;p=pulseview.git diff --git a/pv/binding/inputoutput.cpp b/pv/binding/inputoutput.cpp index 9d2299af..0d9b2d0d 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,6 +65,7 @@ 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(); @@ -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)); }