X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=pv%2Fbinding%2Fdevice.cpp;h=df83f082e355d1c1ecc3c106d4055075cd9123b4;hb=929b9b19c6a4ca673696c7cabca823acf542d182;hp=20082db2f7a949666151fc01e006d7408f7fb3ab;hpb=9f95aad19f36715c46bc9f2d7e8b149358034a7a;p=pulseview.git diff --git a/pv/binding/device.cpp b/pv/binding/device.cpp index 20082db2..df83f082 100644 --- a/pv/binding/device.cpp +++ b/pv/binding/device.cpp @@ -32,7 +32,6 @@ using boost::optional; using std::function; -using std::make_pair; using std::pair; using std::set; using std::shared_ptr; @@ -69,7 +68,7 @@ Device::Device(shared_ptr configurable) : string name_str; try { name_str = key->description(); - } catch (Error e) { + } catch (Error& e) { name_str = key->name(); } @@ -157,7 +156,7 @@ void Device::bind_enum(const QString &name, const QString &desc, vector< pair > values; while ((iter.next_value(gvar))) - values.push_back(make_pair(gvar, printer(gvar))); + values.emplace_back(gvar, printer(gvar)); properties_.push_back(shared_ptr(new Enum(name, desc, values, getter, setter)));