From: Mika Laitio Date: Sat, 16 Apr 2011 14:49:01 +0000 (+0300) Subject: fixed api change breaks X-Git-Url: http://pilppa.org/gitweb/?p=lib1wire.git;a=commitdiff_plain;h=556015eb3b2a3d0f8444e1748186bec3a7e12e6f fixed api change breaks Signed-off-by: Mika Laitio --- diff --git a/src/Factory.cc b/src/Factory.cc index e785683..152d740 100644 --- a/src/Factory.cc +++ b/src/Factory.cc @@ -101,11 +101,11 @@ Device *Factory::create_w1_device(int family_code_param, config = DeviceConfig::get_device_config(device_id_param); if (config != NULL) { // if not, create default device config - type = config->get_cfg_value(DEVICE_CONFIG_VALUE_KEY__TYPE); + type = config->get_config_value(DEVICE_CONFIG_VALUE_KEY__TYPE); if (type.empty() == true) { type = ret_val->get_type(); - config->set_cfg_value(DEVICE_CONFIG_VALUE_KEY__TYPE, type); - config->set_cfg_value(DEVICE_CONFIG_VALUE_KEY__ID, ret_val->get_id()); + config->set_config_value(DEVICE_CONFIG_VALUE_KEY__TYPE, type); + config->set_config_value(DEVICE_CONFIG_VALUE_KEY__ID, ret_val->get_id()); } delete(config); } diff --git a/src/W1Device.cc b/src/W1Device.cc index 4a83c20..84f4fec 100644 --- a/src/W1Device.cc +++ b/src/W1Device.cc @@ -62,7 +62,7 @@ string W1Device::get_name() { if (name.empty() == true) { cfg = DeviceConfig::get_device_config(id); if (cfg != NULL) { - name = cfg->get_cfg_value(DEVICE_CONFIG_VALUE_KEY__NAME); + name = cfg->get_config_value(DEVICE_CONFIG_VALUE_KEY__NAME); delete(cfg); } } @@ -76,7 +76,7 @@ void W1Device::set_name(string name_param) { name = name_param; cfg = DeviceConfig::get_device_config(id); if (cfg != NULL) { - cfg->set_cfg_value(DEVICE_CONFIG_VALUE_KEY__NAME, name_param); + cfg->set_config_value(DEVICE_CONFIG_VALUE_KEY__NAME, name_param); delete(cfg); } }