X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=bindings%2Fcxx%2FConfigKey_methods.cpp;h=7f8c201ed5a8f1e649b4f4e9a452b5c8344e1dd3;hb=b41562f6ce3ba5572d65965811e0eb1f62a4b223;hp=be70b06df0e8380cab8aa5209fb554553afcd11e;hpb=61a6d983bd37fcd035439dc5f2671a290ef46057;p=libsigrok.git

diff --git a/bindings/cxx/ConfigKey_methods.cpp b/bindings/cxx/ConfigKey_methods.cpp
index be70b06d..7f8c201e 100644
--- a/bindings/cxx/ConfigKey_methods.cpp
+++ b/bindings/cxx/ConfigKey_methods.cpp
@@ -1,3 +1,5 @@
+#include <config.h>
+
 const DataType *ConfigKey::data_type() const
 {
 	const struct sr_key_info *info = sr_key_info_get(SR_KEY_CONFIG, id());
@@ -6,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)
@@ -14,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)
@@ -22,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)
@@ -30,8 +32,6 @@ const ConfigKey *ConfigKey::get_by_identifier(string identifier)
 	return get(info->key);
 }
 
-#include <config.h>
-
 #ifndef HAVE_STOI_STOD
 
 /* Fallback implementation of stoi and stod */
@@ -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;
@@ -90,7 +90,7 @@ Glib::VariantBase ConfigKey::parse_string(string value, enum sr_datatype dt)
 		case SR_T_FLOAT:
 			try {
 				variant = g_variant_new_double(stod(value));
-			} catch (invalid_argument) {
+			} catch (invalid_argument&) {
 				throw Error(SR_ERR_ARG);
 			}
 			break;
@@ -105,7 +105,7 @@ Glib::VariantBase ConfigKey::parse_string(string value, enum sr_datatype dt)
 		case SR_T_INT32:
 			try {
 				variant = g_variant_new_int32(stoi(value));
-			} catch (invalid_argument) {
+			} catch (invalid_argument&) {
 				throw Error(SR_ERR_ARG);
 			}
 			break;
@@ -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);