summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorOleksandr Lohvinenko (GitHub) <OLohvinenko@luxoft.com>2018-05-25 13:24:56 +0300
committerIra Lytvynenko (GitHub) <ILytvynenko@luxoft.com>2018-06-26 12:01:47 +0300
commit0ad2d550bd3d3a0a6d2f7be5d4de6ab53c7190d4 (patch)
tree02e41c1125769ec761ca1f9ef45a67c960c08420
parent8249bb1976e3c46739aeedb6e1f0e3c21d1eb5e3 (diff)
downloadsdl_core-0ad2d550bd3d3a0a6d2f7be5d4de6ab53c7190d4.tar.gz
Fixed build, removed unnecessary encapsulation from vi command factory.
-rw-r--r--src/components/application_manager/rpc_plugins/vehicle_info_plugin/include/vehicle_info_plugin/vehicle_info_command_factory.h4
-rw-r--r--src/components/application_manager/rpc_plugins/vehicle_info_plugin/src/vehicle_info_app_extension.cc2
-rw-r--r--src/components/application_manager/rpc_plugins/vehicle_info_plugin/src/vehicle_info_command_factory.cc6
3 files changed, 2 insertions, 10 deletions
diff --git a/src/components/application_manager/rpc_plugins/vehicle_info_plugin/include/vehicle_info_plugin/vehicle_info_command_factory.h b/src/components/application_manager/rpc_plugins/vehicle_info_plugin/include/vehicle_info_plugin/vehicle_info_command_factory.h
index 21d6afa768..3282a8ae88 100644
--- a/src/components/application_manager/rpc_plugins/vehicle_info_plugin/include/vehicle_info_plugin/vehicle_info_command_factory.h
+++ b/src/components/application_manager/rpc_plugins/vehicle_info_plugin/include/vehicle_info_plugin/vehicle_info_command_factory.h
@@ -64,10 +64,6 @@ public:
const commands::Command::CommandSource source) const OVERRIDE;
private:
- app_mngr::ApplicationManager& application_manager_;
- app_mngr::rpc_service::RPCService& rpc_service_;
- app_mngr::HMICapabilities& hmi_capabilities_;
- policy::PolicyHandlerInterface& policy_handler_;
std::unique_ptr<app_mngr::CommandFactory> hmi_command_factory_;
std::unique_ptr<app_mngr::CommandFactory> mob_command_factory_;
};
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 6300ca3c2f..2d3f798554 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
@@ -50,7 +50,7 @@ void VehicleInfoAppExtension::subscribeToVehicleInfo(
void VehicleInfoAppExtension::unsubscribeFromVehicleInfo(
const std::string& moduleType) {
- auto& it = subscribed_modules_.find(moduleType);
+ auto it = subscribed_modules_.find(moduleType);
if (it != subscribed_modules_.end()) {
subscribed_modules_.erase(it);
}
diff --git a/src/components/application_manager/rpc_plugins/vehicle_info_plugin/src/vehicle_info_command_factory.cc b/src/components/application_manager/rpc_plugins/vehicle_info_plugin/src/vehicle_info_command_factory.cc
index e969dcbf1d..c0b3f70858 100644
--- a/src/components/application_manager/rpc_plugins/vehicle_info_plugin/src/vehicle_info_command_factory.cc
+++ b/src/components/application_manager/rpc_plugins/vehicle_info_plugin/src/vehicle_info_command_factory.cc
@@ -41,11 +41,7 @@ VehicleInfoCommandFactory::VehicleInfoCommandFactory(
app_mngr::rpc_service::RPCService& rpc_service,
app_mngr::HMICapabilities& hmi_capabilities,
policy::PolicyHandlerInterface& policy_handler)
- : application_manager_(application_manager),
- rpc_service_(rpc_service),
- hmi_capabilities_(hmi_capabilities),
- policy_handler_(policy_handler),
- hmi_command_factory_(new VehicleInfoHmiCommandFactory(
+ : hmi_command_factory_(new VehicleInfoHmiCommandFactory(
application_manager, rpc_service, hmi_capabilities, policy_handler)),
mob_command_factory_(new VehicleInfoMobileCommandFactory(
application_manager, rpc_service, hmi_capabilities, policy_handler)) {