X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;ds=sidebyside;f=pv%2Fbinding%2Finputoutput.cpp;h=9ba387fbc0cb01a01854010463848ae0dbf3c3ce;hb=HEAD;hp=df9d3799eb287ccfdb78682d077236aed95cff5f;hpb=9a267f8dec48c9a28472c1a3bb146c624819e98b;p=pulseview.git

diff --git a/pv/binding/inputoutput.cpp b/pv/binding/inputoutput.cpp
index df9d3799..9ba387fb 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;
@@ -60,17 +59,18 @@ namespace binding {
 InputOutput::InputOutput(
 	const map<string, shared_ptr<Option>> &options)
 {
-	for (pair<string, shared_ptr<Option>> o : options) {
+	for (const pair<const string, shared_ptr<Option>>& o : options) {
 		const shared_ptr<Option> &opt = o.second;
 		assert(opt);
 
 		const QString name = QString::fromStdString(opt->name());
 		const QString desc = QString::fromStdString(opt->description());
+
 		const VariantBase def_val = opt->default_value();
 		const vector<VariantBase> 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<Property> InputOutput::bind_enum(
 {
 	vector< pair<VariantBase, QString> > 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<Property>(new Enum(name, desc, enum_vals, getter, setter));
 }