C++: Make most members private instead of protected

[libsigrok.git] / bindings / cxx / ConfigKey_methods.cpp

diff --git a/bindings/cxx/ConfigKey_methods.cpp b/bindings/cxx/ConfigKey_methods.cpp
index f9ce9984219981ee177abdb44401e68a701baa66..d391561047f32e234d9c9eb9200e575418ff873d 100644 (file)
--- a/bindings/cxx/ConfigKey_methods.cpp
+++ b/bindings/cxx/ConfigKey_methods.cpp
@@ -1,6 +1,6 @@
 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);
@@ -8,7 +8,7 @@ const DataType *ConfigKey::data_type() 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);
@@ -16,21 +16,21 @@ string ConfigKey::identifier() 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