X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=pv%2Fbinding%2Fdevice.cpp;h=1afc2ce2f32c7f3009aec2296231b019fb15e8b8;hb=cbb50547a69f8a10dd05e8cf8d03fdd679e4442f;hp=458a9d69a71d64c2bda65cb24f3ad0b85e24394e;hpb=a9627352f283dd4f83906dc1710a1d9d327fbe57;p=pulseview.git diff --git a/pv/binding/device.cpp b/pv/binding/device.cpp index 458a9d69..1afc2ce2 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; @@ -89,8 +88,7 @@ Device::Device(shared_ptr configurable) : break; case SR_CONF_CAPTURE_RATIO: - bind_int(name, "", "%", pair(0, 100), - get, set); + bind_int(name, "", "%", pair(0, 100), get, set); break; case SR_CONF_PATTERN_MODE: @@ -158,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)));