using boost::none;
-using std::make_pair;
using std::map;
using std::pair;
using std::shared_ptr;
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) {
{
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));
}