From: Martin Ling Date: Thu, 24 Jul 2014 12:17:19 +0000 (+0100) Subject: bindings: Change return type of config_list to Glib::VariantContainerBase. X-Git-Tag: libsigrok-0.4.0~1199 X-Git-Url: https://sigrok.org/gitaction?a=commitdiff_plain;h=e194c0119709d03db52f4287a62146c41739341d;p=libsigrok.git bindings: Change return type of config_list to Glib::VariantContainerBase. --- diff --git a/bindings/cxx/classes.cpp b/bindings/cxx/classes.cpp index 5833c332..ac583d04 100644 --- a/bindings/cxx/classes.cpp +++ b/bindings/cxx/classes.cpp @@ -328,13 +328,13 @@ void Configurable::config_set(const ConfigKey *key, Glib::VariantBase value) key->get_id(), value.gobj())); } -Glib::VariantBase Configurable::config_list(const ConfigKey *key) +Glib::VariantContainerBase Configurable::config_list(const ConfigKey *key) { GVariant *data; check(sr_config_list( config_driver, config_sdi, config_channel_group, key->get_id(), &data)); - return Glib::VariantBase(data); + return Glib::VariantContainerBase(data); } Device::Device(struct sr_dev_inst *structure) : diff --git a/bindings/cxx/include/libsigrok/libsigrok.hpp b/bindings/cxx/include/libsigrok/libsigrok.hpp index 960d0d69..041f8498 100644 --- a/bindings/cxx/include/libsigrok/libsigrok.hpp +++ b/bindings/cxx/include/libsigrok/libsigrok.hpp @@ -258,7 +258,7 @@ public: /** Set configuration for the given key to a specified value. */ void config_set(const ConfigKey *key, Glib::VariantBase value); /** Enumerate available values for the given configuration key. */ - Glib::VariantBase config_list(const ConfigKey *key); + Glib::VariantContainerBase config_list(const ConfigKey *key); protected: Configurable( struct sr_dev_driver *driver,