X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=bindings%2Fpython%2Fsigrok%2Fcore%2Fclasses.i;h=be3b404a1054e45f4f6b5f4f0e77732551884af1;hb=47d98603e706e8c4f2da2b031f31c6dd2cc3b246;hp=b755289052c842100116d25a4d66ad30f974d080;hpb=ca3291e3ee7415c4c4505164ec931b91ea15cefe;p=libsigrok.git

diff --git a/bindings/python/sigrok/core/classes.i b/bindings/python/sigrok/core/classes.i
index b7552890..be3b404a 100644
--- a/bindings/python/sigrok/core/classes.i
+++ b/bindings/python/sigrok/core/classes.i
@@ -287,14 +287,14 @@ std::map<std::string, std::string> dict_to_map_string(PyObject *dict)
 /* Convert from a Python type to Glib::Variant, according to config key data type. */
 Glib::VariantBase python_to_variant_by_key(PyObject *input, const sigrok::ConfigKey *key)
 {
-    enum sr_datatype type = key->get_data_type()->get_id();
+    enum sr_datatype type = key->data_type()->id();
 
     if (type == SR_T_UINT64 && PyInt_Check(input))
         return Glib::Variant<guint64>::create(PyInt_AsLong(input));
     if (type == SR_T_UINT64 && PyLong_Check(input))
         return Glib::Variant<guint64>::create(PyLong_AsLong(input));
     else if (type == SR_T_STRING && PyString_Check(input))
-        return Glib::Variant<std::string>::create(PyString_AsString(input));
+        return Glib::Variant<Glib::ustring>::create(PyString_AsString(input));
     else if (type == SR_T_BOOL && PyBool_Check(input))
         return Glib::Variant<bool>::create(input == Py_True);
     else if (type == SR_T_FLOAT && PyFloat_Check(input))
@@ -309,14 +309,14 @@ Glib::VariantBase python_to_variant_by_key(PyObject *input, const sigrok::Config
 Glib::VariantBase python_to_variant_by_option(PyObject *input,
     std::shared_ptr<sigrok::Option> option)
 {
-    GVariantType *type = option->get_default_value().get_type().gobj();
+    GVariantType *type = option->default_value().get_type().gobj();
 
     if (type == G_VARIANT_TYPE_UINT64 && PyInt_Check(input))
         return Glib::Variant<guint64>::create(PyInt_AsLong(input));
     if (type == G_VARIANT_TYPE_UINT64 && PyLong_Check(input))
         return Glib::Variant<guint64>::create(PyLong_AsLong(input));
     else if (type == G_VARIANT_TYPE_STRING && PyString_Check(input))
-        return Glib::Variant<std::string>::create(PyString_AsString(input));
+        return Glib::Variant<Glib::ustring>::create(PyString_AsString(input));
     else if (type == G_VARIANT_TYPE_BOOLEAN && PyBool_Check(input))
         return Glib::Variant<bool>::create(input == Py_True);
     else if (type == G_VARIANT_TYPE_DOUBLE && PyFloat_Check(input))
@@ -400,7 +400,7 @@ std::map<std::string, Glib::VariantBase> dict_to_map_options(PyObject *dict,
     std::shared_ptr<sigrok::Input> _create_input_kwargs(PyObject *dict)
     {
         return $self->create_input(
-            dict_to_map_options(dict, $self->get_options()));
+            dict_to_map_options(dict, $self->options()));
     }
 }
 
@@ -419,7 +419,7 @@ std::map<std::string, Glib::VariantBase> dict_to_map_options(PyObject *dict,
         std::shared_ptr<sigrok::Device> device, PyObject *dict)
     {
         return $self->create_output(device,
-            dict_to_map_options(dict, $self->get_options()));
+            dict_to_map_options(dict, $self->options()));
     }
 }