using boost::optional;
using std::function;
-using std::make_pair;
using std::pair;
using std::set;
using std::shared_ptr;
string name_str;
try {
name_str = key->description();
- } catch (Error e) {
+ } catch (Error& e) {
name_str = key->name();
}
break;
case SR_CONF_CAPTURE_RATIO:
- bind_int(name, "", "%", pair<int64_t, int64_t>(0, 100),
- get, set);
+ bind_int(name, "", "%", pair<int64_t, int64_t>(0, 100), get, set);
break;
case SR_CONF_PATTERN_MODE:
case SR_CONF_TRIGGER_SLOPE:
case SR_CONF_COUPLING:
case SR_CONF_CLOCK_EDGE:
+ case SR_CONF_DATA_SOURCE:
+ case SR_CONF_EXTERNAL_CLOCK_SOURCE:
bind_enum(name, "", key, capabilities, get, set);
break;
vector< pair<Glib::VariantBase, QString> > 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<Property>(new Enum(name, desc, values,
getter, setter)));