X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=bindings%2Fcxx%2FConfigKey_methods.cpp;h=7f8c201ed5a8f1e649b4f4e9a452b5c8344e1dd3;hb=6c6dd7328a83f7beb7280d57cc5e255294aba2fc;hp=9c3668ffbb35e9ee4337b7951c0dc7cac08215e2;hpb=1ac6436468d7d4110d053c994df2db0583b0857e;p=libsigrok.git diff --git a/bindings/cxx/ConfigKey_methods.cpp b/bindings/cxx/ConfigKey_methods.cpp index 9c3668ff..7f8c201e 100644 --- a/bindings/cxx/ConfigKey_methods.cpp +++ b/bindings/cxx/ConfigKey_methods.cpp @@ -8,7 +8,7 @@ const DataType *ConfigKey::data_type() const return DataType::get(info->datatype); } -string ConfigKey::identifier() const +std::string ConfigKey::identifier() const { const struct sr_key_info *info = sr_key_info_get(SR_KEY_CONFIG, id()); if (!info) @@ -16,7 +16,7 @@ string ConfigKey::identifier() const return valid_string(info->id); } -string ConfigKey::description() const +std::string ConfigKey::description() const { const struct sr_key_info *info = sr_key_info_get(SR_KEY_CONFIG, id()); if (!info) @@ -24,7 +24,7 @@ string ConfigKey::description() const return valid_string(info->name); } -const ConfigKey *ConfigKey::get_by_identifier(string identifier) +const ConfigKey *ConfigKey::get_by_identifier(std::string identifier) { const struct sr_key_info *info = sr_key_info_name_get(SR_KEY_CONFIG, identifier.c_str()); if (!info) @@ -70,7 +70,7 @@ static inline double stod( const std::string& str ) } #endif -Glib::VariantBase ConfigKey::parse_string(string value, enum sr_datatype dt) +Glib::VariantBase ConfigKey::parse_string(std::string value, enum sr_datatype dt) { GVariant *variant; uint64_t p, q; @@ -116,7 +116,7 @@ Glib::VariantBase ConfigKey::parse_string(string value, enum sr_datatype dt) return Glib::VariantBase(variant, false); } -Glib::VariantBase ConfigKey::parse_string(string value) const +Glib::VariantBase ConfigKey::parse_string(std::string value) const { enum sr_datatype dt = (enum sr_datatype)(data_type()->id()); return parse_string(value, dt);