diff options
Diffstat (limited to 'src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile')
108 files changed, 529 insertions, 311 deletions
diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/add_command_request.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/add_command_request.cc index 3bf95dda4f..626453c7cb 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/add_command_request.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/add_command_request.cc @@ -40,14 +40,16 @@ #include "utils/helpers.h" #include "utils/custom_string.h" -namespace application_manager { +namespace sdl_rpc_plugin { +using namespace application_manager; namespace commands { namespace custom_str = utils::custom_string; -AddCommandRequest::AddCommandRequest(const MessageSharedPtr& message, - ApplicationManager& application_manager) +AddCommandRequest::AddCommandRequest( + const application_manager::commands::MessageSharedPtr& message, + ApplicationManager& application_manager) : CommandRequestImpl(message, application_manager) , send_ui_(false) , send_vr_(false) @@ -575,7 +577,7 @@ const std::string AddCommandRequest::GenerateMobileResponseInfo() { return ui_info_; } - return MergeInfos(ui_info_, vr_info_); + return app_mngr::commands::MergeInfos(ui_info_, vr_info_); } void AddCommandRequest::RemoveCommand() { diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/add_command_response.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/add_command_response.cc index 84ad5af332..463c228115 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/add_command_response.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/add_command_response.cc @@ -34,12 +34,14 @@ #include "sdl_rpc_plugin/commands/mobile/add_command_response.h" #include "application_manager/rpc_service.h" -namespace application_manager { +namespace sdl_rpc_plugin { +using namespace application_manager; namespace commands { -AddCommandResponse::AddCommandResponse(const MessageSharedPtr& message, - ApplicationManager& application_manager) +AddCommandResponse::AddCommandResponse( + const application_manager::commands::MessageSharedPtr& message, + ApplicationManager& application_manager) : CommandResponseImpl(message, application_manager) {} AddCommandResponse::~AddCommandResponse() {} diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/add_sub_menu_request.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/add_sub_menu_request.cc index b756ff3a7b..5288234b37 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/add_sub_menu_request.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/add_sub_menu_request.cc @@ -37,12 +37,14 @@ #include "application_manager/application.h" #include "utils/helpers.h" -namespace application_manager { +namespace sdl_rpc_plugin { +using namespace application_manager; namespace commands { -AddSubMenuRequest::AddSubMenuRequest(const MessageSharedPtr& message, - ApplicationManager& application_manager) +AddSubMenuRequest::AddSubMenuRequest( + const application_manager::commands::MessageSharedPtr& message, + ApplicationManager& application_manager) : CommandRequestImpl(message, application_manager) {} AddSubMenuRequest::~AddSubMenuRequest() {} diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/add_sub_menu_response.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/add_sub_menu_response.cc index f43fa0ea73..c0481628eb 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/add_sub_menu_response.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/add_sub_menu_response.cc @@ -35,12 +35,14 @@ #include "application_manager/rpc_service.h" #include "application_manager/application_impl.h" -namespace application_manager { +namespace sdl_rpc_plugin { +using namespace application_manager; namespace commands { -AddSubMenuResponse::AddSubMenuResponse(const MessageSharedPtr& message, - ApplicationManager& application_manager) +AddSubMenuResponse::AddSubMenuResponse( + const application_manager::commands::MessageSharedPtr& message, + ApplicationManager& application_manager) : CommandResponseImpl(message, application_manager) {} AddSubMenuResponse::~AddSubMenuResponse() {} diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/alert_maneuver_request.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/alert_maneuver_request.cc index 11473cdea7..7d41ae7433 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/alert_maneuver_request.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/alert_maneuver_request.cc @@ -32,12 +32,14 @@ #include "application_manager/policies/policy_handler.h" #include "application_manager/message_helper.h" -namespace application_manager { +namespace sdl_rpc_plugin { +using namespace application_manager; namespace commands { AlertManeuverRequest::AlertManeuverRequest( - const MessageSharedPtr& message, ApplicationManager& application_manager) + const application_manager::commands::MessageSharedPtr& message, + ApplicationManager& application_manager) : CommandRequestImpl(message, application_manager) , tts_speak_result_code_(hmi_apis::Common_Result::INVALID_ENUM) , navi_alert_maneuver_result_code_(hmi_apis::Common_Result::INVALID_ENUM) { @@ -208,12 +210,12 @@ bool AlertManeuverRequest::PrepareResponseParameters( LOG4CXX_AUTO_TRACE(logger_); using namespace helpers; - application_manager::commands::ResponseInfo navigation_alert_info( + app_mngr::commands::ResponseInfo navigation_alert_info( navi_alert_maneuver_result_code_, HmiInterfaces::HMI_INTERFACE_Navigation, application_manager_); - application_manager::commands::ResponseInfo tts_alert_info( + app_mngr::commands::ResponseInfo tts_alert_info( tts_speak_result_code_, HmiInterfaces::HMI_INTERFACE_TTS, application_manager_); @@ -231,8 +233,8 @@ bool AlertManeuverRequest::PrepareResponseParameters( } result_code = PrepareResultCodeForResponse(navigation_alert_info, tts_alert_info); - return_info = - MergeInfos(navigation_alert_info, info_navi_, tts_alert_info, info_tts_); + return_info = app_mngr::commands::MergeInfos( + navigation_alert_info, info_navi_, tts_alert_info, info_tts_); return result; } diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/alert_maneuver_response.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/alert_maneuver_response.cc index 92a427a006..e14f577f57 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/alert_maneuver_response.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/alert_maneuver_response.cc @@ -35,12 +35,14 @@ #include "application_manager/rpc_service.h" #include "interfaces/HMI_API.h" -namespace application_manager { +namespace sdl_rpc_plugin { +using namespace application_manager; namespace commands { AlertManeuverResponse::AlertManeuverResponse( - const MessageSharedPtr& message, ApplicationManager& application_manager) + const application_manager::commands::MessageSharedPtr& message, + ApplicationManager& application_manager) : CommandResponseImpl(message, application_manager) {} AlertManeuverResponse::~AlertManeuverResponse() {} diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/alert_request.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/alert_request.cc index 54c93c2f38..3d2f92f490 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/alert_request.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/alert_request.cc @@ -42,12 +42,14 @@ #include "utils/helpers.h" #include "smart_objects/smart_object.h" -namespace application_manager { +namespace sdl_rpc_plugin { +using namespace application_manager; namespace commands { -AlertRequest::AlertRequest(const MessageSharedPtr& message, - ApplicationManager& application_manager) +AlertRequest::AlertRequest( + const application_manager::commands::MessageSharedPtr& message, + ApplicationManager& application_manager) : CommandRequestImpl(message, application_manager) , awaiting_ui_alert_response_(false) , awaiting_tts_speak_response_(false) @@ -196,11 +198,12 @@ void AlertRequest::on_event(const event_engine::Event& event) { bool AlertRequest::PrepareResponseParameters( mobile_apis::Result::eType& result_code, std::string& info) { - ResponseInfo ui_alert_info( + app_mngr::commands::ResponseInfo ui_alert_info( alert_result_, HmiInterfaces::HMI_INTERFACE_UI, application_manager_); - ResponseInfo tts_alert_info(tts_speak_result_, - HmiInterfaces::HMI_INTERFACE_TTS, - application_manager_); + app_mngr::commands::ResponseInfo tts_alert_info( + tts_speak_result_, + HmiInterfaces::HMI_INTERFACE_TTS, + application_manager_); bool result = PrepareResultForMobileResponse(ui_alert_info, tts_alert_info); @@ -217,12 +220,12 @@ bool AlertRequest::PrepareResponseParameters( tts_alert_info.is_unsupported_resource && HmiInterfaces::STATE_AVAILABLE == tts_alert_info.interface_state) { tts_response_info_ = "Unsupported phoneme type sent in a prompt"; - info = MergeInfos( + info = app_mngr::commands::MergeInfos( ui_alert_info, ui_response_info_, tts_alert_info, tts_response_info_); return result; } result_code = PrepareResultCodeForResponse(ui_alert_info, tts_alert_info); - info = MergeInfos( + info = app_mngr::commands::MergeInfos( ui_alert_info, ui_response_info_, tts_alert_info, tts_response_info_); // Mobile Alert request is successful when UI_Alert is successful if (is_ui_alert_sent_ && !ui_alert_info.is_ok) { diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/alert_response.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/alert_response.cc index a1eed99acf..eca7ae9a07 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/alert_response.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/alert_response.cc @@ -37,12 +37,14 @@ #include "interfaces/MOBILE_API.h" #include "interfaces/HMI_API.h" -namespace application_manager { +namespace sdl_rpc_plugin { +using namespace application_manager; namespace commands { -AlertResponse::AlertResponse(const MessageSharedPtr& message, - ApplicationManager& application_manager) +AlertResponse::AlertResponse( + const application_manager::commands::MessageSharedPtr& message, + ApplicationManager& application_manager) : CommandResponseImpl(message, application_manager) {} AlertResponse::~AlertResponse() {} diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/change_registration_request.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/change_registration_request.cc index a82726c1fb..e92ef11703 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/change_registration_request.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/change_registration_request.cc @@ -53,12 +53,14 @@ struct IsSameNickname { }; } -namespace application_manager { +namespace sdl_rpc_plugin { +using namespace application_manager; namespace commands { ChangeRegistrationRequest::ChangeRegistrationRequest( - const MessageSharedPtr& message, ApplicationManager& application_manager) + const application_manager::commands::MessageSharedPtr& message, + ApplicationManager& application_manager) : CommandRequestImpl(message, application_manager) , ui_result_(hmi_apis::Common_Result::INVALID_ENUM) , vr_result_(hmi_apis::Common_Result::INVALID_ENUM) @@ -371,13 +373,13 @@ bool ChangeRegistrationRequest::PrepareResponseParameters( hmi_interfaces.GetInterfaceState( HmiInterfaces::InterfaceID::HMI_INTERFACE_UI); - ResponseInfo ui_properties_info( + app_mngr::commands::ResponseInfo ui_properties_info( ui_result_, HmiInterfaces::HMI_INTERFACE_UI, application_manager_); - ResponseInfo tts_properties_info( + app_mngr::commands::ResponseInfo tts_properties_info( tts_result_, HmiInterfaces::HMI_INTERFACE_TTS, application_manager_); - ResponseInfo vr_properties_info( + app_mngr::commands::ResponseInfo vr_properties_info( ui_result_, HmiInterfaces::HMI_INTERFACE_VR, application_manager_); bool result = ((!is_tts_ui_vr_unsupported) && is_tts_succeeded_unsupported && @@ -442,8 +444,8 @@ bool ChangeRegistrationRequest::PrepareResponseParameters( CheckInfo(vr_response_info_); } - response_info = - MergeInfos(ui_response_info_, vr_response_info_, tts_response_info_); + response_info = app_mngr::commands::MergeInfos( + ui_response_info_, vr_response_info_, tts_response_info_); return result; } diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/change_registration_response.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/change_registration_response.cc index 0f61bbe3cf..58da77aea0 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/change_registration_response.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/change_registration_response.cc @@ -34,12 +34,14 @@ #include "sdl_rpc_plugin/commands/mobile/change_registration_response.h" #include "application_manager/rpc_service.h" -namespace application_manager { +namespace sdl_rpc_plugin { +using namespace application_manager; namespace commands { ChangeRegistrationResponse::ChangeRegistrationResponse( - const MessageSharedPtr& message, ApplicationManager& application_manager) + const application_manager::commands::MessageSharedPtr& message, + ApplicationManager& application_manager) : CommandResponseImpl(message, application_manager) {} ChangeRegistrationResponse::~ChangeRegistrationResponse() {} diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/create_interaction_choice_set_request.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/create_interaction_choice_set_request.cc index f2d2f53d76..7e8582f49d 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/create_interaction_choice_set_request.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/create_interaction_choice_set_request.cc @@ -42,12 +42,14 @@ #include "utils/gen_hash.h" #include "utils/helpers.h" -namespace application_manager { +namespace sdl_rpc_plugin { +using namespace application_manager; namespace commands { CreateInteractionChoiceSetRequest::CreateInteractionChoiceSetRequest( - const MessageSharedPtr& message, ApplicationManager& application_manager) + const application_manager::commands::MessageSharedPtr& message, + ApplicationManager& application_manager) : CommandRequestImpl(message, application_manager) , choice_set_id_(0) , expected_chs_count_(0) diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/create_interaction_choice_set_response.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/create_interaction_choice_set_response.cc index 954eca87fd..2c6dae7b44 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/create_interaction_choice_set_response.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/create_interaction_choice_set_response.cc @@ -36,12 +36,14 @@ #include "application_manager/application_impl.h" #include "interfaces/MOBILE_API.h" -namespace application_manager { +namespace sdl_rpc_plugin { +using namespace application_manager; namespace commands { CreateInteractionChoiceSetResponse::CreateInteractionChoiceSetResponse( - const MessageSharedPtr& message, ApplicationManager& application_manager) + const application_manager::commands::MessageSharedPtr& message, + ApplicationManager& application_manager) : CommandResponseImpl(message, application_manager) {} CreateInteractionChoiceSetResponse::~CreateInteractionChoiceSetResponse() {} diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/delete_command_request.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/delete_command_request.cc index 45d4f74f45..8539d2122a 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/delete_command_request.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/delete_command_request.cc @@ -39,12 +39,14 @@ #include "interfaces/HMI_API.h" #include "utils/helpers.h" -namespace application_manager { +namespace sdl_rpc_plugin { +using namespace application_manager; namespace commands { DeleteCommandRequest::DeleteCommandRequest( - const MessageSharedPtr& message, ApplicationManager& application_manager) + const application_manager::commands::MessageSharedPtr& message, + ApplicationManager& application_manager) : CommandRequestImpl(message, application_manager) , is_ui_send_(false) , is_vr_send_(false) @@ -119,9 +121,9 @@ void DeleteCommandRequest::Run() { bool DeleteCommandRequest::PrepareResponseParameters( mobile_apis::Result::eType& result_code, std::string& info) { using namespace helpers; - ResponseInfo ui_delete_info( + app_mngr::commands::ResponseInfo ui_delete_info( ui_result_, HmiInterfaces::HMI_INTERFACE_UI, application_manager_); - ResponseInfo vr_delete_info( + app_mngr::commands::ResponseInfo vr_delete_info( vr_result_, HmiInterfaces::HMI_INTERFACE_VR, application_manager_); const bool result = PrepareResultForMobileResponse(ui_delete_info, vr_delete_info); @@ -129,7 +131,8 @@ bool DeleteCommandRequest::PrepareResponseParameters( const bool is_vr_or_ui_warning = Compare<hmi_apis::Common_Result::eType, EQ, ONE>( hmi_apis::Common_Result::WARNINGS, ui_result_, vr_result_); - info = MergeInfos(ui_delete_info, ui_info_, vr_delete_info, vr_info_); + info = app_mngr::commands::MergeInfos( + ui_delete_info, ui_info_, vr_delete_info, vr_info_); if (is_vr_or_ui_warning && !ui_delete_info.is_unsupported_resource && !vr_delete_info.is_unsupported_resource) { LOG4CXX_DEBUG(logger_, "VR or UI result is warning"); diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/delete_command_response.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/delete_command_response.cc index cfdb679a6a..726434627f 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/delete_command_response.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/delete_command_response.cc @@ -34,12 +34,14 @@ #include "sdl_rpc_plugin/commands/mobile/delete_command_response.h" #include "application_manager/rpc_service.h" -namespace application_manager { +namespace sdl_rpc_plugin { +using namespace application_manager; namespace commands { DeleteCommandResponse::DeleteCommandResponse( - const MessageSharedPtr& message, ApplicationManager& application_manager) + const application_manager::commands::MessageSharedPtr& message, + ApplicationManager& application_manager) : CommandResponseImpl(message, application_manager) {} DeleteCommandResponse::~DeleteCommandResponse() {} diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/delete_file_request.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/delete_file_request.cc index 309a708be8..c16e840660 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/delete_file_request.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/delete_file_request.cc @@ -37,12 +37,14 @@ #include "utils/file_system.h" -namespace application_manager { +namespace sdl_rpc_plugin { +using namespace application_manager; namespace commands { -DeleteFileRequest::DeleteFileRequest(const MessageSharedPtr& message, - ApplicationManager& application_manager) +DeleteFileRequest::DeleteFileRequest( + const application_manager::commands::MessageSharedPtr& message, + ApplicationManager& application_manager) : CommandRequestImpl(message, application_manager) {} DeleteFileRequest::~DeleteFileRequest() {} @@ -88,7 +90,8 @@ void DeleteFileRequest::Run() { if (file_system::FileExists(full_file_path)) { if (file_system::DeleteFile(full_file_path)) { - const AppFile* file = application->GetFile(full_file_path); + const application_manager::AppFile* file = + application->GetFile(full_file_path); if (file) { SendFileRemovedNotification(file); } @@ -104,7 +107,8 @@ void DeleteFileRequest::Run() { } } -void DeleteFileRequest::SendFileRemovedNotification(const AppFile* file) const { +void DeleteFileRequest::SendFileRemovedNotification( + const application_manager::AppFile* file) const { smart_objects::SmartObject msg_params = smart_objects::SmartObject(smart_objects::SmartType_Map); diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/delete_file_response.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/delete_file_response.cc index cf64bed049..24289df704 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/delete_file_response.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/delete_file_response.cc @@ -35,12 +35,14 @@ #include "application_manager/application_impl.h" -namespace application_manager { +namespace sdl_rpc_plugin { +using namespace application_manager; namespace commands { -DeleteFileResponse::DeleteFileResponse(const MessageSharedPtr& message, - ApplicationManager& application_manager) +DeleteFileResponse::DeleteFileResponse( + const application_manager::commands::MessageSharedPtr& message, + ApplicationManager& application_manager) : CommandResponseImpl(message, application_manager) {} DeleteFileResponse::~DeleteFileResponse() {} diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/delete_interaction_choice_set_request.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/delete_interaction_choice_set_request.cc index 048453a296..6cccff2b1f 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/delete_interaction_choice_set_request.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/delete_interaction_choice_set_request.cc @@ -38,12 +38,14 @@ #include "interfaces/HMI_API.h" #include "application_manager/message_helper.h" -namespace application_manager { +namespace sdl_rpc_plugin { +using namespace application_manager; namespace commands { DeleteInteractionChoiceSetRequest::DeleteInteractionChoiceSetRequest( - const MessageSharedPtr& message, ApplicationManager& application_manager) + const application_manager::commands::MessageSharedPtr& message, + ApplicationManager& application_manager) : CommandRequestImpl(message, application_manager) {} DeleteInteractionChoiceSetRequest::~DeleteInteractionChoiceSetRequest() {} diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/delete_interaction_choice_set_response.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/delete_interaction_choice_set_response.cc index ea6800203a..27e591f352 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/delete_interaction_choice_set_response.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/delete_interaction_choice_set_response.cc @@ -37,12 +37,14 @@ #include "interfaces/MOBILE_API.h" #include "interfaces/HMI_API.h" -namespace application_manager { +namespace sdl_rpc_plugin { +using namespace application_manager; namespace commands { DeleteInteractionChoiceSetResponse::DeleteInteractionChoiceSetResponse( - const MessageSharedPtr& message, ApplicationManager& application_manager) + const application_manager::commands::MessageSharedPtr& message, + ApplicationManager& application_manager) : CommandResponseImpl(message, application_manager) {} DeleteInteractionChoiceSetResponse::~DeleteInteractionChoiceSetResponse() {} diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/delete_sub_menu_request.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/delete_sub_menu_request.cc index a6ec690b8f..499e1e2e3f 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/delete_sub_menu_request.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/delete_sub_menu_request.cc @@ -38,12 +38,14 @@ #include "interfaces/HMI_API.h" #include "utils/helpers.h" -namespace application_manager { +namespace sdl_rpc_plugin { +using namespace application_manager; namespace commands { DeleteSubMenuRequest::DeleteSubMenuRequest( - const MessageSharedPtr& message, ApplicationManager& application_manager) + const application_manager::commands::MessageSharedPtr& message, + ApplicationManager& application_manager) : CommandRequestImpl(message, application_manager) {} DeleteSubMenuRequest::~DeleteSubMenuRequest() {} diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/delete_sub_menu_response.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/delete_sub_menu_response.cc index fd542ad50d..966579e163 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/delete_sub_menu_response.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/delete_sub_menu_response.cc @@ -34,12 +34,14 @@ #include "sdl_rpc_plugin/commands/mobile/delete_sub_menu_response.h" #include "application_manager/rpc_service.h" -namespace application_manager { +namespace sdl_rpc_plugin { +using namespace application_manager; namespace commands { DeleteSubMenuResponse::DeleteSubMenuResponse( - const MessageSharedPtr& message, ApplicationManager& application_manager) + const application_manager::commands::MessageSharedPtr& message, + ApplicationManager& application_manager) : CommandResponseImpl(message, application_manager) {} DeleteSubMenuResponse::~DeleteSubMenuResponse() {} diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/diagnostic_message_request.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/diagnostic_message_request.cc index 839a18530a..5fe4bbdc8a 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/diagnostic_message_request.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/diagnostic_message_request.cc @@ -39,12 +39,14 @@ #include "interfaces/HMI_API.h" #include "application_manager/message_helper.h" -namespace application_manager { +namespace sdl_rpc_plugin { +using namespace application_manager; namespace commands { DiagnosticMessageRequest::DiagnosticMessageRequest( - const MessageSharedPtr& message, ApplicationManager& application_manager) + const application_manager::commands::MessageSharedPtr& message, + ApplicationManager& application_manager) : CommandRequestImpl(message, application_manager) {} DiagnosticMessageRequest::~DiagnosticMessageRequest() {} diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/diagnostic_message_response.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/diagnostic_message_response.cc index ffa06ff0a8..9c3952e6df 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/diagnostic_message_response.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/diagnostic_message_response.cc @@ -34,12 +34,14 @@ #include "sdl_rpc_plugin/commands/mobile/diagnostic_message_response.h" #include "application_manager/rpc_service.h" -namespace application_manager { +namespace sdl_rpc_plugin { +using namespace application_manager; namespace commands { DiagnosticMessageResponse::DiagnosticMessageResponse( - const MessageSharedPtr& message, ApplicationManager& application_manager) + const application_manager::commands::MessageSharedPtr& message, + ApplicationManager& application_manager) : CommandResponseImpl(message, application_manager) {} DiagnosticMessageResponse::~DiagnosticMessageResponse() {} diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/dial_number_request.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/dial_number_request.cc index 16b8516fb2..3c59e00e9b 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/dial_number_request.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/dial_number_request.cc @@ -36,12 +36,14 @@ #include "application_manager/application_impl.h" -namespace application_manager { +namespace sdl_rpc_plugin { +using namespace application_manager; namespace commands { -DialNumberRequest::DialNumberRequest(const MessageSharedPtr& message, - ApplicationManager& application_manager) +DialNumberRequest::DialNumberRequest( + const application_manager::commands::MessageSharedPtr& message, + ApplicationManager& application_manager) : CommandRequestImpl(message, application_manager) {} DialNumberRequest::~DialNumberRequest() {} diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/dial_number_response.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/dial_number_response.cc index 5979a4d704..ffe43a18f7 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/dial_number_response.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/dial_number_response.cc @@ -33,12 +33,14 @@ #include "sdl_rpc_plugin/commands/mobile/dial_number_response.h" #include "application_manager/rpc_service.h" -namespace application_manager { +namespace sdl_rpc_plugin { +using namespace application_manager; namespace commands { -DialNumberResponse::DialNumberResponse(const MessageSharedPtr& message, - ApplicationManager& application_manager) +DialNumberResponse::DialNumberResponse( + const application_manager::commands::MessageSharedPtr& message, + ApplicationManager& application_manager) : CommandResponseImpl(message, application_manager) {} DialNumberResponse::~DialNumberResponse() {} diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/end_audio_pass_thru_request.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/end_audio_pass_thru_request.cc index e6de193cca..845ca4838c 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/end_audio_pass_thru_request.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/end_audio_pass_thru_request.cc @@ -34,12 +34,14 @@ #include "sdl_rpc_plugin/commands/mobile/end_audio_pass_thru_request.h" #include "application_manager/message_helper.h" -namespace application_manager { +namespace sdl_rpc_plugin { +using namespace application_manager; namespace commands { EndAudioPassThruRequest::EndAudioPassThruRequest( - const MessageSharedPtr& message, ApplicationManager& application_manager) + const application_manager::commands::MessageSharedPtr& message, + ApplicationManager& application_manager) : CommandRequestImpl(message, application_manager) {} EndAudioPassThruRequest::~EndAudioPassThruRequest() {} diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/end_audio_pass_thru_response.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/end_audio_pass_thru_response.cc index af15d1eee8..2953a169b0 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/end_audio_pass_thru_response.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/end_audio_pass_thru_response.cc @@ -34,12 +34,14 @@ #include "sdl_rpc_plugin/commands/mobile/end_audio_pass_thru_response.h" #include "application_manager/rpc_service.h" -namespace application_manager { +namespace sdl_rpc_plugin { +using namespace application_manager; namespace commands { EndAudioPassThruResponse::EndAudioPassThruResponse( - const MessageSharedPtr& message, ApplicationManager& application_manager) + const application_manager::commands::MessageSharedPtr& message, + ApplicationManager& application_manager) : CommandResponseImpl(message, application_manager) {} EndAudioPassThruResponse::~EndAudioPassThruResponse() {} diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/generic_response.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/generic_response.cc index 9e6b2ddc8a..9614e635a2 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/generic_response.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/generic_response.cc @@ -35,7 +35,8 @@ #include "application_manager/application_impl.h" -namespace application_manager { +namespace sdl_rpc_plugin { +using namespace application_manager; namespace commands { diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/get_dtcs_request.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/get_dtcs_request.cc index 100bf52ebc..5951a4b066 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/get_dtcs_request.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/get_dtcs_request.cc @@ -37,12 +37,14 @@ #include "interfaces/HMI_API.h" #include "application_manager/message_helper.h" -namespace application_manager { +namespace sdl_rpc_plugin { +using namespace application_manager; namespace commands { -GetDTCsRequest::GetDTCsRequest(const MessageSharedPtr& message, - ApplicationManager& application_manager) +GetDTCsRequest::GetDTCsRequest( + const application_manager::commands::MessageSharedPtr& message, + ApplicationManager& application_manager) : CommandRequestImpl(message, application_manager) {} GetDTCsRequest::~GetDTCsRequest() {} diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/get_dtcs_response.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/get_dtcs_response.cc index 32ff9b0d4f..3dbc604f1d 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/get_dtcs_response.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/get_dtcs_response.cc @@ -34,12 +34,14 @@ #include "sdl_rpc_plugin/commands/mobile/get_dtcs_response.h" #include "application_manager/rpc_service.h" -namespace application_manager { +namespace sdl_rpc_plugin { +using namespace application_manager; namespace commands { -GetDTCsResponse::GetDTCsResponse(const MessageSharedPtr& message, - ApplicationManager& application_manager) +GetDTCsResponse::GetDTCsResponse( + const application_manager::commands::MessageSharedPtr& message, + ApplicationManager& application_manager) : CommandResponseImpl(message, application_manager) {} GetDTCsResponse::~GetDTCsResponse() {} diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/get_system_capability_request.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/get_system_capability_request.cc index 85e6ece6a1..c9ab9a4e69 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/get_system_capability_request.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/get_system_capability_request.cc @@ -1,11 +1,13 @@ #include "sdl_rpc_plugin/commands/mobile/get_system_capability_request.h" -namespace application_manager { +namespace sdl_rpc_plugin { +using namespace application_manager; namespace commands { GetSystemCapabilityRequest::GetSystemCapabilityRequest( - const MessageSharedPtr& message, ApplicationManager& application_manager) + const application_manager::commands::MessageSharedPtr& message, + ApplicationManager& application_manager) : CommandRequestImpl(message, application_manager) {} GetSystemCapabilityRequest::~GetSystemCapabilityRequest() {} diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/get_system_capability_response.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/get_system_capability_response.cc index 1353bd670e..fd3750e243 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/get_system_capability_response.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/get_system_capability_response.cc @@ -2,12 +2,14 @@ #include "application_manager/rpc_service.h" #include "sdl_rpc_plugin/commands/mobile/get_system_capability_response.h" -namespace application_manager { +namespace sdl_rpc_plugin { +using namespace application_manager; namespace commands { GetSystemCapabilityResponse::GetSystemCapabilityResponse( - const MessageSharedPtr& message, ApplicationManager& application_manager) + const application_manager::commands::MessageSharedPtr& message, + ApplicationManager& application_manager) : CommandResponseImpl(message, application_manager) {} GetSystemCapabilityResponse::~GetSystemCapabilityResponse() {} diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/get_vehicle_data_request.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/get_vehicle_data_request.cc index 17c89edf55..3dfcc48e7b 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/get_vehicle_data_request.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/get_vehicle_data_request.cc @@ -39,7 +39,8 @@ #include "interfaces/MOBILE_API.h" #include "interfaces/HMI_API.h" -namespace application_manager { +namespace sdl_rpc_plugin { +using namespace application_manager; namespace commands { @@ -47,7 +48,8 @@ namespace str = strings; #ifdef HMI_DBUS_API GetVehicleDataRequest::GetVehicleDataRequest( - const MessageSharedPtr& message, ApplicationManager& application_manager) + const application_manager::commands::MessageSharedPtr& message, + ApplicationManager& application_manager) : CommandRequestImpl(message, application_manager) {} GetVehicleDataRequest::~GetVehicleDataRequest() {} @@ -212,7 +214,8 @@ void GetVehicleDataRequest::on_event(const event_engine::Event& event) { } #else GetVehicleDataRequest::GetVehicleDataRequest( - const MessageSharedPtr& message, ApplicationManager& application_manager) + const application_manager::commands::MessageSharedPtr& message, + ApplicationManager& application_manager) : CommandRequestImpl(message, application_manager) {} GetVehicleDataRequest::~GetVehicleDataRequest() {} diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/get_vehicle_data_response.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/get_vehicle_data_response.cc index b0104e0ce9..7657c3ff49 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/get_vehicle_data_response.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/get_vehicle_data_response.cc @@ -35,12 +35,14 @@ #include "application_manager/rpc_service.h" #include "interfaces/HMI_API.h" -namespace application_manager { +namespace sdl_rpc_plugin { +using namespace application_manager; namespace commands { GetVehicleDataResponse::GetVehicleDataResponse( - const MessageSharedPtr& message, ApplicationManager& application_manager) + const application_manager::commands::MessageSharedPtr& message, + ApplicationManager& application_manager) : CommandResponseImpl(message, application_manager) {} GetVehicleDataResponse::~GetVehicleDataResponse() {} diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/get_way_points_request.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/get_way_points_request.cc index 56491a4643..51b8880242 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/get_way_points_request.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/get_way_points_request.cc @@ -2,12 +2,14 @@ #include "sdl_rpc_plugin/commands/mobile/get_way_points_request.h" #include "application_manager/message_helper.h" -namespace application_manager { +namespace sdl_rpc_plugin { +using namespace application_manager; namespace commands { GetWayPointsRequest::GetWayPointsRequest( - const MessageSharedPtr& message, ApplicationManager& application_manager) + const application_manager::commands::MessageSharedPtr& message, + ApplicationManager& application_manager) : CommandRequestImpl(message, application_manager) { subscribe_on_event(hmi_apis::FunctionID::UI_OnResetTimeout); } diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/get_way_points_response.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/get_way_points_response.cc index a78f83a4dc..84761838de 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/get_way_points_response.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/get_way_points_response.cc @@ -2,12 +2,14 @@ #include "sdl_rpc_plugin/commands/mobile/get_way_points_response.h" #include "application_manager/rpc_service.h" -namespace application_manager { +namespace sdl_rpc_plugin { +using namespace application_manager; namespace commands { GetWayPointsResponse::GetWayPointsResponse( - const MessageSharedPtr& message, ApplicationManager& application_manager) + const application_manager::commands::MessageSharedPtr& message, + ApplicationManager& application_manager) : CommandResponseImpl(message, application_manager) {} GetWayPointsResponse::~GetWayPointsResponse() {} diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/list_files_request.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/list_files_request.cc index 6f83eb14b2..592f4da24a 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/list_files_request.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/list_files_request.cc @@ -39,12 +39,14 @@ #include "sdl_rpc_plugin/mobile_command_factory.h" #include "utils/file_system.h" -namespace application_manager { +namespace sdl_rpc_plugin { +using namespace application_manager; namespace commands { -ListFilesRequest::ListFilesRequest(const MessageSharedPtr& message, - ApplicationManager& application_manager) +ListFilesRequest::ListFilesRequest( + const application_manager::commands::MessageSharedPtr& message, + ApplicationManager& application_manager) : CommandRequestImpl(message, application_manager) {} ListFilesRequest::~ListFilesRequest() {} diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/list_files_response.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/list_files_response.cc index 63408af092..07baab02ea 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/list_files_response.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/list_files_response.cc @@ -35,12 +35,14 @@ #include "application_manager/rpc_service.h" #include "application_manager/application_impl.h" -namespace application_manager { +namespace sdl_rpc_plugin { +using namespace application_manager; namespace commands { -ListFilesResponse::ListFilesResponse(const MessageSharedPtr& message, - ApplicationManager& application_manager) +ListFilesResponse::ListFilesResponse( + const application_manager::commands::MessageSharedPtr& message, + ApplicationManager& application_manager) : CommandResponseImpl(message, application_manager) {} ListFilesResponse::~ListFilesResponse() {} diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/on_app_interface_unregistered_notification.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/on_app_interface_unregistered_notification.cc index fe2fda7373..6a0fc0bb0e 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/on_app_interface_unregistered_notification.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/on_app_interface_unregistered_notification.cc @@ -35,11 +35,13 @@ #include "application_manager/message.h" #include "interfaces/MOBILE_API.h" -namespace application_manager { +namespace sdl_rpc_plugin { +using namespace application_manager; namespace commands { OnAppInterfaceUnregisteredNotification::OnAppInterfaceUnregisteredNotification( - const MessageSharedPtr& message, ApplicationManager& application_manager) + const application_manager::commands::MessageSharedPtr& message, + ApplicationManager& application_manager) : CommandNotificationImpl(message, application_manager) {} OnAppInterfaceUnregisteredNotification:: diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/on_audio_pass_thru_notification.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/on_audio_pass_thru_notification.cc index a01ef114ee..d9fc16ed53 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/on_audio_pass_thru_notification.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/on_audio_pass_thru_notification.cc @@ -33,11 +33,13 @@ #include "sdl_rpc_plugin/commands/mobile/on_audio_pass_thru_notification.h" -namespace application_manager { +namespace sdl_rpc_plugin { +using namespace application_manager; namespace commands { OnAudioPassThruNotification::OnAudioPassThruNotification( - const MessageSharedPtr& message, ApplicationManager& application_manager) + const application_manager::commands::MessageSharedPtr& message, + ApplicationManager& application_manager) : CommandNotificationImpl(message, application_manager) {} OnAudioPassThruNotification::~OnAudioPassThruNotification() {} diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/on_button_event_notification.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/on_button_event_notification.cc index 2b9e2ba49d..cea02018f0 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/on_button_event_notification.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/on_button_event_notification.cc @@ -36,14 +36,16 @@ #include "application_manager/application_impl.h" #include "interfaces/MOBILE_API.h" -namespace application_manager { +namespace sdl_rpc_plugin { +using namespace application_manager; namespace commands { namespace mobile { OnButtonEventNotification::OnButtonEventNotification( - const MessageSharedPtr& message, ApplicationManager& application_manager) + const application_manager::commands::MessageSharedPtr& message, + ApplicationManager& application_manager) : CommandNotificationImpl(message, application_manager) {} OnButtonEventNotification::~OnButtonEventNotification() {} diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/on_button_press_notification.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/on_button_press_notification.cc index e7c267e3d4..bfb5f3110d 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/on_button_press_notification.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/on_button_press_notification.cc @@ -36,14 +36,16 @@ #include "application_manager/application_impl.h" #include "interfaces/MOBILE_API.h" -namespace application_manager { +namespace sdl_rpc_plugin { +using namespace application_manager; namespace commands { namespace mobile { OnButtonPressNotification::OnButtonPressNotification( - const MessageSharedPtr& message, ApplicationManager& application_manager) + const application_manager::commands::MessageSharedPtr& message, + ApplicationManager& application_manager) : CommandNotificationImpl(message, application_manager) {} OnButtonPressNotification::~OnButtonPressNotification() {} diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/on_command_notification.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/on_command_notification.cc index 3fbeb8f6b3..ff4cc61eac 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/on_command_notification.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/on_command_notification.cc @@ -35,12 +35,14 @@ #include "application_manager/application_impl.h" -namespace application_manager { +namespace sdl_rpc_plugin { +using namespace application_manager; namespace commands { OnCommandNotification::OnCommandNotification( - const MessageSharedPtr& message, ApplicationManager& application_manager) + const application_manager::commands::MessageSharedPtr& message, + ApplicationManager& application_manager) : CommandNotificationImpl(message, application_manager) {} OnCommandNotification::~OnCommandNotification() {} diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/on_driver_distraction_notification.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/on_driver_distraction_notification.cc index 5d1684d5fe..9ac6102597 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/on_driver_distraction_notification.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/on_driver_distraction_notification.cc @@ -36,14 +36,16 @@ #include "application_manager/application_impl.h" #include "interfaces/MOBILE_API.h" -namespace application_manager { +namespace sdl_rpc_plugin { +using namespace application_manager; namespace commands { namespace mobile { OnDriverDistractionNotification::OnDriverDistractionNotification( - const MessageSharedPtr& message, ApplicationManager& application_manager) + const application_manager::commands::MessageSharedPtr& message, + ApplicationManager& application_manager) : CommandNotificationImpl(message, application_manager) {} OnDriverDistractionNotification::~OnDriverDistractionNotification() {} diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/on_hash_change_notification.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/on_hash_change_notification.cc index b7d0a76c9b..92d84f3a46 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/on_hash_change_notification.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/on_hash_change_notification.cc @@ -38,14 +38,16 @@ #include "interfaces/MOBILE_API.h" #include <string> -namespace application_manager { +namespace sdl_rpc_plugin { +using namespace application_manager; namespace commands { namespace mobile { OnHashChangeNotification::OnHashChangeNotification( - const MessageSharedPtr& message, ApplicationManager& application_manager) + const application_manager::commands::MessageSharedPtr& message, + ApplicationManager& application_manager) : CommandNotificationImpl(message, application_manager) {} OnHashChangeNotification::~OnHashChangeNotification() {} diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/on_hmi_status_notification.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/on_hmi_status_notification.cc index b38c992fa7..21092f1c47 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/on_hmi_status_notification.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/on_hmi_status_notification.cc @@ -37,11 +37,13 @@ #include "application_manager/message.h" #include "interfaces/MOBILE_API.h" -namespace application_manager { +namespace sdl_rpc_plugin { +using namespace application_manager; namespace commands { OnHMIStatusNotification::OnHMIStatusNotification( - const MessageSharedPtr& message, ApplicationManager& application_manager) + const application_manager::commands::MessageSharedPtr& message, + ApplicationManager& application_manager) : CommandNotificationImpl(message, application_manager) {} OnHMIStatusNotification::~OnHMIStatusNotification() {} diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/on_hmi_status_notification_from_mobile.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/on_hmi_status_notification_from_mobile.cc index 97a0e03bd2..5a55b81f4f 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/on_hmi_status_notification_from_mobile.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/on_hmi_status_notification_from_mobile.cc @@ -35,11 +35,13 @@ #include "application_manager/message_helper.h" #include "application_manager/message.h" -namespace application_manager { +namespace sdl_rpc_plugin { +using namespace application_manager; namespace commands { OnHMIStatusNotificationFromMobile::OnHMIStatusNotificationFromMobile( - const MessageSharedPtr& message, ApplicationManager& application_manager) + const application_manager::commands::MessageSharedPtr& message, + ApplicationManager& application_manager) : CommandNotificationFromMobileImpl(message, application_manager) {} OnHMIStatusNotificationFromMobile::~OnHMIStatusNotificationFromMobile() {} diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/on_keyboard_input_notification.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/on_keyboard_input_notification.cc index 73e732af26..7996cc0a8f 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/on_keyboard_input_notification.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/on_keyboard_input_notification.cc @@ -36,14 +36,16 @@ #include "application_manager/application_impl.h" #include "interfaces/MOBILE_API.h" -namespace application_manager { +namespace sdl_rpc_plugin { +using namespace application_manager; namespace commands { namespace mobile { OnKeyBoardInputNotification::OnKeyBoardInputNotification( - const MessageSharedPtr& message, ApplicationManager& application_manager) + const application_manager::commands::MessageSharedPtr& message, + ApplicationManager& application_manager) : CommandNotificationImpl(message, application_manager) {} OnKeyBoardInputNotification::~OnKeyBoardInputNotification() {} diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/on_language_change_notification.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/on_language_change_notification.cc index 0222145ea6..755854d672 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/on_language_change_notification.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/on_language_change_notification.cc @@ -33,12 +33,14 @@ #include "sdl_rpc_plugin/commands/mobile/on_language_change_notification.h" -namespace application_manager { +namespace sdl_rpc_plugin { +using namespace application_manager; namespace commands { OnLanguageChangeNotification::OnLanguageChangeNotification( - const MessageSharedPtr& message, ApplicationManager& application_manager) + const application_manager::commands::MessageSharedPtr& message, + ApplicationManager& application_manager) : CommandNotificationImpl(message, application_manager) {} OnLanguageChangeNotification::~OnLanguageChangeNotification() {} diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/on_permissions_change_notification.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/on_permissions_change_notification.cc index 8f2f4adf82..2fd028058f 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/on_permissions_change_notification.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/on_permissions_change_notification.cc @@ -35,12 +35,14 @@ #include "application_manager/message.h" #include "interfaces/MOBILE_API.h" -namespace application_manager { +namespace sdl_rpc_plugin { +using namespace application_manager; namespace commands { OnPermissionsChangeNotification::OnPermissionsChangeNotification( - const MessageSharedPtr& message, ApplicationManager& application_manager) + const application_manager::commands::MessageSharedPtr& message, + ApplicationManager& application_manager) : CommandNotificationImpl(message, application_manager) {} OnPermissionsChangeNotification::~OnPermissionsChangeNotification() {} diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/on_system_request_notification.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/on_system_request_notification.cc index 3f5c2dcfd8..f538d82950 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/on_system_request_notification.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/on_system_request_notification.cc @@ -40,14 +40,16 @@ #include "application_manager/application_manager.h" #include "application_manager/policies/policy_handler_interface.h" -namespace application_manager { +namespace sdl_rpc_plugin { +using namespace application_manager; namespace commands { namespace mobile { OnSystemRequestNotification::OnSystemRequestNotification( - const MessageSharedPtr& message, ApplicationManager& application_manager) + const application_manager::commands::MessageSharedPtr& message, + ApplicationManager& application_manager) : CommandNotificationImpl(message, application_manager) {} OnSystemRequestNotification::~OnSystemRequestNotification() {} diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/on_tbt_client_state_notification.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/on_tbt_client_state_notification.cc index 3b2268d6a2..8115e638a2 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/on_tbt_client_state_notification.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/on_tbt_client_state_notification.cc @@ -36,12 +36,14 @@ #include "application_manager/application_impl.h" #include "interfaces/MOBILE_API.h" -namespace application_manager { +namespace sdl_rpc_plugin { +using namespace application_manager; namespace commands { OnTBTClientStateNotification::OnTBTClientStateNotification( - const MessageSharedPtr& message, ApplicationManager& application_manager) + const application_manager::commands::MessageSharedPtr& message, + ApplicationManager& application_manager) : CommandNotificationImpl(message, application_manager) {} OnTBTClientStateNotification::~OnTBTClientStateNotification() {} diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/on_touch_event_notification.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/on_touch_event_notification.cc index 2e9b02b0e0..057db8e395 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/on_touch_event_notification.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/on_touch_event_notification.cc @@ -35,14 +35,16 @@ #include "application_manager/application_impl.h" -namespace application_manager { +namespace sdl_rpc_plugin { +using namespace application_manager; namespace commands { namespace mobile { OnTouchEventNotification::OnTouchEventNotification( - const MessageSharedPtr& message, ApplicationManager& application_manager) + const application_manager::commands::MessageSharedPtr& message, + ApplicationManager& application_manager) : CommandNotificationImpl(message, application_manager) {} OnTouchEventNotification::~OnTouchEventNotification() {} diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/on_vehicle_data_notification.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/on_vehicle_data_notification.cc index 55116340a0..fdca096ea2 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/on_vehicle_data_notification.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/on_vehicle_data_notification.cc @@ -37,12 +37,14 @@ #include "application_manager/message_helper.h" #include "interfaces/MOBILE_API.h" -namespace application_manager { +namespace sdl_rpc_plugin { +using namespace application_manager; namespace commands { OnVehicleDataNotification::OnVehicleDataNotification( - const MessageSharedPtr& message, ApplicationManager& application_manager) + const application_manager::commands::MessageSharedPtr& message, + ApplicationManager& application_manager) : CommandNotificationImpl(message, application_manager) {} OnVehicleDataNotification::~OnVehicleDataNotification() {} diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/on_way_point_change_notification.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/on_way_point_change_notification.cc index 58b7416d72..0e9d6c5ebc 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/on_way_point_change_notification.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/on_way_point_change_notification.cc @@ -34,11 +34,13 @@ #include "sdl_rpc_plugin/commands/mobile/on_way_point_change_notification.h" #include "application_manager/application_manager.h" -namespace application_manager { +namespace sdl_rpc_plugin { +using namespace application_manager; namespace commands { OnWayPointChangeNotification::OnWayPointChangeNotification( - const MessageSharedPtr& message, ApplicationManager& application_manager) + const application_manager::commands::MessageSharedPtr& message, + ApplicationManager& application_manager) : CommandNotificationImpl(message, application_manager) {} OnWayPointChangeNotification::~OnWayPointChangeNotification() {} diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/perform_audio_pass_thru_request.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/perform_audio_pass_thru_request.cc index f929a36b63..c1960df924 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/perform_audio_pass_thru_request.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/perform_audio_pass_thru_request.cc @@ -38,14 +38,16 @@ #include "application_manager/message_helper.h" #include "utils/helpers.h" -namespace application_manager { +namespace sdl_rpc_plugin { +using namespace application_manager; namespace commands { namespace str = strings; PerformAudioPassThruRequest::PerformAudioPassThruRequest( - const MessageSharedPtr& message, ApplicationManager& application_manager) + const application_manager::commands::MessageSharedPtr& message, + ApplicationManager& application_manager) : CommandRequestImpl(message, application_manager) , result_tts_speak_(hmi_apis::Common_Result::INVALID_ENUM) , result_ui_(hmi_apis::Common_Result::INVALID_ENUM) { @@ -206,11 +208,12 @@ const PerformAudioPassThruRequest::ResponseParams& PerformAudioPassThruRequest::PrepareResponseParameters() { LOG4CXX_AUTO_TRACE(logger_); - ResponseInfo ui_perform_info( + app_mngr::commands::ResponseInfo ui_perform_info( result_ui_, HmiInterfaces::HMI_INTERFACE_UI, application_manager_); - ResponseInfo tts_perform_info(result_tts_speak_, - HmiInterfaces::HMI_INTERFACE_TTS, - application_manager_); + app_mngr::commands::ResponseInfo tts_perform_info( + result_tts_speak_, + HmiInterfaces::HMI_INTERFACE_TTS, + application_manager_); // Note(dtrunov): According to requirment "WARNINGS, success:true on getting // UNSUPPORTED_RESOURCE for "ttsChunks" @@ -218,8 +221,8 @@ PerformAudioPassThruRequest::PrepareResponseParameters() { HmiInterfaces::STATE_AVAILABLE == tts_perform_info.interface_state) { response_params_.result_code = mobile_apis::Result::WARNINGS; tts_info_ = "Unsupported phoneme type sent in a prompt"; - response_params_.info = - MergeInfos(ui_perform_info, ui_info_, tts_perform_info, tts_info_); + response_params_.info = app_mngr::commands::MergeInfos( + ui_perform_info, ui_info_, tts_perform_info, tts_info_); response_params_.success = true; return response_params_; } @@ -234,8 +237,8 @@ PerformAudioPassThruRequest::PrepareResponseParameters() { response_params_.success = results.second; response_params_.result_code = results.first; } - response_params_.info = - MergeInfos(ui_perform_info, ui_info_, tts_perform_info, tts_info_); + response_params_.info = app_mngr::commands::MergeInfos( + ui_perform_info, ui_info_, tts_perform_info, tts_info_); return response_params_; } @@ -401,7 +404,8 @@ void PerformAudioPassThruRequest::FinishTTSSpeak() { PerformAudioPassThruRequest::AudioPassThruResults PerformAudioPassThruRequest::PrepareAudioPassThruResultCodeForResponse( - const ResponseInfo& ui_response, const ResponseInfo& tts_response) { + const app_mngr::commands::ResponseInfo& ui_response, + const app_mngr::commands::ResponseInfo& tts_response) { mobile_apis::Result::eType result_code = mobile_apis::Result::INVALID_ENUM; hmi_apis::Common_Result::eType common_result = diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/perform_audio_pass_thru_response.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/perform_audio_pass_thru_response.cc index d0e9eabb95..6dbcf06621 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/perform_audio_pass_thru_response.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/perform_audio_pass_thru_response.cc @@ -34,12 +34,14 @@ #include "sdl_rpc_plugin/commands/mobile/perform_audio_pass_thru_response.h" #include "application_manager/rpc_service.h" -namespace application_manager { +namespace sdl_rpc_plugin { +using namespace application_manager; namespace commands { PerformAudioPassThruResponse::PerformAudioPassThruResponse( - const MessageSharedPtr& message, ApplicationManager& application_manager) + const application_manager::commands::MessageSharedPtr& message, + ApplicationManager& application_manager) : CommandResponseImpl(message, application_manager) {} PerformAudioPassThruResponse::~PerformAudioPassThruResponse() {} diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/perform_interaction_request.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/perform_interaction_request.cc index e0e9eb3934..1c6b4b2863 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/perform_interaction_request.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/perform_interaction_request.cc @@ -46,7 +46,8 @@ #include "utils/custom_string.h" #include "utils/gen_hash.h" -namespace application_manager { +namespace sdl_rpc_plugin { +using namespace application_manager; namespace commands { @@ -55,7 +56,8 @@ namespace custom_str = utils::custom_string; uint32_t PerformInteractionRequest::pi_requests_count_ = 0; PerformInteractionRequest::PerformInteractionRequest( - const MessageSharedPtr& message, ApplicationManager& application_manager) + const application_manager::commands::MessageSharedPtr& message, + ApplicationManager& application_manager) : CommandRequestImpl(message, application_manager) , interaction_mode_(mobile_apis::InteractionMode::INVALID_ENUM) , ui_response_received_(false) @@ -980,9 +982,9 @@ void PerformInteractionRequest::SendBothModeResponse( LOG4CXX_AUTO_TRACE(logger_); mobile_apis::Result::eType perform_interaction_result_code = mobile_apis::Result::INVALID_ENUM; - ResponseInfo ui_perform_info( + app_mngr::commands::ResponseInfo ui_perform_info( ui_result_code_, HmiInterfaces::HMI_INTERFACE_UI, application_manager_); - ResponseInfo vr_perform_info( + app_mngr::commands::ResponseInfo vr_perform_info( vr_result_code_, HmiInterfaces::HMI_INTERFACE_VR, application_manager_); const bool result = PrepareResultForMobileResponse(ui_perform_info, vr_perform_info); @@ -990,8 +992,8 @@ void PerformInteractionRequest::SendBothModeResponse( PrepareResultCodeForResponse(ui_perform_info, vr_perform_info); const smart_objects::SmartObject* response_params = msg_param.empty() ? NULL : &msg_param; - std::string info = - MergeInfos(ui_perform_info, ui_info_, vr_perform_info, vr_info_); + std::string info = app_mngr::commands::MergeInfos( + ui_perform_info, ui_info_, vr_perform_info, vr_info_); DisablePerformInteraction(); SendResponse(result, perform_interaction_result_code, diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/perform_interaction_response.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/perform_interaction_response.cc index 24203858b6..1e9bccee97 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/perform_interaction_response.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/perform_interaction_response.cc @@ -34,12 +34,14 @@ #include "sdl_rpc_plugin/commands/mobile/perform_interaction_response.h" #include "application_manager/rpc_service.h" -namespace application_manager { +namespace sdl_rpc_plugin { +using namespace application_manager; namespace commands { PerformInteractionResponse::PerformInteractionResponse( - const MessageSharedPtr& message, ApplicationManager& application_manager) + const application_manager::commands::MessageSharedPtr& message, + ApplicationManager& application_manager) : CommandResponseImpl(message, application_manager) {} PerformInteractionResponse::~PerformInteractionResponse() {} diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/put_file_request.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/put_file_request.cc index 23d9055c5a..6fb8d0e6b7 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/put_file_request.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/put_file_request.cc @@ -56,12 +56,14 @@ uint32_t GetCrc32CheckSum(const std::vector<uint8_t>& binary_data) { } // namespace -namespace application_manager { +namespace sdl_rpc_plugin { +using namespace application_manager; namespace commands { -PutFileRequest::PutFileRequest(const MessageSharedPtr& message, - ApplicationManager& application_manager) +PutFileRequest::PutFileRequest( + const application_manager::commands::MessageSharedPtr& message, + ApplicationManager& application_manager) : CommandRequestImpl(message, application_manager) , offset_(0) , sync_file_name_() diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/put_file_response.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/put_file_response.cc index 46f6aac2e7..e2990f6e00 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/put_file_response.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/put_file_response.cc @@ -35,12 +35,14 @@ #include "utils/file_system.h" #include "application_manager/application_impl.h" -namespace application_manager { +namespace sdl_rpc_plugin { +using namespace application_manager; namespace commands { -PutFileResponse::PutFileResponse(const MessageSharedPtr& message, - ApplicationManager& application_manager) +PutFileResponse::PutFileResponse( + const application_manager::commands::MessageSharedPtr& message, + ApplicationManager& application_manager) : CommandResponseImpl(message, application_manager) {} PutFileResponse::~PutFileResponse() {} diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/read_did_request.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/read_did_request.cc index 727dcb47ee..bf894d06ce 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/read_did_request.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/read_did_request.cc @@ -38,12 +38,14 @@ #include "interfaces/HMI_API.h" #include "application_manager/message_helper.h" -namespace application_manager { +namespace sdl_rpc_plugin { +using namespace application_manager; namespace commands { -ReadDIDRequest::ReadDIDRequest(const MessageSharedPtr& message, - ApplicationManager& application_manager) +ReadDIDRequest::ReadDIDRequest( + const application_manager::commands::MessageSharedPtr& message, + ApplicationManager& application_manager) : CommandRequestImpl(message, application_manager) {} ReadDIDRequest::~ReadDIDRequest() {} diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/read_did_response.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/read_did_response.cc index c5218703f8..6d52142898 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/read_did_response.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/read_did_response.cc @@ -34,12 +34,14 @@ #include "sdl_rpc_plugin/commands/mobile/read_did_response.h" #include "application_manager/rpc_service.h" -namespace application_manager { +namespace sdl_rpc_plugin { +using namespace application_manager; namespace commands { -ReadDIDResponse::ReadDIDResponse(const MessageSharedPtr& message, - ApplicationManager& application_manager) +ReadDIDResponse::ReadDIDResponse( + const application_manager::commands::MessageSharedPtr& message, + ApplicationManager& application_manager) : CommandResponseImpl(message, application_manager) {} ReadDIDResponse::~ReadDIDResponse() {} diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/register_app_interface_request.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/register_app_interface_request.cc index ac219a0f96..46e6f2188a 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/register_app_interface_request.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/register_app_interface_request.cc @@ -173,12 +173,14 @@ struct IsSameNickname { }; } -namespace application_manager { +namespace sdl_rpc_plugin { +using namespace application_manager; namespace commands { RegisterAppInterfaceRequest::RegisterAppInterfaceRequest( - const MessageSharedPtr& message, ApplicationManager& application_manager) + const application_manager::commands::MessageSharedPtr& message, + ApplicationManager& application_manager) : CommandRequestImpl(message, application_manager) , result_code_(mobile_apis::Result::INVALID_ENUM) {} @@ -397,8 +399,7 @@ void RegisterAppInterfaceRequest::Run() { SendRegisterAppInterfaceResponseToMobile(ApplicationType::kNewApplication); smart_objects::SmartObjectSPtr so = GetLockScreenIconUrlNotification(connection_key(), application); - application_manager_.GetRPCService().ManageMobileCommand( - so, commands::Command::SOURCE_SDL); + application_manager_.GetRPCService().ManageMobileCommand(so, SOURCE_SDL); } smart_objects::SmartObjectSPtr @@ -413,10 +414,8 @@ RegisterAppInterfaceRequest::GetLockScreenIconUrlNotification( (*message)[strings::params][strings::connection_key] = connection_key; (*message)[strings::params][strings::message_type] = mobile_apis::messageType::notification; - (*message)[strings::params][strings::protocol_type] = - commands::CommandImpl::mobile_protocol_type_; - (*message)[strings::params][strings::protocol_version] = - commands::CommandImpl::protocol_version_; + (*message)[strings::params][strings::protocol_type] = mobile_protocol_type_; + (*message)[strings::params][strings::protocol_version] = protocol_version_; (*message)[strings::msg_params][strings::request_type] = mobile_apis::RequestType::LOCK_SCREEN_ICON_URL; (*message)[strings::msg_params][strings::url] = @@ -827,7 +826,7 @@ void RegisterAppInterfaceRequest::SendChangeRegistrationOnHMI( } void RegisterAppInterfaceRequest::SendOnAppRegisteredNotificationToHMI( - const Application& application_impl, + const app_mngr::Application& application_impl, bool resumption, bool need_restore_vr) { using namespace smart_objects; @@ -842,8 +841,8 @@ void RegisterAppInterfaceRequest::SendOnAppRegisteredNotificationToHMI( params[strings::function_id] = static_cast<int32_t>( hmi_apis::FunctionID::BasicCommunication_OnAppRegistered); params[strings::message_type] = static_cast<int32_t>(kNotification); - params[strings::protocol_version] = commands::CommandImpl::protocol_version_; - params[strings::protocol_type] = commands::CommandImpl::hmi_protocol_type_; + params[strings::protocol_version] = protocol_version_; + params[strings::protocol_type] = hmi_protocol_type_; (*notification)[strings::msg_params] = SmartObject(SmartType_Map); smart_objects::SmartObject& msg_params = (*notification)[strings::msg_params]; diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/register_app_interface_response.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/register_app_interface_response.cc index ae64e407db..3f9b8030df 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/register_app_interface_response.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/register_app_interface_response.cc @@ -38,7 +38,8 @@ #include "connection_handler/connection_handler.h" #include "application_manager/policies/policy_handler_interface.h" -namespace application_manager { +namespace sdl_rpc_plugin { +using namespace application_manager; namespace commands { diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/reset_global_properties_request.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/reset_global_properties_request.cc index 97d6a6fdb9..4863f5ae1d 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/reset_global_properties_request.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/reset_global_properties_request.cc @@ -39,12 +39,14 @@ #include "interfaces/MOBILE_API.h" #include "interfaces/HMI_API.h" -namespace application_manager { +namespace sdl_rpc_plugin { +using namespace application_manager; namespace commands { ResetGlobalPropertiesRequest::ResetGlobalPropertiesRequest( - const MessageSharedPtr& message, ApplicationManager& application_manager) + const application_manager::commands::MessageSharedPtr& message, + ApplicationManager& application_manager) : CommandRequestImpl(message, application_manager) , ui_result_(hmi_apis::Common_Result::INVALID_ENUM) , tts_result_(hmi_apis::Common_Result::INVALID_ENUM) {} @@ -288,9 +290,9 @@ bool ResetGlobalPropertiesRequest::PrepareResponseParameters( using namespace helpers; bool result = false; - ResponseInfo ui_properties_info( + app_mngr::commands::ResponseInfo ui_properties_info( ui_result_, HmiInterfaces::HMI_INTERFACE_UI, application_manager_); - ResponseInfo tts_properties_info( + app_mngr::commands::ResponseInfo tts_properties_info( tts_result_, HmiInterfaces::HMI_INTERFACE_TTS, application_manager_); HmiInterfaces::InterfaceState tts_interface_state = @@ -308,10 +310,10 @@ bool ResetGlobalPropertiesRequest::PrepareResponseParameters( PrepareResultForMobileResponse(ui_properties_info, tts_properties_info); out_result_code = PrepareResultCodeForResponse(ui_properties_info, tts_properties_info); - out_response_info = MergeInfos(tts_properties_info, - tts_response_info_, - ui_properties_info, - ui_response_info_); + out_response_info = app_mngr::commands::MergeInfos(tts_properties_info, + tts_response_info_, + ui_properties_info, + ui_response_info_); } return result; diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/reset_global_properties_response.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/reset_global_properties_response.cc index 4fbb564713..675d85c398 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/reset_global_properties_response.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/reset_global_properties_response.cc @@ -34,12 +34,14 @@ #include "sdl_rpc_plugin/commands/mobile/reset_global_properties_response.h" #include "application_manager/rpc_service.h" -namespace application_manager { +namespace sdl_rpc_plugin { +using namespace application_manager; namespace commands { ResetGlobalPropertiesResponse::ResetGlobalPropertiesResponse( - const MessageSharedPtr& message, ApplicationManager& application_manager) + const application_manager::commands::MessageSharedPtr& message, + ApplicationManager& application_manager) : CommandResponseImpl(message, application_manager) {} ResetGlobalPropertiesResponse::~ResetGlobalPropertiesResponse() {} diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/scrollable_message_request.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/scrollable_message_request.cc index 4287f8cd96..f69332cddf 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/scrollable_message_request.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/scrollable_message_request.cc @@ -41,12 +41,14 @@ #include "interfaces/HMI_API.h" #include "utils/helpers.h" -namespace application_manager { +namespace sdl_rpc_plugin { +using namespace application_manager; namespace commands { ScrollableMessageRequest::ScrollableMessageRequest( - const MessageSharedPtr& message, ApplicationManager& application_manager) + const application_manager::commands::MessageSharedPtr& message, + ApplicationManager& application_manager) : CommandRequestImpl(message, application_manager) { subscribe_on_event(hmi_apis::FunctionID::UI_OnResetTimeout); } diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/scrollable_message_response.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/scrollable_message_response.cc index 180588cca9..772a85baac 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/scrollable_message_response.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/scrollable_message_response.cc @@ -36,12 +36,14 @@ #include "interfaces/HMI_API.h" #include "interfaces/MOBILE_API.h" -namespace application_manager { +namespace sdl_rpc_plugin { +using namespace application_manager; namespace commands { ScrollableMessageResponse::ScrollableMessageResponse( - const MessageSharedPtr& message, ApplicationManager& application_manager) + const application_manager::commands::MessageSharedPtr& message, + ApplicationManager& application_manager) : CommandResponseImpl(message, application_manager) {} void ScrollableMessageResponse::Run() { diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/send_haptic_data_request.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/send_haptic_data_request.cc index 14d16e1085..7d412e1e03 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/send_haptic_data_request.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/send_haptic_data_request.cc @@ -33,14 +33,16 @@ #include "sdl_rpc_plugin/commands/mobile/send_haptic_data_request.h" #include "interfaces/MOBILE_API.h" -namespace application_manager { +namespace sdl_rpc_plugin { +using namespace application_manager; namespace commands { namespace custom_str = utils::custom_string; SendHapticDataRequest::SendHapticDataRequest( - const MessageSharedPtr& message, ApplicationManager& application_manager) + const application_manager::commands::MessageSharedPtr& message, + ApplicationManager& application_manager) : CommandRequestImpl(message, application_manager) {} SendHapticDataRequest::~SendHapticDataRequest() {} diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/send_haptic_data_response.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/send_haptic_data_response.cc index 5997b8454e..e925363369 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/send_haptic_data_response.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/send_haptic_data_response.cc @@ -33,12 +33,14 @@ #include "sdl_rpc_plugin/commands/mobile/send_haptic_data_response.h" #include "application_manager/rpc_service.h" -namespace application_manager { +namespace sdl_rpc_plugin { +using namespace application_manager; namespace commands { SendHapticDataResponse::SendHapticDataResponse( - const MessageSharedPtr& message, ApplicationManager& application_manager) + const application_manager::commands::MessageSharedPtr& message, + ApplicationManager& application_manager) : CommandResponseImpl(message, application_manager) {} SendHapticDataResponse::~SendHapticDataResponse() {} diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/send_location_request.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/send_location_request.cc index 12ebcb0a93..a2777fc9b5 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/send_location_request.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/send_location_request.cc @@ -35,12 +35,14 @@ #include "application_manager/message_helper.h" #include "utils/custom_string.h" -namespace application_manager { +namespace sdl_rpc_plugin { +using namespace application_manager; namespace commands { SendLocationRequest::SendLocationRequest( - const MessageSharedPtr& message, ApplicationManager& application_manager) + const application_manager::commands::MessageSharedPtr& message, + ApplicationManager& application_manager) : CommandRequestImpl(message, application_manager) {} SendLocationRequest::~SendLocationRequest() {} diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/send_location_response.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/send_location_response.cc index be12b20bdb..1f27afaee0 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/send_location_response.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/send_location_response.cc @@ -36,12 +36,14 @@ #include "application_manager/application_impl.h" #include "interfaces/HMI_API.h" -namespace application_manager { +namespace sdl_rpc_plugin { +using namespace application_manager; namespace commands { SendLocationResponse::SendLocationResponse( - const MessageSharedPtr& message, ApplicationManager& application_manager) + const application_manager::commands::MessageSharedPtr& message, + ApplicationManager& application_manager) : CommandResponseImpl(message, application_manager) {} SendLocationResponse::~SendLocationResponse() {} diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/set_app_icon_request.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/set_app_icon_request.cc index 752b9f34ed..8d6416cd9b 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/set_app_icon_request.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/set_app_icon_request.cc @@ -41,12 +41,14 @@ #include "utils/file_system.h" #include "utils/helpers.h" -namespace application_manager { +namespace sdl_rpc_plugin { +using namespace application_manager; namespace commands { -SetAppIconRequest::SetAppIconRequest(const MessageSharedPtr& message, - ApplicationManager& application_manager) +SetAppIconRequest::SetAppIconRequest( + const application_manager::commands::MessageSharedPtr& message, + ApplicationManager& application_manager) : CommandRequestImpl(message, application_manager) , is_icons_saving_enabled_(false) { const std::string path = diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/set_app_icon_response.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/set_app_icon_response.cc index 1084eb10dd..cd79c3ab95 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/set_app_icon_response.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/set_app_icon_response.cc @@ -34,12 +34,14 @@ #include "sdl_rpc_plugin/commands/mobile/set_app_icon_response.h" #include "application_manager/rpc_service.h" -namespace application_manager { +namespace sdl_rpc_plugin { +using namespace application_manager; namespace commands { -SetAppIconResponse::SetAppIconResponse(const MessageSharedPtr& message, - ApplicationManager& application_manager) +SetAppIconResponse::SetAppIconResponse( + const application_manager::commands::MessageSharedPtr& message, + ApplicationManager& application_manager) : CommandResponseImpl(message, application_manager) {} SetAppIconResponse::~SetAppIconResponse() {} diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/set_display_layout_request.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/set_display_layout_request.cc index 859340f91e..806670d6e2 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/set_display_layout_request.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/set_display_layout_request.cc @@ -36,12 +36,14 @@ #include "application_manager/message_helper.h" #include "application_manager/application_impl.h" -namespace application_manager { +namespace sdl_rpc_plugin { +using namespace application_manager; namespace commands { SetDisplayLayoutRequest::SetDisplayLayoutRequest( - const MessageSharedPtr& message, ApplicationManager& application_manager) + const application_manager::commands::MessageSharedPtr& message, + ApplicationManager& application_manager) : CommandRequestImpl(message, application_manager) {} SetDisplayLayoutRequest::~SetDisplayLayoutRequest() {} diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/set_display_layout_response.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/set_display_layout_response.cc index e50c0809c4..506a8cb4a6 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/set_display_layout_response.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/set_display_layout_response.cc @@ -35,12 +35,14 @@ #include "application_manager/application_impl.h" #include "application_manager/rpc_service.h" -namespace application_manager { +namespace sdl_rpc_plugin { +using namespace application_manager; namespace commands { SetDisplayLayoutResponse::SetDisplayLayoutResponse( - const MessageSharedPtr& message, ApplicationManager& application_manager) + const application_manager::commands::MessageSharedPtr& message, + ApplicationManager& application_manager) : CommandResponseImpl(message, application_manager) {} SetDisplayLayoutResponse::~SetDisplayLayoutResponse() {} diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/set_global_properties_request.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/set_global_properties_request.cc index b37f837e01..a54fc3e9ac 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/set_global_properties_request.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/set_global_properties_request.cc @@ -40,12 +40,14 @@ #include "interfaces/HMI_API.h" #include "utils/helpers.h" -namespace application_manager { +namespace sdl_rpc_plugin { +using namespace application_manager; namespace commands { SetGlobalPropertiesRequest::SetGlobalPropertiesRequest( - const MessageSharedPtr& message, ApplicationManager& application_manager) + const application_manager::commands::MessageSharedPtr& message, + ApplicationManager& application_manager) : CommandRequestImpl(message, application_manager) , is_ui_send_(false) , is_tts_send_(false) @@ -320,10 +322,10 @@ bool SetGlobalPropertiesRequest::PrepareResponseParameters( LOG4CXX_AUTO_TRACE(logger_); using namespace helpers; - ResponseInfo ui_properties_info( + app_mngr::commands::ResponseInfo ui_properties_info( ui_result_, HmiInterfaces::HMI_INTERFACE_UI, application_manager_); - ResponseInfo tts_properties_info( + app_mngr::commands::ResponseInfo tts_properties_info( tts_result_, HmiInterfaces::HMI_INTERFACE_TTS, application_manager_); const bool result = PrepareResultForMobileResponse(ui_properties_info, tts_properties_info); @@ -332,18 +334,18 @@ bool SetGlobalPropertiesRequest::PrepareResponseParameters( (tts_properties_info.is_unsupported_resource)) { result_code = mobile_apis::Result::WARNINGS; tts_response_info_ = "Unsupported phoneme type sent in a prompt"; - info = MergeInfos(tts_properties_info, - tts_response_info_, - ui_properties_info, - ui_response_info_); + info = app_mngr::commands::MergeInfos(tts_properties_info, + tts_response_info_, + ui_properties_info, + ui_response_info_); return result; } result_code = PrepareResultCodeForResponse(ui_properties_info, tts_properties_info); - info = MergeInfos(tts_properties_info, - tts_response_info_, - ui_properties_info, - ui_response_info_); + info = app_mngr::commands::MergeInfos(tts_properties_info, + tts_response_info_, + ui_properties_info, + ui_response_info_); return result; } diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/set_global_properties_response.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/set_global_properties_response.cc index 668308a048..f859237f1f 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/set_global_properties_response.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/set_global_properties_response.cc @@ -34,12 +34,14 @@ #include "sdl_rpc_plugin/commands/mobile/set_global_properties_response.h" #include "application_manager/rpc_service.h" -namespace application_manager { +namespace sdl_rpc_plugin { +using namespace application_manager; namespace commands { SetGlobalPropertiesResponse::SetGlobalPropertiesResponse( - const MessageSharedPtr& message, ApplicationManager& application_manager) + const application_manager::commands::MessageSharedPtr& message, + ApplicationManager& application_manager) : CommandResponseImpl(message, application_manager) {} SetGlobalPropertiesResponse::~SetGlobalPropertiesResponse() {} diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/set_icon_request.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/set_icon_request.cc index 31b1985086..ec5aea85ae 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/set_icon_request.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/set_icon_request.cc @@ -39,12 +39,14 @@ #include "interfaces/HMI_API.h" #include "utils/file_system.h" -namespace application_manager { +namespace sdl_rpc_plugin { +using namespace application_manager; namespace commands { -SetIconRequest::SetIconRequest(const MessageSharedPtr& message, - ApplicationManager& application_manager) +SetIconRequest::SetIconRequest( + const application_manager::commands::MessageSharedPtr& message, + ApplicationManager& application_manager) : CommandRequestImpl(message, application_manager) {} SetIconRequest::~SetIconRequest() {} diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/set_icon_response.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/set_icon_response.cc index 39446c0f68..5448fc3aa5 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/set_icon_response.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/set_icon_response.cc @@ -35,12 +35,14 @@ #include "application_manager/application_manager.h" #include "application_manager/rpc_service.h" -namespace application_manager { +namespace sdl_rpc_plugin { +using namespace application_manager; namespace commands { -SetIconResponse::SetIconResponse(const MessageSharedPtr& message, - ApplicationManager& app_man) +SetIconResponse::SetIconResponse( + const application_manager::commands::MessageSharedPtr& message, + ApplicationManager& app_man) : CommandResponseImpl(message, app_man) {} SetIconResponse::~SetIconResponse() {} diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/set_media_clock_timer_request.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/set_media_clock_timer_request.cc index a098f56669..5ed3a51e18 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/set_media_clock_timer_request.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/set_media_clock_timer_request.cc @@ -38,12 +38,14 @@ #include "interfaces/MOBILE_API.h" #include "interfaces/HMI_API.h" -namespace application_manager { +namespace sdl_rpc_plugin { +using namespace application_manager; namespace commands { SetMediaClockRequest::SetMediaClockRequest( - const MessageSharedPtr& message, ApplicationManager& application_manager) + const application_manager::commands::MessageSharedPtr& message, + ApplicationManager& application_manager) : CommandRequestImpl(message, application_manager) {} SetMediaClockRequest::~SetMediaClockRequest() {} diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/set_media_clock_timer_response.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/set_media_clock_timer_response.cc index 4f1c855826..8240094265 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/set_media_clock_timer_response.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/set_media_clock_timer_response.cc @@ -34,12 +34,14 @@ #include "sdl_rpc_plugin/commands/mobile/set_media_clock_timer_response.h" #include "application_manager/rpc_service.h" -namespace application_manager { +namespace sdl_rpc_plugin { +using namespace application_manager; namespace commands { SetMediaClockTimerResponse::SetMediaClockTimerResponse( - const MessageSharedPtr& message, ApplicationManager& application_manager) + const application_manager::commands::MessageSharedPtr& message, + ApplicationManager& application_manager) : CommandResponseImpl(message, application_manager) {} SetMediaClockTimerResponse::~SetMediaClockTimerResponse() {} diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/show_constant_tbt_request.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/show_constant_tbt_request.cc index 30f6815e37..47f5522cae 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/show_constant_tbt_request.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/show_constant_tbt_request.cc @@ -41,12 +41,14 @@ #include "interfaces/MOBILE_API.h" #include "interfaces/HMI_API.h" -namespace application_manager { +namespace sdl_rpc_plugin { +using namespace application_manager; namespace commands { ShowConstantTBTRequest::ShowConstantTBTRequest( - const MessageSharedPtr& message, ApplicationManager& application_manager) + const application_manager::commands::MessageSharedPtr& message, + ApplicationManager& application_manager) : CommandRequestImpl(message, application_manager) {} ShowConstantTBTRequest::~ShowConstantTBTRequest() {} diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/show_constant_tbt_response.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/show_constant_tbt_response.cc index 6225c23dd4..6131bc1be6 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/show_constant_tbt_response.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/show_constant_tbt_response.cc @@ -35,12 +35,14 @@ #include "application_manager/rpc_service.h" #include "interfaces/HMI_API.h" -namespace application_manager { +namespace sdl_rpc_plugin { +using namespace application_manager; namespace commands { ShowConstantTBTResponse::ShowConstantTBTResponse( - const MessageSharedPtr& message, ApplicationManager& application_manager) + const application_manager::commands::MessageSharedPtr& message, + ApplicationManager& application_manager) : CommandResponseImpl(message, application_manager) {} diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/show_request.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/show_request.cc index 25163af225..27a5eeb4f0 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/show_request.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/show_request.cc @@ -39,12 +39,14 @@ #include "utils/file_system.h" #include "utils/helpers.h" -namespace application_manager { +namespace sdl_rpc_plugin { +using namespace application_manager; namespace commands { -ShowRequest::ShowRequest(const MessageSharedPtr& message, - ApplicationManager& application_manager) +ShowRequest::ShowRequest( + const application_manager::commands::MessageSharedPtr& message, + ApplicationManager& application_manager) : CommandRequestImpl(message, application_manager) , core_result_code_(mobile_apis::Result::INVALID_ENUM) {} @@ -266,7 +268,8 @@ void ShowRequest::Run() { StartAwaitForInterface(HmiInterfaces::HMI_INTERFACE_UI); SendHMIRequest(hmi_apis::FunctionID::UI_Show, &msg_params, true); - MessageSharedPtr persistentData = new smart_objects::SmartObject(msg_params); + app_mngr::commands::MessageSharedPtr persistentData = + new smart_objects::SmartObject(msg_params); app->set_show_command(*persistentData); } diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/show_response.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/show_response.cc index 2e59b3aa07..61c4d19f5f 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/show_response.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/show_response.cc @@ -36,12 +36,14 @@ #include "application_manager/application_impl.h" #include "interfaces/HMI_API.h" -namespace application_manager { +namespace sdl_rpc_plugin { +using namespace application_manager; namespace commands { -ShowResponse::ShowResponse(const MessageSharedPtr& message, - ApplicationManager& application_manager) +ShowResponse::ShowResponse( + const application_manager::commands::MessageSharedPtr& message, + ApplicationManager& application_manager) : CommandResponseImpl(message, application_manager) {} ShowResponse::~ShowResponse() {} diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/slider_request.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/slider_request.cc index 1f7afe96a4..d332ed45fe 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/slider_request.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/slider_request.cc @@ -38,12 +38,14 @@ #include "utils/helpers.h" #include "config_profile/profile.h" -namespace application_manager { +namespace sdl_rpc_plugin { +using namespace application_manager; namespace commands { -SliderRequest::SliderRequest(const MessageSharedPtr& message, - ApplicationManager& application_manager) +SliderRequest::SliderRequest( + const application_manager::commands::MessageSharedPtr& message, + ApplicationManager& application_manager) : CommandRequestImpl(message, application_manager) { subscribe_on_event(hmi_apis::FunctionID::UI_OnResetTimeout); } diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/slider_response.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/slider_response.cc index c19d08bc95..69ac9fcb1f 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/slider_response.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/slider_response.cc @@ -34,12 +34,14 @@ #include "sdl_rpc_plugin/commands/mobile/slider_response.h" #include "application_manager/rpc_service.h" -namespace application_manager { +namespace sdl_rpc_plugin { +using namespace application_manager; namespace commands { -SliderResponse::SliderResponse(const MessageSharedPtr& message, - ApplicationManager& application_manager) +SliderResponse::SliderResponse( + const application_manager::commands::MessageSharedPtr& message, + ApplicationManager& application_manager) : CommandResponseImpl(message, application_manager) {} SliderResponse::~SliderResponse() {} diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/speak_request.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/speak_request.cc index 1e9589e30a..9f6bf2e250 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/speak_request.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/speak_request.cc @@ -38,12 +38,14 @@ #include "application_manager/message_helper.h" #include "utils/helpers.h" -namespace application_manager { +namespace sdl_rpc_plugin { +using namespace application_manager; namespace commands { -SpeakRequest::SpeakRequest(const MessageSharedPtr& message, - ApplicationManager& application_manager) +SpeakRequest::SpeakRequest( + const application_manager::commands::MessageSharedPtr& message, + ApplicationManager& application_manager) : CommandRequestImpl(message, application_manager) { subscribe_on_event(hmi_apis::FunctionID::TTS_OnResetTimeout); } diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/speak_response.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/speak_response.cc index ca4f69ecd8..d3ffc4a3f4 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/speak_response.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/speak_response.cc @@ -36,12 +36,14 @@ #include "application_manager/application_impl.h" #include "interfaces/HMI_API.h" -namespace application_manager { +namespace sdl_rpc_plugin { +using namespace application_manager; namespace commands { -SpeakResponse::SpeakResponse(const MessageSharedPtr& message, - ApplicationManager& application_manager) +SpeakResponse::SpeakResponse( + const application_manager::commands::MessageSharedPtr& message, + ApplicationManager& application_manager) : CommandResponseImpl(message, application_manager) {} SpeakResponse::~SpeakResponse() {} diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/subscribe_button_request.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/subscribe_button_request.cc index ecf239e8e4..ce46a47d6e 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/subscribe_button_request.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/subscribe_button_request.cc @@ -33,14 +33,16 @@ #include "sdl_rpc_plugin/commands/mobile/subscribe_button_request.h" -namespace application_manager { +namespace sdl_rpc_plugin { +using namespace application_manager; namespace commands { namespace str = strings; SubscribeButtonRequest::SubscribeButtonRequest( - const MessageSharedPtr& message, ApplicationManager& application_manager) + const application_manager::commands::MessageSharedPtr& message, + ApplicationManager& application_manager) : CommandRequestImpl(message, application_manager) {} SubscribeButtonRequest::~SubscribeButtonRequest() {} diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/subscribe_button_response.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/subscribe_button_response.cc index f34046935f..53bc5b7ace 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/subscribe_button_response.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/subscribe_button_response.cc @@ -33,12 +33,14 @@ #include "sdl_rpc_plugin/commands/mobile/subscribe_button_response.h" -namespace application_manager { +namespace sdl_rpc_plugin { +using namespace application_manager; namespace commands { SubscribeButtonResponse::SubscribeButtonResponse( - const MessageSharedPtr& message, ApplicationManager& application_manager) + const application_manager::commands::MessageSharedPtr& message, + ApplicationManager& application_manager) : CommandResponseImpl(message, application_manager) {} SubscribeButtonResponse::~SubscribeButtonResponse() {} diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/subscribe_vehicle_data_request.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/subscribe_vehicle_data_request.cc index d78f019e35..4fd121ba54 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/subscribe_vehicle_data_request.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/subscribe_vehicle_data_request.cc @@ -40,11 +40,13 @@ #include "application_manager/message_helper.h" #include "utils/helpers.h" -namespace application_manager { +namespace sdl_rpc_plugin { +using namespace application_manager; namespace commands { SubscribeVehicleDataRequest::SubscribeVehicleDataRequest( - const MessageSharedPtr& message, ApplicationManager& application_manager) + const application_manager::commands::MessageSharedPtr& message, + ApplicationManager& application_manager) : CommandRequestImpl(message, application_manager) {} SubscribeVehicleDataRequest::~SubscribeVehicleDataRequest() {} @@ -257,7 +259,7 @@ void SubscribeVehicleDataRequest::on_event(const event_engine::Event& event) { if (!vi_waiting_for_subscribe_.empty()) { LOG4CXX_DEBUG(logger_, "Subscribing to all pending VehicleData"); - VehicleInfoSubscriptions::const_iterator key = + app_mngr::VehicleInfoSubscriptions::const_iterator key = vi_waiting_for_subscribe_.begin(); for (; key != vi_waiting_for_subscribe_.end(); ++key) { app->SubscribeToIVI(*key); @@ -299,7 +301,7 @@ void SubscribeVehicleDataRequest::AddAlreadySubscribedVI( return std::string(); }; - VehicleInfoSubscriptions::const_iterator it_same_app = + app_mngr::VehicleInfoSubscriptions::const_iterator it_same_app = vi_already_subscribed_by_this_app_.begin(); for (; vi_already_subscribed_by_this_app_.end() != it_same_app; ++it_same_app) { @@ -308,7 +310,7 @@ void SubscribeVehicleDataRequest::AddAlreadySubscribedVI( msg_params[vi_to_string(*it_same_app)][strings::data_type] = *it_same_app; } - VehicleInfoSubscriptions::const_iterator it_another_app = + app_mngr::VehicleInfoSubscriptions::const_iterator it_another_app = vi_already_subscribed_by_another_apps_.begin(); for (; vi_already_subscribed_by_another_apps_.end() != it_another_app; ++it_another_app) { @@ -384,7 +386,7 @@ void SubscribeVehicleDataRequest::CheckVISubscriptions( smart_objects::SmartObject& out_request_params, bool& out_result) { // counter for items to subscribe - VehicleInfoSubscriptions::size_type items_to_subscribe = 0; + app_mngr::VehicleInfoSubscriptions::size_type items_to_subscribe = 0; // counter for subscribed items by application uint32_t subscribed_items = 0; diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/subscribe_vehicle_data_response.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/subscribe_vehicle_data_response.cc index 37cb6e9f1f..b29d34b22e 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/subscribe_vehicle_data_response.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/subscribe_vehicle_data_response.cc @@ -36,11 +36,13 @@ #include "application_manager/application_impl.h" #include "interfaces/MOBILE_API.h" -namespace application_manager { +namespace sdl_rpc_plugin { +using namespace application_manager; namespace commands { SubscribeVehicleDataResponse::SubscribeVehicleDataResponse( - const MessageSharedPtr& message, ApplicationManager& application_manager) + const application_manager::commands::MessageSharedPtr& message, + ApplicationManager& application_manager) : CommandResponseImpl(message, application_manager) {} SubscribeVehicleDataResponse::~SubscribeVehicleDataResponse() {} diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/subscribe_way_points_request.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/subscribe_way_points_request.cc index b9c1391dc8..2dd1f6579d 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/subscribe_way_points_request.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/subscribe_way_points_request.cc @@ -2,12 +2,14 @@ #include "sdl_rpc_plugin/commands/mobile/subscribe_way_points_request.h" #include "application_manager/message_helper.h" -namespace application_manager { +namespace sdl_rpc_plugin { +using namespace application_manager; namespace commands { SubscribeWayPointsRequest::SubscribeWayPointsRequest( - const MessageSharedPtr& message, ApplicationManager& application_manager) + const application_manager::commands::MessageSharedPtr& message, + ApplicationManager& application_manager) : CommandRequestImpl(message, application_manager) {} SubscribeWayPointsRequest::~SubscribeWayPointsRequest() {} diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/subscribe_way_points_response.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/subscribe_way_points_response.cc index 39b7ddb00d..9d6986969f 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/subscribe_way_points_response.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/subscribe_way_points_response.cc @@ -2,12 +2,14 @@ #include "application_manager/rpc_service.h" #include "sdl_rpc_plugin/commands/mobile/subscribe_way_points_response.h" -namespace application_manager { +namespace sdl_rpc_plugin { +using namespace application_manager; namespace commands { SubscribeWayPointsResponse::SubscribeWayPointsResponse( - const MessageSharedPtr& message, ApplicationManager& application_manager) + const application_manager::commands::MessageSharedPtr& message, + ApplicationManager& application_manager) : CommandResponseImpl(message, application_manager) {} SubscribeWayPointsResponse::~SubscribeWayPointsResponse() {} diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/system_request.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/system_request.cc index 1c612dd8c3..5001226ff9 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/system_request.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/system_request.cc @@ -47,7 +47,8 @@ Copyright (c) 2013, Ford Motor Company #include "utils/helpers.h" #include "utils/custom_string.h" -namespace application_manager { +namespace sdl_rpc_plugin { +using namespace application_manager; CREATE_LOGGERPTR_LOCAL(logger_, "ApplicationManager") namespace { @@ -431,8 +432,9 @@ uint32_t SystemRequest::index = 0; const std::string kSYNC = "SYNC"; const std::string kIVSU = "IVSU"; -SystemRequest::SystemRequest(const MessageSharedPtr& message, - ApplicationManager& application_manager) +SystemRequest::SystemRequest( + const application_manager::commands::MessageSharedPtr& message, + ApplicationManager& application_manager) : CommandRequestImpl(message, application_manager) {} SystemRequest::~SystemRequest() {} @@ -558,7 +560,8 @@ void SystemRequest::Run() { << file_name << " within previously saved app file in " << binary_data_folder); - const AppFile* file = application->GetFile(app_full_file_path); + const application_manager::AppFile* file = + application->GetFile(app_full_file_path); if (!file || !file->is_download_complete || !file_system::MoveFile(app_full_file_path, file_dst_path)) { LOG4CXX_DEBUG(logger_, "Binary data not found."); diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/system_response.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/system_response.cc index 094a58b1d3..388c896ea5 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/system_response.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/system_response.cc @@ -34,12 +34,14 @@ #include "sdl_rpc_plugin/commands/mobile/system_response.h" #include "application_manager/rpc_service.h" -namespace application_manager { +namespace sdl_rpc_plugin { +using namespace application_manager; namespace commands { -SystemResponse::SystemResponse(const MessageSharedPtr& message, - ApplicationManager& application_manager) +SystemResponse::SystemResponse( + const application_manager::commands::MessageSharedPtr& message, + ApplicationManager& application_manager) : CommandResponseImpl(message, application_manager) {} SystemResponse::~SystemResponse() {} diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/unregister_app_interface_request.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/unregister_app_interface_request.cc index cf7690c3d6..969bfb5c3f 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/unregister_app_interface_request.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/unregister_app_interface_request.cc @@ -35,7 +35,8 @@ #include "application_manager/rpc_service.h" #include "application_manager/message_helper.h" -namespace application_manager { +namespace sdl_rpc_plugin { +using namespace application_manager; namespace commands { @@ -52,7 +53,7 @@ void UnregisterAppInterfaceRequest::Run() { MessageHelper::GetOnAppInterfaceUnregisteredNotificationToMobile( connection_key(), mobile_api::AppInterfaceUnregisteredReason::INVALID_ENUM), - commands::Command::SOURCE_SDL); + SOURCE_SDL); application_manager_.EndNaviServices(connection_key()); application_manager_.UnregisterApplication(connection_key(), mobile_apis::Result::SUCCESS); diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/unregister_app_interface_response.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/unregister_app_interface_response.cc index d23cf6005a..4b79772952 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/unregister_app_interface_response.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/unregister_app_interface_response.cc @@ -33,7 +33,8 @@ #include "sdl_rpc_plugin/commands/mobile/unregister_app_interface_response.h" -namespace application_manager { +namespace sdl_rpc_plugin { +using namespace application_manager; namespace commands { diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/unsubscribe_button_request.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/unsubscribe_button_request.cc index cc05a011d3..8b0d4e29af 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/unsubscribe_button_request.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/unsubscribe_button_request.cc @@ -35,14 +35,16 @@ #include "application_manager/application_impl.h" -namespace application_manager { +namespace sdl_rpc_plugin { +using namespace application_manager; namespace commands { namespace str = strings; UnsubscribeButtonRequest::UnsubscribeButtonRequest( - const MessageSharedPtr& message, ApplicationManager& application_manager) + const application_manager::commands::MessageSharedPtr& message, + ApplicationManager& application_manager) : CommandRequestImpl(message, application_manager) {} UnsubscribeButtonRequest::~UnsubscribeButtonRequest() {} diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/unsubscribe_button_response.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/unsubscribe_button_response.cc index 7a970ae2f9..6332a93c58 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/unsubscribe_button_response.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/unsubscribe_button_response.cc @@ -34,12 +34,14 @@ #include "sdl_rpc_plugin/commands/mobile/unsubscribe_button_response.h" #include "smart_objects/smart_object.h" -namespace application_manager { +namespace sdl_rpc_plugin { +using namespace application_manager; namespace commands { UnsubscribeButtonResponse::UnsubscribeButtonResponse( - const MessageSharedPtr& message, ApplicationManager& application_manager) + const application_manager::commands::MessageSharedPtr& message, + ApplicationManager& application_manager) : CommandResponseImpl(message, application_manager) {} UnsubscribeButtonResponse::~UnsubscribeButtonResponse() {} diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/unsubscribe_vehicle_data_request.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/unsubscribe_vehicle_data_request.cc index 69304714b2..8d5617abb6 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/unsubscribe_vehicle_data_request.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/unsubscribe_vehicle_data_request.cc @@ -41,11 +41,13 @@ #include "application_manager/smart_object_keys.h" #include "utils/helpers.h" -namespace application_manager { +namespace sdl_rpc_plugin { +using namespace application_manager; namespace commands { UnsubscribeVehicleDataRequest::UnsubscribeVehicleDataRequest( - const MessageSharedPtr& message, ApplicationManager& application_manager) + const application_manager::commands::MessageSharedPtr& message, + ApplicationManager& application_manager) : CommandRequestImpl(message, application_manager) {} UnsubscribeVehicleDataRequest::~UnsubscribeVehicleDataRequest() {} @@ -386,7 +388,7 @@ void UnsubscribeVehicleDataRequest::AddAlreadyUnsubscribedVI( smart_objects::SmartObject& response) const { LOG4CXX_AUTO_TRACE(logger_); using namespace mobile_apis; - VehicleInfoSubscriptions::const_iterator it_same_app = + app_mngr::VehicleInfoSubscriptions::const_iterator it_same_app = vi_already_unsubscribed_by_this_app_.begin(); for (; vi_already_unsubscribed_by_this_app_.end() != it_same_app; ++it_same_app) { @@ -394,7 +396,7 @@ void UnsubscribeVehicleDataRequest::AddAlreadyUnsubscribedVI( VehicleDataResultCode::VDRC_DATA_NOT_SUBSCRIBED; } - VehicleInfoSubscriptions::const_iterator it_another_app = + app_mngr::VehicleInfoSubscriptions::const_iterator it_another_app = vi_still_subscribed_by_another_apps_.begin(); for (; vi_still_subscribed_by_another_apps_.end() != it_another_app; ++it_another_app) { diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/unsubscribe_vehicle_data_response.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/unsubscribe_vehicle_data_response.cc index 61b5dc3b5c..5c3ce620f8 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/unsubscribe_vehicle_data_response.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/unsubscribe_vehicle_data_response.cc @@ -34,11 +34,13 @@ #include "sdl_rpc_plugin/commands/mobile/unsubscribe_vehicle_data_response.h" #include "smart_objects/smart_object.h" -namespace application_manager { +namespace sdl_rpc_plugin { +using namespace application_manager; namespace commands { UnsubscribeVehicleDataResponse::UnsubscribeVehicleDataResponse( - const MessageSharedPtr& message, ApplicationManager& application_manager) + const application_manager::commands::MessageSharedPtr& message, + ApplicationManager& application_manager) : CommandResponseImpl(message, application_manager) {} UnsubscribeVehicleDataResponse::~UnsubscribeVehicleDataResponse() {} diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/unsubscribe_way_points_request.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/unsubscribe_way_points_request.cc index 82d94b8a12..8ae05b4432 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/unsubscribe_way_points_request.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/unsubscribe_way_points_request.cc @@ -2,12 +2,14 @@ #include "sdl_rpc_plugin/commands/mobile/unsubscribe_way_points_request.h" #include "application_manager/message_helper.h" -namespace application_manager { +namespace sdl_rpc_plugin { +using namespace application_manager; namespace commands { UnSubscribeWayPointsRequest::UnSubscribeWayPointsRequest( - const MessageSharedPtr& message, ApplicationManager& application_manager) + const application_manager::commands::MessageSharedPtr& message, + ApplicationManager& application_manager) : CommandRequestImpl(message, application_manager) {} UnSubscribeWayPointsRequest::~UnSubscribeWayPointsRequest() {} diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/unsubscribe_way_points_response.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/unsubscribe_way_points_response.cc index 9da4b697b4..9dca8e8c57 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/unsubscribe_way_points_response.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/unsubscribe_way_points_response.cc @@ -2,12 +2,14 @@ #include "sdl_rpc_plugin/commands/mobile/unsubscribe_way_points_response.h" #include "application_manager/rpc_service.h" -namespace application_manager { +namespace sdl_rpc_plugin { +using namespace application_manager; namespace commands { UnsubscribeWayPointsResponse::UnsubscribeWayPointsResponse( - const MessageSharedPtr& message, ApplicationManager& application_manager) + const application_manager::commands::MessageSharedPtr& message, + ApplicationManager& application_manager) : CommandResponseImpl(message, application_manager) {} UnsubscribeWayPointsResponse::~UnsubscribeWayPointsResponse() {} diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/update_turn_list_request.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/update_turn_list_request.cc index dae8b0dc94..82a3749f29 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/update_turn_list_request.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/update_turn_list_request.cc @@ -41,14 +41,16 @@ #include "interfaces/HMI_API.h" #include "utils/custom_string.h" -namespace application_manager { +namespace sdl_rpc_plugin { +using namespace application_manager; namespace commands { namespace custom_str = utils::custom_string; UpdateTurnListRequest::UpdateTurnListRequest( - const MessageSharedPtr& message, ApplicationManager& application_manager) + const application_manager::commands::MessageSharedPtr& message, + ApplicationManager& application_manager) : CommandRequestImpl(message, application_manager) {} UpdateTurnListRequest::~UpdateTurnListRequest() {} diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/update_turn_list_response.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/update_turn_list_response.cc index 3f1ebf32b2..2d39a5919a 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/update_turn_list_response.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/update_turn_list_response.cc @@ -35,12 +35,14 @@ #include "application_manager/rpc_service.h" #include "interfaces/HMI_API.h" -namespace application_manager { +namespace sdl_rpc_plugin { +using namespace application_manager; namespace commands { UpdateTurnListResponse::UpdateTurnListResponse( - const MessageSharedPtr& message, ApplicationManager& application_manager) + const application_manager::commands::MessageSharedPtr& message, + ApplicationManager& application_manager) : CommandResponseImpl(message, application_manager) {} UpdateTurnListResponse::~UpdateTurnListResponse() {} |