X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=bindings%2Fcxx%2FConfigKey_methods.cpp;h=e3b67c328104740cd00f778e8b0b910aea13886a;hb=8e2d6c9db788785466d61fdac4d8fdc1535bc20c;hp=ceeea02588e9fdbf4ef8bb394748a630d25404a9;hpb=d92de05ad1d8004643ec5cd81227e456be5a261f;p=libsigrok.git

diff --git a/bindings/cxx/ConfigKey_methods.cpp b/bindings/cxx/ConfigKey_methods.cpp
index ceeea025..e3b67c32 100644
--- a/bindings/cxx/ConfigKey_methods.cpp
+++ b/bindings/cxx/ConfigKey_methods.cpp
@@ -1,36 +1,36 @@
-const DataType *ConfigKey::get_data_type() const
+const DataType *ConfigKey::data_type() const
 {
-	const struct sr_config_info *info = sr_config_info_get(id);
+	const struct sr_key_info *info = sr_key_info_get(SR_KEY_CONFIG, _id);
 	if (!info)
 		throw Error(SR_ERR_NA);
 	return DataType::get(info->datatype);
 }
 
-string ConfigKey::get_identifier() const
+string ConfigKey::identifier() const
 {
-	const struct sr_config_info *info = sr_config_info_get(id);
+	const struct sr_key_info *info = sr_key_info_get(SR_KEY_CONFIG, _id);
 	if (!info)
 		throw Error(SR_ERR_NA);
 	return valid_string(info->id);
 }
 
-string ConfigKey::get_description() const
+string ConfigKey::description() const
 {
-	const struct sr_config_info *info = sr_config_info_get(id);
+	const struct sr_key_info *info = sr_key_info_get(SR_KEY_CONFIG, _id);
 	if (!info)
 		throw Error(SR_ERR_NA);
 	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());
+	const struct sr_key_info *info = sr_key_info_name_get(SR_KEY_CONFIG, identifier.c_str());
 	if (!info)
 		throw Error(SR_ERR_ARG);
 	return get(info->key);
 }
 
-#include "config.h"
+#include <config.h>
 
 #ifndef HAVE_STOI_STOD
 
@@ -75,7 +75,7 @@ Glib::VariantBase ConfigKey::parse_string(string value) const
 	GVariant *variant;
 	uint64_t p, q;
 
-	switch (get_data_type()->get_id())
+	switch (data_type()->id())
 	{
 		case SR_T_UINT64:
 			check(sr_parse_sizestring(value.c_str(), &p));