BLAHAJ
/
libsigrok
10
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

bindings: Rename ConfigKey::get(string) to get_by_identifier(). 

The polymorphism with get(int) causes problems here when a char * is passed.
This commit is contained in:
Martin Ling 2014-10-29 14:33:46 +00:00 committed by Uwe Hermann
parent 9d229ecb9e
commit 0bc1a7613a
3 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
bindings/cxx/ConfigKey_methods.cpp
View File

@ -22,7 +22,7 @@ string ConfigKey::description() const
return valid_string(info->name);
}
const ConfigKey *ConfigKey::get(string identifier)
const ConfigKey *ConfigKey::get_by_identifier(string identifier)
{
const struct sr_config_info *info = sr_config_info_name_get(identifier.c_str());
if (!info)

2
bindings/cxx/ConfigKey_methods.hpp
View File

@ -5,6 +5,6 @@
/** Description of this configuration key. */
string description() const;
/** Get configuration key by string identifier. */
static const ConfigKey *get(string identifier);
static const ConfigKey *get_by_identifier(string identifier);
/** Parse a string argument into the appropriate type for this key. */
Glib::VariantBase parse_string(string value) const;

2
bindings/python/sigrok/core/classes.i
View File

@ -377,7 +377,7 @@ std::map<std::string, Glib::VariantBase> dict_to_map_options(PyObject *dict,
{
if (!PyString_Check(py_key))
throw sigrok::Error(SR_ERR_ARG);
auto key = sigrok::ConfigKey::get(PyString_AsString(py_key));
auto key = sigrok::ConfigKey::get_by_identifier(PyString_AsString(py_key));
auto value = python_to_variant_by_key(py_value, key);
options[key] = value;
}