From c1381e83fd9673394b7fd84501e4bef96c319e61 Mon Sep 17 00:00:00 2001 From: Alexander Date: Wed, 13 Jun 2018 10:01:31 +0000 Subject: Rename module type to vehicle data type --- .../vehicle_info_app_extension.h | 8 ++++---- .../src/vehicle_info_app_extension.cc | 24 +++++++++++----------- 2 files changed, 16 insertions(+), 16 deletions(-) diff --git a/src/components/application_manager/rpc_plugins/vehicle_info_plugin/include/vehicle_info_plugin/vehicle_info_app_extension.h b/src/components/application_manager/rpc_plugins/vehicle_info_plugin/include/vehicle_info_plugin/vehicle_info_app_extension.h index f3eb9c18b8..727780eaf9 100644 --- a/src/components/application_manager/rpc_plugins/vehicle_info_plugin/include/vehicle_info_plugin/vehicle_info_app_extension.h +++ b/src/components/application_manager/rpc_plugins/vehicle_info_plugin/include/vehicle_info_plugin/vehicle_info_app_extension.h @@ -46,13 +46,13 @@ class VehicleInfoAppExtension : app_mngr::AppExtension { explicit VehicleInfoAppExtension(app_mngr::AppExtensionUID uid); virtual ~VehicleInfoAppExtension(); - void subscribeToVehicleInfo(const std::string& moduleType); - void unsubscribeFromVehicleInfo(const std::string& moduleType); + void subscribeToVehicleInfo(const std::string& vehicle_data_type); + void unsubscribeFromVehicleInfo(const std::string& vehicle_data_type); void unsubscribeFromVehicleInfo(); - bool isSubscribedToVehicleInfo(const std::string& moduleType) const; + bool isSubscribedToVehicleInfo(const std::string& vehicle_data_type) const; private: - std::set subscribed_modules_; + std::set subscribed_data_; }; } diff --git a/src/components/application_manager/rpc_plugins/vehicle_info_plugin/src/vehicle_info_app_extension.cc b/src/components/application_manager/rpc_plugins/vehicle_info_plugin/src/vehicle_info_app_extension.cc index c9e354865f..cf7ea808ae 100644 --- a/src/components/application_manager/rpc_plugins/vehicle_info_plugin/src/vehicle_info_app_extension.cc +++ b/src/components/application_manager/rpc_plugins/vehicle_info_plugin/src/vehicle_info_app_extension.cc @@ -47,28 +47,28 @@ VehicleInfoAppExtension::~VehicleInfoAppExtension() { } void VehicleInfoAppExtension::subscribeToVehicleInfo( - const std::string& moduleType) { - LOG4CXX_DEBUG(logger_, moduleType); - subscribed_modules_.insert(moduleType); + const std::string& vehicle_data_type) { + LOG4CXX_DEBUG(logger_, vehicle_data_type); + subscribed_data_.insert(vehicle_data_type); } void VehicleInfoAppExtension::unsubscribeFromVehicleInfo( - const std::string& moduleType) { - LOG4CXX_DEBUG(logger_, moduleType); - auto it = subscribed_modules_.find(moduleType); - if (it != subscribed_modules_.end()) { - subscribed_modules_.erase(it); + const std::string& vehicle_data_type) { + LOG4CXX_DEBUG(logger_, vehicle_data_type); + auto it = subscribed_data_.find(vehicle_data_type); + if (it != subscribed_data_.end()) { + subscribed_data_.erase(it); } } void VehicleInfoAppExtension::unsubscribeFromVehicleInfo() { LOG4CXX_AUTO_TRACE(logger_); - subscribed_modules_.clear(); + subscribed_data_.clear(); } bool VehicleInfoAppExtension::isSubscribedToVehicleInfo( - const std::string& moduleType) const { - LOG4CXX_DEBUG(logger_, moduleType); - return subscribed_modules_.find(moduleType) != subscribed_modules_.end(); + const std::string& vehicle_data_type) const { + LOG4CXX_DEBUG(logger_, vehicle_data_type); + return subscribed_data_.find(vehicle_data_type) != subscribed_data_.end(); } } -- cgit v1.2.1