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

The polymorphism with get(int) causes problems here when a char * is passed.

diff --git a/bindings/cxx/ConfigKey_methods.cpp b/bindings/cxx/ConfigKey_methods.cpp
index f9ce9984219981ee177abdb44401e68a701baa66..9ba82adb51b1c60bff6808605b25194e0c23db1f 100644 (file)
--- a/bindings/cxx/ConfigKey_methods.cpp
+++ b/bindings/cxx/ConfigKey_methods.cpp
@@ -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)

diff --git a/bindings/cxx/ConfigKey_methods.hpp b/bindings/cxx/ConfigKey_methods.hpp
index 353153183b66c23eecc01d34bb2f1997da120df0..f759cc4e3d6be717279a5873cc0d85345452f34b 100644 (file)
--- a/bindings/cxx/ConfigKey_methods.hpp
+++ b/bindings/cxx/ConfigKey_methods.hpp
@@ -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;

diff --git a/bindings/python/sigrok/core/classes.i b/bindings/python/sigrok/core/classes.i
index 1da14d87cc45238701949549cc4181be562fc4d4..27060cd1f24dc21712fac9edb79a39552eaf7d58 100644 (file)
--- a/bindings/python/sigrok/core/classes.i
+++ b/bindings/python/sigrok/core/classes.i
@@ -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;
         }