diff options
| author | Ira Lytvynenko <ILytvynenko@luxoft.com> | 2018-02-08 13:51:15 +0200 |
|---|---|---|
| committer | Ira Lytvynenko (GitHub) <ILytvynenko@luxoft.com> | 2018-06-26 12:01:43 +0300 |
| commit | c25d13465f7e0984f217a9f6c50d7c88c446eaf4 (patch) | |
| tree | b9924cc8d895f76a9d1b5fbc732e3c9da2e7a660 /src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands | |
| parent | 691e6018cf1a09eb6aeb5f2c4fa4b93bc3ffb429 (diff) | |
| download | sdl_core-c25d13465f7e0984f217a9f6c50d7c88c446eaf4.tar.gz | |
Load plugins in app manager, init plugin with params
cory library to install dir
Fix build
Fix header guards
Fix namespaces
Fix build
Diffstat (limited to 'src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands')
347 files changed, 1563 insertions, 867 deletions
diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/activate_app_request.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/activate_app_request.cc index 71b8aea206..a3778b331e 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/activate_app_request.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/activate_app_request.cc @@ -34,12 +34,14 @@ #include "application_manager/message_helper.h" -namespace application_manager { +namespace sdl_rpc_plugin { +using namespace application_manager; namespace commands { -ActivateAppRequest::ActivateAppRequest(const MessageSharedPtr& message, - ApplicationManager& application_manager) +ActivateAppRequest::ActivateAppRequest( + const application_manager::commands::MessageSharedPtr& message, + ApplicationManager& application_manager) : RequestToHMI(message, application_manager) {} ActivateAppRequest::~ActivateAppRequest() { diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/activate_app_response.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/activate_app_response.cc index d0c6797fb3..513cb42ca1 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/activate_app_response.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/activate_app_response.cc @@ -33,12 +33,14 @@ #include "application_manager/message_helper.h" -namespace application_manager { +namespace sdl_rpc_plugin { +using namespace application_manager; namespace commands { ActivateAppResponse::ActivateAppResponse( - const MessageSharedPtr& message, ApplicationManager& application_manager) + const application_manager::commands::MessageSharedPtr& message, + ApplicationManager& application_manager) : ResponseFromHMI(message, application_manager) {} ActivateAppResponse::~ActivateAppResponse() {} diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/add_statistics_info_notification.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/add_statistics_info_notification.cc index 9ffa356f07..bfdf320354 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/add_statistics_info_notification.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/add_statistics_info_notification.cc @@ -34,12 +34,14 @@ #include "application_manager/policies/policy_handler.h" #include "interfaces/HMI_API.h" -namespace application_manager { +namespace sdl_rpc_plugin { +using namespace application_manager; namespace commands { AddStatisticsInfoNotification::AddStatisticsInfoNotification( - const MessageSharedPtr& message, ApplicationManager& application_manager) + const application_manager::commands::MessageSharedPtr& message, + ApplicationManager& application_manager) : NotificationFromHMI(message, application_manager) {} AddStatisticsInfoNotification::~AddStatisticsInfoNotification() {} diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/allow_all_apps_request.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/allow_all_apps_request.cc index d048e8696a..cedd362807 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/allow_all_apps_request.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/allow_all_apps_request.cc @@ -32,12 +32,14 @@ #include "sdl_rpc_plugin/commands/hmi/allow_all_apps_request.h" -namespace application_manager { +namespace sdl_rpc_plugin { +using namespace application_manager; namespace commands { AllowAllAppsRequest::AllowAllAppsRequest( - const MessageSharedPtr& message, ApplicationManager& application_manager) + const application_manager::commands::MessageSharedPtr& message, + ApplicationManager& application_manager) : RequestToHMI(message, application_manager) {} AllowAllAppsRequest::~AllowAllAppsRequest() {} diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/allow_all_apps_response.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/allow_all_apps_response.cc index 8a7b8f75d7..24430640fa 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/allow_all_apps_response.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/allow_all_apps_response.cc @@ -31,12 +31,14 @@ */ #include "sdl_rpc_plugin/commands/hmi/allow_all_apps_response.h" -namespace application_manager { +namespace sdl_rpc_plugin { +using namespace application_manager; namespace commands { AllowAllAppsResponse::AllowAllAppsResponse( - const MessageSharedPtr& message, ApplicationManager& application_manager) + const application_manager::commands::MessageSharedPtr& message, + ApplicationManager& application_manager) : ResponseFromHMI(message, application_manager) {} AllowAllAppsResponse::~AllowAllAppsResponse() {} diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/allow_app_request.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/allow_app_request.cc index 9c43299fe6..5d67c59770 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/allow_app_request.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/allow_app_request.cc @@ -32,12 +32,14 @@ #include "sdl_rpc_plugin/commands/hmi/allow_app_request.h" -namespace application_manager { +namespace sdl_rpc_plugin { +using namespace application_manager; namespace commands { -AllowAppRequest::AllowAppRequest(const MessageSharedPtr& message, - ApplicationManager& application_manager) +AllowAppRequest::AllowAppRequest( + const application_manager::commands::MessageSharedPtr& message, + ApplicationManager& application_manager) : RequestToHMI(message, application_manager) {} AllowAppRequest::~AllowAppRequest() {} diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/allow_app_response.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/allow_app_response.cc index 8eac947391..7981ccb0f3 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/allow_app_response.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/allow_app_response.cc @@ -33,12 +33,14 @@ #include "application_manager/application_impl.h" -namespace application_manager { +namespace sdl_rpc_plugin { +using namespace application_manager; namespace commands { -AllowAppResponse::AllowAppResponse(const MessageSharedPtr& message, - ApplicationManager& application_manager) +AllowAppResponse::AllowAppResponse( + const application_manager::commands::MessageSharedPtr& message, + ApplicationManager& application_manager) : ResponseFromHMI(message, application_manager) {} AllowAppResponse::~AllowAppResponse() {} diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/basic_communication_on_awake_sdl.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/basic_communication_on_awake_sdl.cc index c23a9b66b1..d7ad938198 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/basic_communication_on_awake_sdl.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/basic_communication_on_awake_sdl.cc @@ -34,12 +34,14 @@ #include "application_manager/message_helper.h" #include "application_manager/resumption/resume_ctrl.h" -namespace application_manager { +namespace sdl_rpc_plugin { +using namespace application_manager; namespace commands { OnAwakeSDLNotification::OnAwakeSDLNotification( - const MessageSharedPtr& message, ApplicationManager& application_manager) + const application_manager::commands::MessageSharedPtr& message, + ApplicationManager& application_manager) : NotificationFromHMI(message, application_manager) {} OnAwakeSDLNotification::~OnAwakeSDLNotification() {} diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/basic_communication_system_request.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/basic_communication_system_request.cc index 0e0c89fa94..b64212fea4 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/basic_communication_system_request.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/basic_communication_system_request.cc @@ -32,12 +32,14 @@ #include "sdl_rpc_plugin/commands/hmi/basic_communication_system_request.h" -namespace application_manager { +namespace sdl_rpc_plugin { +using namespace application_manager; namespace commands { BasicCommunicationSystemRequest::BasicCommunicationSystemRequest( - const MessageSharedPtr& message, ApplicationManager& application_manager) + const application_manager::commands::MessageSharedPtr& message, + ApplicationManager& application_manager) : RequestToHMI(message, application_manager) {} BasicCommunicationSystemRequest::~BasicCommunicationSystemRequest() {} diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/basic_communication_system_response.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/basic_communication_system_response.cc index dbb6e126ab..9ad65e6886 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/basic_communication_system_response.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/basic_communication_system_response.cc @@ -34,12 +34,14 @@ #include "interfaces/HMI_API.h" -namespace application_manager { +namespace sdl_rpc_plugin { +using namespace application_manager; namespace commands { BasicCommunicationSystemResponse::BasicCommunicationSystemResponse( - const MessageSharedPtr& message, ApplicationManager& application_manager) + const application_manager::commands::MessageSharedPtr& message, + ApplicationManager& application_manager) : ResponseFromHMI(message, application_manager) {} BasicCommunicationSystemResponse::~BasicCommunicationSystemResponse() {} diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/button_get_capabilities_request.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/button_get_capabilities_request.cc index 989ba8aa5c..7422986fc6 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/button_get_capabilities_request.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/button_get_capabilities_request.cc @@ -33,12 +33,14 @@ #include "sdl_rpc_plugin/commands/hmi/button_get_capabilities_request.h" #include "utils/logger.h" -namespace application_manager { +namespace sdl_rpc_plugin { +using namespace application_manager; namespace commands { ButtonGetCapabilitiesRequest::ButtonGetCapabilitiesRequest( - const MessageSharedPtr& message, ApplicationManager& application_manager) + const application_manager::commands::MessageSharedPtr& message, + ApplicationManager& application_manager) : RequestToHMI(message, application_manager) {} ButtonGetCapabilitiesRequest::~ButtonGetCapabilitiesRequest() {} diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/button_get_capabilities_response.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/button_get_capabilities_response.cc index f9fc43bc9b..684f120f5e 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/button_get_capabilities_response.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/button_get_capabilities_response.cc @@ -33,12 +33,14 @@ #include "utils/logger.h" -namespace application_manager { +namespace sdl_rpc_plugin { +using namespace application_manager; namespace commands { ButtonGetCapabilitiesResponse::ButtonGetCapabilitiesResponse( - const MessageSharedPtr& message, ApplicationManager& application_manager) + const application_manager::commands::MessageSharedPtr& message, + ApplicationManager& application_manager) : ResponseFromHMI(message, application_manager) {} ButtonGetCapabilitiesResponse::~ButtonGetCapabilitiesResponse() {} diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/close_popup_request.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/close_popup_request.cc index 5b00a547e4..903bea918b 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/close_popup_request.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/close_popup_request.cc @@ -32,12 +32,14 @@ #include "sdl_rpc_plugin/commands/hmi/close_popup_request.h" -namespace application_manager { +namespace sdl_rpc_plugin { +using namespace application_manager; namespace commands { -ClosePopupRequest::ClosePopupRequest(const MessageSharedPtr& message, - ApplicationManager& application_manager) +ClosePopupRequest::ClosePopupRequest( + const application_manager::commands::MessageSharedPtr& message, + ApplicationManager& application_manager) : RequestToHMI(message, application_manager) {} ClosePopupRequest::~ClosePopupRequest() {} diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/close_popup_response.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/close_popup_response.cc index b5070153c7..073b2638e4 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/close_popup_response.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/close_popup_response.cc @@ -31,12 +31,14 @@ */ #include "sdl_rpc_plugin/commands/hmi/close_popup_response.h" -namespace application_manager { +namespace sdl_rpc_plugin { +using namespace application_manager; namespace commands { -ClosePopupResponse::ClosePopupResponse(const MessageSharedPtr& message, - ApplicationManager& application_manager) +ClosePopupResponse::ClosePopupResponse( + const application_manager::commands::MessageSharedPtr& message, + ApplicationManager& application_manager) : ResponseFromHMI(message, application_manager) {} ClosePopupResponse::~ClosePopupResponse() {} diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/decrypt_certificate_request.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/decrypt_certificate_request.cc index 0e0b632f71..8b9b2eccd0 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/decrypt_certificate_request.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/decrypt_certificate_request.cc @@ -32,12 +32,14 @@ #include "sdl_rpc_plugin/commands/hmi/decrypt_certificate_request.h" -namespace application_manager { +namespace sdl_rpc_plugin { +using namespace application_manager; namespace commands { DecryptCertificateRequest::DecryptCertificateRequest( - const MessageSharedPtr& message, ApplicationManager& application_manager) + const application_manager::commands::MessageSharedPtr& message, + ApplicationManager& application_manager) : RequestToHMI(message, application_manager) {} void DecryptCertificateRequest::Run() { diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/decrypt_certificate_response.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/decrypt_certificate_response.cc index 501f38e9df..eff079c383 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/decrypt_certificate_response.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/decrypt_certificate_response.cc @@ -33,12 +33,14 @@ #include "application_manager/policies/policy_handler.h" #ifdef EXTERNAL_PROPRIETARY_MODE -namespace application_manager { +namespace sdl_rpc_plugin { +using namespace application_manager; namespace commands { DecryptCertificateResponse::DecryptCertificateResponse( - const MessageSharedPtr& message, ApplicationManager& application_manager) + const application_manager::commands::MessageSharedPtr& message, + ApplicationManager& application_manager) : ResponseFromHMI(message, application_manager) {} DecryptCertificateResponse::~DecryptCertificateResponse() {} diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/dial_number_request.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/dial_number_request.cc index 1211c796d3..8651a407d2 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/dial_number_request.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/dial_number_request.cc @@ -32,14 +32,16 @@ #include "sdl_rpc_plugin/commands/hmi/dial_number_request.h" -namespace application_manager { +namespace sdl_rpc_plugin { +using namespace application_manager; namespace commands { namespace hmi { -DialNumberRequest::DialNumberRequest(const MessageSharedPtr& message, - ApplicationManager& application_manager) +DialNumberRequest::DialNumberRequest( + const application_manager::commands::MessageSharedPtr& message, + ApplicationManager& application_manager) : RequestToHMI(message, application_manager) {} DialNumberRequest::~DialNumberRequest() {} diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/dial_number_response.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/dial_number_response.cc index 4db6dfc9d8..2e540a1da3 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/dial_number_response.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/dial_number_response.cc @@ -31,14 +31,16 @@ */ #include "sdl_rpc_plugin/commands/hmi/dial_number_response.h" -namespace application_manager { +namespace sdl_rpc_plugin { +using namespace application_manager; namespace commands { namespace hmi { -DialNumberResponse::DialNumberResponse(const MessageSharedPtr& message, - ApplicationManager& application_manager) +DialNumberResponse::DialNumberResponse( + const application_manager::commands::MessageSharedPtr& message, + ApplicationManager& application_manager) : ResponseFromHMI(message, application_manager) {} DialNumberResponse::~DialNumberResponse() {} diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/get_system_info_request.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/get_system_info_request.cc index 5ff9489235..a332a6fe9a 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/get_system_info_request.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/get_system_info_request.cc @@ -32,12 +32,14 @@ #include "sdl_rpc_plugin/commands/hmi/get_system_info_request.h" -namespace application_manager { +namespace sdl_rpc_plugin { +using namespace application_manager; namespace commands { GetSystemInfoRequest::GetSystemInfoRequest( - const MessageSharedPtr& message, ApplicationManager& application_manager) + const application_manager::commands::MessageSharedPtr& message, + ApplicationManager& application_manager) : RequestToHMI(message, application_manager) {} GetSystemInfoRequest::~GetSystemInfoRequest() {} diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/get_system_info_response.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/get_system_info_response.cc index 9a6efbe996..c7f35080dc 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/get_system_info_response.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/get_system_info_response.cc @@ -32,11 +32,13 @@ #include "sdl_rpc_plugin/commands/hmi/get_system_info_response.h" #include "application_manager/message_helper.h" -namespace application_manager { +namespace sdl_rpc_plugin { +using namespace application_manager; namespace commands { GetSystemInfoResponse::GetSystemInfoResponse( - const MessageSharedPtr& message, ApplicationManager& application_manager) + const application_manager::commands::MessageSharedPtr& message, + ApplicationManager& application_manager) : ResponseFromHMI(message, application_manager) {} GetSystemInfoResponse::~GetSystemInfoResponse() {} diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/get_urls.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/get_urls.cc index 2b1cd4e442..6c1ddf9367 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/get_urls.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/get_urls.cc @@ -37,10 +37,11 @@ #include "application_manager/policies/policy_handler.h" #include "utils/helpers.h" -namespace application_manager { +namespace sdl_rpc_plugin { +using namespace application_manager; namespace commands { -GetUrls::GetUrls(const MessageSharedPtr& message, +GetUrls::GetUrls(const application_manager::commands::MessageSharedPtr& message, ApplicationManager& application_manager) : RequestFromHMI(message, application_manager) {} diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/get_urls_response.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/get_urls_response.cc index 40f13f87bf..977ffdae73 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/get_urls_response.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/get_urls_response.cc @@ -33,11 +33,13 @@ #include "sdl_rpc_plugin/commands/hmi/get_urls_response.h" #include "application_manager/rpc_service.h" -namespace application_manager { +namespace sdl_rpc_plugin { +using namespace application_manager; namespace commands { -GetUrlsResponse::GetUrlsResponse(const MessageSharedPtr& message, - ApplicationManager& application_manager) +GetUrlsResponse::GetUrlsResponse( + const application_manager::commands::MessageSharedPtr& message, + ApplicationManager& application_manager) : ResponseToHMI(message, application_manager) {} GetUrlsResponse::~GetUrlsResponse() {} diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/mixing_audio_supported_request.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/mixing_audio_supported_request.cc index 36fdfb4769..57a4012c98 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/mixing_audio_supported_request.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/mixing_audio_supported_request.cc @@ -32,12 +32,14 @@ #include "sdl_rpc_plugin/commands/hmi/mixing_audio_supported_request.h" -namespace application_manager { +namespace sdl_rpc_plugin { +using namespace application_manager; namespace commands { MixingAudioSupportedRequest::MixingAudioSupportedRequest( - const MessageSharedPtr& message, ApplicationManager& application_manager) + const application_manager::commands::MessageSharedPtr& message, + ApplicationManager& application_manager) : RequestToHMI(message, application_manager) {} MixingAudioSupportedRequest::~MixingAudioSupportedRequest() {} diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/mixing_audio_supported_response.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/mixing_audio_supported_response.cc index 376c07d178..f8ab03cdc9 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/mixing_audio_supported_response.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/mixing_audio_supported_response.cc @@ -31,12 +31,14 @@ */ #include "sdl_rpc_plugin/commands/hmi/mixing_audio_supported_response.h" -namespace application_manager { +namespace sdl_rpc_plugin { +using namespace application_manager; namespace commands { MixingAudioSupportedResponse::MixingAudioSupportedResponse( - const MessageSharedPtr& message, ApplicationManager& application_manager) + const application_manager::commands::MessageSharedPtr& message, + ApplicationManager& application_manager) : ResponseFromHMI(message, application_manager) {} MixingAudioSupportedResponse::~MixingAudioSupportedResponse() {} diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/navi_alert_maneuver_request.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/navi_alert_maneuver_request.cc index af98923ae7..d74425efe1 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/navi_alert_maneuver_request.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/navi_alert_maneuver_request.cc @@ -32,12 +32,14 @@ #include "sdl_rpc_plugin/commands/hmi/navi_alert_maneuver_request.h" -namespace application_manager { +namespace sdl_rpc_plugin { +using namespace application_manager; namespace commands { NaviAlertManeuverRequest::NaviAlertManeuverRequest( - const MessageSharedPtr& message, ApplicationManager& application_manager) + const application_manager::commands::MessageSharedPtr& message, + ApplicationManager& application_manager) : RequestToHMI(message, application_manager) {} NaviAlertManeuverRequest::~NaviAlertManeuverRequest() {} diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/navi_alert_maneuver_response.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/navi_alert_maneuver_response.cc index dc03fa102f..9b734f27cb 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/navi_alert_maneuver_response.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/navi_alert_maneuver_response.cc @@ -34,12 +34,14 @@ #include "interfaces/HMI_API.h" -namespace application_manager { +namespace sdl_rpc_plugin { +using namespace application_manager; namespace commands { NaviAlertManeuverResponse::NaviAlertManeuverResponse( - const MessageSharedPtr& message, ApplicationManager& application_manager) + const application_manager::commands::MessageSharedPtr& message, + ApplicationManager& application_manager) : ResponseFromHMI(message, application_manager) {} NaviAlertManeuverResponse::~NaviAlertManeuverResponse() {} diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/navi_audio_start_stream_request.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/navi_audio_start_stream_request.cc index e13697f727..4c09b27170 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/navi_audio_start_stream_request.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/navi_audio_start_stream_request.cc @@ -35,12 +35,14 @@ #include "application_manager/message_helper.h" #include "protocol_handler/protocol_handler.h" -namespace application_manager { +namespace sdl_rpc_plugin { +using namespace application_manager; namespace commands { AudioStartStreamRequest::AudioStartStreamRequest( - const MessageSharedPtr& message, ApplicationManager& application_manager) + const application_manager::commands::MessageSharedPtr& message, + ApplicationManager& application_manager) : RequestToHMI(message, application_manager) , EventObserver(application_manager.event_dispatcher()) , retry_number_(0) { @@ -58,7 +60,7 @@ AudioStartStreamRequest::~AudioStartStreamRequest() {} void AudioStartStreamRequest::Run() { LOG4CXX_AUTO_TRACE(logger_); - if (!CheckAvailabilityHMIInterfaces( + if (!app_mngr::commands::CheckAvailabilityHMIInterfaces( application_manager_, HmiInterfaces::HMI_INTERFACE_Navigation)) { LOG4CXX_INFO(logger_, "Interface Navi is not supported by system"); return; diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/navi_audio_start_stream_response.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/navi_audio_start_stream_response.cc index 2e2d5215d2..e20fd0cbd6 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/navi_audio_start_stream_response.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/navi_audio_start_stream_response.cc @@ -31,12 +31,14 @@ */ #include "sdl_rpc_plugin/commands/hmi/navi_audio_start_stream_response.h" -namespace application_manager { +namespace sdl_rpc_plugin { +using namespace application_manager; namespace commands { AudioStartStreamResponse::AudioStartStreamResponse( - const MessageSharedPtr& message, ApplicationManager& application_manager) + const application_manager::commands::MessageSharedPtr& message, + ApplicationManager& application_manager) : ResponseFromHMI(message, application_manager) {} AudioStartStreamResponse::~AudioStartStreamResponse() {} diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/navi_audio_stop_stream_request.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/navi_audio_stop_stream_request.cc index 0247d0a1be..8ec7fa6b59 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/navi_audio_stop_stream_request.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/navi_audio_stop_stream_request.cc @@ -31,19 +31,21 @@ */ #include "sdl_rpc_plugin/commands/hmi/navi_audio_stop_stream_request.h" -namespace application_manager { +namespace sdl_rpc_plugin { +using namespace application_manager; namespace commands { AudioStopStreamRequest::AudioStopStreamRequest( - const MessageSharedPtr& message, ApplicationManager& application_manager) + const application_manager::commands::MessageSharedPtr& message, + ApplicationManager& application_manager) : RequestToHMI(message, application_manager) {} AudioStopStreamRequest::~AudioStopStreamRequest() {} void AudioStopStreamRequest::Run() { LOG4CXX_AUTO_TRACE(logger_); - if (!CheckAvailabilityHMIInterfaces( + if (!app_mngr::commands::CheckAvailabilityHMIInterfaces( application_manager_, HmiInterfaces::HMI_INTERFACE_Navigation)) { LOG4CXX_INFO(logger_, "Interface Navi is not supported by system"); return; diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/navi_audio_stop_stream_response.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/navi_audio_stop_stream_response.cc index fdb7ba2c49..95dc5bc9a7 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/navi_audio_stop_stream_response.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/navi_audio_stop_stream_response.cc @@ -31,12 +31,14 @@ */ #include "sdl_rpc_plugin/commands/hmi/navi_audio_stop_stream_response.h" -namespace application_manager { +namespace sdl_rpc_plugin { +using namespace application_manager; namespace commands { AudioStopStreamResponse::AudioStopStreamResponse( - const MessageSharedPtr& message, ApplicationManager& application_manager) + const application_manager::commands::MessageSharedPtr& message, + ApplicationManager& application_manager) : ResponseFromHMI(message, application_manager) {} AudioStopStreamResponse::~AudioStopStreamResponse() {} diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/navi_get_way_points_request.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/navi_get_way_points_request.cc index 42d78e6996..b41367f1a8 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/navi_get_way_points_request.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/navi_get_way_points_request.cc @@ -32,12 +32,14 @@ #include "sdl_rpc_plugin/commands/hmi/navi_get_way_points_request.h" -namespace application_manager { +namespace sdl_rpc_plugin { +using namespace application_manager; namespace commands { NaviGetWayPointsRequest::NaviGetWayPointsRequest( - const MessageSharedPtr& message, ApplicationManager& application_manager) + const application_manager::commands::MessageSharedPtr& message, + ApplicationManager& application_manager) : RequestToHMI(message, application_manager) {} NaviGetWayPointsRequest::~NaviGetWayPointsRequest() {} diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/navi_get_way_points_response.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/navi_get_way_points_response.cc index 3d5331f5d8..7ab71110da 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/navi_get_way_points_response.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/navi_get_way_points_response.cc @@ -34,12 +34,14 @@ #include "application_manager/event_engine/event.h" #include "interfaces/HMI_API.h" -namespace application_manager { +namespace sdl_rpc_plugin { +using namespace application_manager; namespace commands { NaviGetWayPointsResponse::NaviGetWayPointsResponse( - const MessageSharedPtr& message, ApplicationManager& application_manager) + const application_manager::commands::MessageSharedPtr& message, + ApplicationManager& application_manager) : ResponseFromHMI(message, application_manager) {} NaviGetWayPointsResponse::~NaviGetWayPointsResponse() {} diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/navi_is_ready_request.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/navi_is_ready_request.cc index de24f5f574..14e7969283 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/navi_is_ready_request.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/navi_is_ready_request.cc @@ -32,12 +32,14 @@ #include "sdl_rpc_plugin/commands/hmi/navi_is_ready_request.h" -namespace application_manager { +namespace sdl_rpc_plugin { +using namespace application_manager; namespace commands { -NaviIsReadyRequest::NaviIsReadyRequest(const MessageSharedPtr& message, - ApplicationManager& application_manager) +NaviIsReadyRequest::NaviIsReadyRequest( + const application_manager::commands::MessageSharedPtr& message, + ApplicationManager& application_manager) : RequestToHMI(message, application_manager) , EventObserver(application_manager.event_dispatcher()) {} @@ -57,10 +59,10 @@ void NaviIsReadyRequest::on_event(const event_engine::Event& event) { case hmi_apis::FunctionID::Navigation_IsReady: { LOG4CXX_DEBUG(logger_, "Received Navigation_IsReady event"); unsubscribe_from_event(hmi_apis::FunctionID::Navigation_IsReady); - const bool is_available = - ChangeInterfaceState(application_manager_, - message, - HmiInterfaces::HMI_INTERFACE_Navigation); + const bool is_available = app_mngr::commands::ChangeInterfaceState( + application_manager_, + message, + HmiInterfaces::HMI_INTERFACE_Navigation); HMICapabilities& hmi_capabilities = application_manager_.hmi_capabilities(); diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/navi_is_ready_response.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/navi_is_ready_response.cc index e31120b224..2dfcbfc6b7 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/navi_is_ready_response.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/navi_is_ready_response.cc @@ -31,12 +31,14 @@ */ #include "sdl_rpc_plugin/commands/hmi/navi_is_ready_response.h" -namespace application_manager { +namespace sdl_rpc_plugin { +using namespace application_manager; namespace commands { NaviIsReadyResponse::NaviIsReadyResponse( - const MessageSharedPtr& message, ApplicationManager& application_manager) + const application_manager::commands::MessageSharedPtr& message, + ApplicationManager& application_manager) : ResponseFromHMI(message, application_manager) {} NaviIsReadyResponse::~NaviIsReadyResponse() {} diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/navi_send_location_request.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/navi_send_location_request.cc index 56675618db..73cca16b8c 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/navi_send_location_request.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/navi_send_location_request.cc @@ -32,12 +32,14 @@ #include "sdl_rpc_plugin/commands/hmi/navi_send_location_request.h" -namespace application_manager { +namespace sdl_rpc_plugin { +using namespace application_manager; namespace commands { NaviSendLocationRequest::NaviSendLocationRequest( - const MessageSharedPtr& message, ApplicationManager& application_manager) + const application_manager::commands::MessageSharedPtr& message, + ApplicationManager& application_manager) : RequestToHMI(message, application_manager) {} NaviSendLocationRequest::~NaviSendLocationRequest() {} diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/navi_send_location_response.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/navi_send_location_response.cc index 598a1bebe4..8b017acf69 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/navi_send_location_response.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/navi_send_location_response.cc @@ -32,12 +32,14 @@ #include "sdl_rpc_plugin/commands/hmi/navi_send_location_response.h" #include "application_manager/event_engine/event.h" -namespace application_manager { +namespace sdl_rpc_plugin { +using namespace application_manager; namespace commands { NaviSendLocationResponse::NaviSendLocationResponse( - const MessageSharedPtr& message, ApplicationManager& application_manager) + const application_manager::commands::MessageSharedPtr& message, + ApplicationManager& application_manager) : ResponseFromHMI(message, application_manager) {} NaviSendLocationResponse::~NaviSendLocationResponse() {} diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/navi_set_video_config_request.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/navi_set_video_config_request.cc index ea98701ffd..5c985021e9 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/navi_set_video_config_request.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/navi_set_video_config_request.cc @@ -34,12 +34,14 @@ #include <string> #include <vector> -namespace application_manager { +namespace sdl_rpc_plugin { +using namespace application_manager; namespace commands { NaviSetVideoConfigRequest::NaviSetVideoConfigRequest( - const MessageSharedPtr& message, ApplicationManager& application_manager) + const application_manager::commands::MessageSharedPtr& message, + ApplicationManager& application_manager) : RequestToHMI(message, application_manager) , EventObserver(application_manager.event_dispatcher()) {} @@ -47,7 +49,7 @@ NaviSetVideoConfigRequest::~NaviSetVideoConfigRequest() {} void NaviSetVideoConfigRequest::Run() { LOG4CXX_AUTO_TRACE(logger_); - if (!CheckAvailabilityHMIInterfaces( + if (!app_mngr::commands::CheckAvailabilityHMIInterfaces( application_manager_, HmiInterfaces::HMI_INTERFACE_Navigation)) { LOG4CXX_WARN(logger_, "HMI interface Navigation is not supported"); return; diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/navi_set_video_config_response.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/navi_set_video_config_response.cc index 34fc56e664..199ccd670d 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/navi_set_video_config_response.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/navi_set_video_config_response.cc @@ -32,12 +32,14 @@ #include "sdl_rpc_plugin/commands/hmi/navi_set_video_config_response.h" #include "application_manager/event_engine/event.h" -namespace application_manager { +namespace sdl_rpc_plugin { +using namespace application_manager; namespace commands { NaviSetVideoConfigResponse::NaviSetVideoConfigResponse( - const MessageSharedPtr& message, ApplicationManager& application_manager) + const application_manager::commands::MessageSharedPtr& message, + ApplicationManager& application_manager) : ResponseFromHMI(message, application_manager) {} NaviSetVideoConfigResponse::~NaviSetVideoConfigResponse() {} diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/navi_show_constant_tbt_request.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/navi_show_constant_tbt_request.cc index 28e19b846c..b836dd5284 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/navi_show_constant_tbt_request.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/navi_show_constant_tbt_request.cc @@ -32,12 +32,14 @@ #include "sdl_rpc_plugin/commands/hmi/navi_show_constant_tbt_request.h" -namespace application_manager { +namespace sdl_rpc_plugin { +using namespace application_manager; namespace commands { NaviShowConstantTBTRequest::NaviShowConstantTBTRequest( - const MessageSharedPtr& message, ApplicationManager& application_manager) + const application_manager::commands::MessageSharedPtr& message, + ApplicationManager& application_manager) : RequestToHMI(message, application_manager) {} NaviShowConstantTBTRequest::~NaviShowConstantTBTRequest() {} diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/navi_show_constant_tbt_response.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/navi_show_constant_tbt_response.cc index fe3244d5ed..5060393cfb 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/navi_show_constant_tbt_response.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/navi_show_constant_tbt_response.cc @@ -34,12 +34,14 @@ #include "interfaces/HMI_API.h" -namespace application_manager { +namespace sdl_rpc_plugin { +using namespace application_manager; namespace commands { NaviShowConstantTBTResponse::NaviShowConstantTBTResponse( - const MessageSharedPtr& message, ApplicationManager& application_manager) + const application_manager::commands::MessageSharedPtr& message, + ApplicationManager& application_manager) : ResponseFromHMI(message, application_manager) {} NaviShowConstantTBTResponse::~NaviShowConstantTBTResponse() {} diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/navi_start_stream_request.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/navi_start_stream_request.cc index 112de0e4e1..4d2457acde 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/navi_start_stream_request.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/navi_start_stream_request.cc @@ -35,12 +35,14 @@ #include "application_manager/message_helper.h" #include "protocol_handler/protocol_handler.h" -namespace application_manager { +namespace sdl_rpc_plugin { +using namespace application_manager; namespace commands { NaviStartStreamRequest::NaviStartStreamRequest( - const MessageSharedPtr& message, ApplicationManager& application_manager) + const application_manager::commands::MessageSharedPtr& message, + ApplicationManager& application_manager) : RequestToHMI(message, application_manager) , EventObserver(application_manager.event_dispatcher()) , retry_number_(0) { @@ -58,7 +60,7 @@ NaviStartStreamRequest::~NaviStartStreamRequest() {} void NaviStartStreamRequest::Run() { LOG4CXX_AUTO_TRACE(logger_); - if (!CheckAvailabilityHMIInterfaces( + if (!app_mngr::commands::CheckAvailabilityHMIInterfaces( application_manager_, HmiInterfaces::HMI_INTERFACE_Navigation)) { LOG4CXX_INFO(logger_, "Interface Navi is not supported by system"); return; diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/navi_start_stream_response.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/navi_start_stream_response.cc index 7ea082da08..d3215c8d82 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/navi_start_stream_response.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/navi_start_stream_response.cc @@ -31,12 +31,14 @@ */ #include "sdl_rpc_plugin/commands/hmi/navi_start_stream_response.h" -namespace application_manager { +namespace sdl_rpc_plugin { +using namespace application_manager; namespace commands { NaviStartStreamResponse::NaviStartStreamResponse( - const MessageSharedPtr& message, ApplicationManager& application_manager) + const application_manager::commands::MessageSharedPtr& message, + ApplicationManager& application_manager) : ResponseFromHMI(message, application_manager) {} NaviStartStreamResponse::~NaviStartStreamResponse() {} diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/navi_stop_stream_request.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/navi_stop_stream_request.cc index c3d6ed6675..0961315c2c 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/navi_stop_stream_request.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/navi_stop_stream_request.cc @@ -1,18 +1,20 @@ #include "sdl_rpc_plugin/commands/hmi/navi_stop_stream_request.h" -namespace application_manager { +namespace sdl_rpc_plugin { +using namespace application_manager; namespace commands { NaviStopStreamRequest::NaviStopStreamRequest( - const MessageSharedPtr& message, ApplicationManager& application_manager) + const application_manager::commands::MessageSharedPtr& message, + ApplicationManager& application_manager) : RequestToHMI(message, application_manager) {} NaviStopStreamRequest::~NaviStopStreamRequest() {} void NaviStopStreamRequest::Run() { LOG4CXX_AUTO_TRACE(logger_); - if (!CheckAvailabilityHMIInterfaces( + if (!app_mngr::commands::CheckAvailabilityHMIInterfaces( application_manager_, HmiInterfaces::HMI_INTERFACE_Navigation)) { LOG4CXX_INFO(logger_, "Interface Navi is not supported by system"); return; diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/navi_stop_stream_response.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/navi_stop_stream_response.cc index 8ba80eca2c..94dcfb729c 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/navi_stop_stream_response.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/navi_stop_stream_response.cc @@ -31,12 +31,14 @@ */ #include "sdl_rpc_plugin/commands/hmi/navi_stop_stream_response.h" -namespace application_manager { +namespace sdl_rpc_plugin { +using namespace application_manager; namespace commands { NaviStopStreamResponse::NaviStopStreamResponse( - const MessageSharedPtr& message, ApplicationManager& application_manager) + const application_manager::commands::MessageSharedPtr& message, + ApplicationManager& application_manager) : ResponseFromHMI(message, application_manager) {} NaviStopStreamResponse::~NaviStopStreamResponse() {} diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/navi_subscribe_way_points_request.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/navi_subscribe_way_points_request.cc index 6faf5cedca..e614a96316 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/navi_subscribe_way_points_request.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/navi_subscribe_way_points_request.cc @@ -32,12 +32,14 @@ #include "sdl_rpc_plugin/commands/hmi/navi_subscribe_way_points_request.h" -namespace application_manager { +namespace sdl_rpc_plugin { +using namespace application_manager; namespace commands { NaviSubscribeWayPointsRequest::NaviSubscribeWayPointsRequest( - const MessageSharedPtr& message, ApplicationManager& application_manager) + const application_manager::commands::MessageSharedPtr& message, + ApplicationManager& application_manager) : RequestToHMI(message, application_manager) {} NaviSubscribeWayPointsRequest::~NaviSubscribeWayPointsRequest() {} diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/navi_subscribe_way_points_response.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/navi_subscribe_way_points_response.cc index d2a64e3945..17701a430c 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/navi_subscribe_way_points_response.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/navi_subscribe_way_points_response.cc @@ -34,12 +34,14 @@ #include "application_manager/event_engine/event.h" #include "interfaces/HMI_API.h" -namespace application_manager { +namespace sdl_rpc_plugin { +using namespace application_manager; namespace commands { NaviSubscribeWayPointsResponse::NaviSubscribeWayPointsResponse( - const MessageSharedPtr& message, ApplicationManager& application_manager) + const application_manager::commands::MessageSharedPtr& message, + ApplicationManager& application_manager) : ResponseFromHMI(message, application_manager) {} NaviSubscribeWayPointsResponse::~NaviSubscribeWayPointsResponse() {} diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/navi_unsubscribe_way_points_request.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/navi_unsubscribe_way_points_request.cc index 5a1aafa0a1..421de032b2 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/navi_unsubscribe_way_points_request.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/navi_unsubscribe_way_points_request.cc @@ -32,12 +32,14 @@ #include "sdl_rpc_plugin/commands/hmi/navi_unsubscribe_way_points_request.h" -namespace application_manager { +namespace sdl_rpc_plugin { +using namespace application_manager; namespace commands { NaviUnSubscribeWayPointsRequest::NaviUnSubscribeWayPointsRequest( - const MessageSharedPtr& message, ApplicationManager& application_manager) + const application_manager::commands::MessageSharedPtr& message, + ApplicationManager& application_manager) : RequestToHMI(message, application_manager) {} NaviUnSubscribeWayPointsRequest::~NaviUnSubscribeWayPointsRequest() {} diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/navi_unsubscribe_way_points_response.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/navi_unsubscribe_way_points_response.cc index 183ad8b6f8..afc32d371a 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/navi_unsubscribe_way_points_response.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/navi_unsubscribe_way_points_response.cc @@ -35,12 +35,14 @@ #include "interfaces/MOBILE_API.h" #include "interfaces/HMI_API.h" -namespace application_manager { +namespace sdl_rpc_plugin { +using namespace application_manager; namespace commands { NaviUnsubscribeWayPointsResponse::NaviUnsubscribeWayPointsResponse( - const MessageSharedPtr& message, ApplicationManager& application_manager) + const application_manager::commands::MessageSharedPtr& message, + ApplicationManager& application_manager) : ResponseFromHMI(message, application_manager) {} NaviUnsubscribeWayPointsResponse::~NaviUnsubscribeWayPointsResponse() {} diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/navi_update_turn_list_request.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/navi_update_turn_list_request.cc index 809286d035..62e34f586d 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/navi_update_turn_list_request.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/navi_update_turn_list_request.cc @@ -32,12 +32,14 @@ #include "sdl_rpc_plugin/commands/hmi/navi_update_turn_list_request.h" -namespace application_manager { +namespace sdl_rpc_plugin { +using namespace application_manager; namespace commands { NaviUpdateTurnListRequest::NaviUpdateTurnListRequest( - const MessageSharedPtr& message, ApplicationManager& application_manager) + const application_manager::commands::MessageSharedPtr& message, + ApplicationManager& application_manager) : RequestToHMI(message, application_manager) {} NaviUpdateTurnListRequest::~NaviUpdateTurnListRequest() {} diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/navi_update_turn_list_response.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/navi_update_turn_list_response.cc index 5d7baf874d..4231b5055e 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/navi_update_turn_list_response.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/navi_update_turn_list_response.cc @@ -34,12 +34,14 @@ #include "interfaces/MOBILE_API.h" -namespace application_manager { +namespace sdl_rpc_plugin { +using namespace application_manager; namespace commands { NaviUpdateTurnListResponse::NaviUpdateTurnListResponse( - const MessageSharedPtr& message, ApplicationManager& application_manager) + const application_manager::commands::MessageSharedPtr& message, + ApplicationManager& application_manager) : ResponseFromHMI(message, application_manager) {} NaviUpdateTurnListResponse::~NaviUpdateTurnListResponse() {} diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/notification_from_hmi.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/notification_from_hmi.cc index 5e7bd7b673..ec8a9af8f5 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/notification_from_hmi.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/notification_from_hmi.cc @@ -30,17 +30,19 @@ POSSIBILITY OF SUCH DAMAGE. */ -#include "sdl_rpc_plugin/commands/hmi/notification_from_hmi.h" +#include "application_manager/commands/notification_from_hmi.h" #include "application_manager/application_manager.h" #include "application_manager/rpc_service.h" #include "smart_objects/smart_object.h" -namespace application_manager { +namespace sdl_rpc_plugin { +using namespace application_manager; namespace commands { NotificationFromHMI::NotificationFromHMI( - const MessageSharedPtr& message, ApplicationManager& application_manager) + const application_manager::commands::MessageSharedPtr& message, + ApplicationManager& application_manager) : CommandImpl(message, application_manager) { // Replace HMI app id with Mobile connection id ReplaceHMIWithMobileAppId(*message); @@ -59,7 +61,7 @@ bool NotificationFromHMI::CleanUp() { void NotificationFromHMI::Run() {} void NotificationFromHMI::SendNotificationToMobile( - const MessageSharedPtr& message) { + const application_manager::commands::MessageSharedPtr& message) { (*message)[strings::params][strings::message_type] = static_cast<int32_t>(application_manager::MessageType::kNotification); application_manager_.GetRPCService().ManageMobileCommand(message, SOURCE_SDL); diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/notification_to_hmi.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/notification_to_hmi.cc index fcdee1a57b..252ddbec87 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/notification_to_hmi.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/notification_to_hmi.cc @@ -30,16 +30,18 @@ POSSIBILITY OF SUCH DAMAGE. */ -#include "sdl_rpc_plugin/commands/hmi/notification_to_hmi.h" +#include "application_manager/commands/notification_to_hmi.h" #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 { -NotificationToHMI::NotificationToHMI(const MessageSharedPtr& message, - ApplicationManager& application_manager) +NotificationToHMI::NotificationToHMI( + const application_manager::commands::MessageSharedPtr& message, + ApplicationManager& application_manager) : CommandImpl(message, application_manager) {} NotificationToHMI::~NotificationToHMI() {} diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/on_allow_sdl_functionality_notification.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/on_allow_sdl_functionality_notification.cc index 69bfb76fe9..48f55c0480 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/on_allow_sdl_functionality_notification.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/on_allow_sdl_functionality_notification.cc @@ -34,12 +34,14 @@ #include "application_manager/application_manager.h" #include "application_manager/policies/policy_handler.h" -namespace application_manager { +namespace sdl_rpc_plugin { +using namespace application_manager; namespace commands { OnAllowSDLFunctionalityNotification::OnAllowSDLFunctionalityNotification( - const MessageSharedPtr& message, ApplicationManager& application_manager) + const application_manager::commands::MessageSharedPtr& message, + ApplicationManager& application_manager) : NotificationFromHMI(message, application_manager) {} OnAllowSDLFunctionalityNotification::~OnAllowSDLFunctionalityNotification() {} diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/on_app_activated_notification.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/on_app_activated_notification.cc index 543f64f367..84a3f651fe 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/on_app_activated_notification.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/on_app_activated_notification.cc @@ -35,12 +35,14 @@ #include "application_manager/message_helper.h" #include "interfaces/HMI_API.h" -namespace application_manager { +namespace sdl_rpc_plugin { +using namespace application_manager; namespace commands { OnAppActivatedNotification::OnAppActivatedNotification( - const MessageSharedPtr& message, ApplicationManager& application_manager) + const application_manager::commands::MessageSharedPtr& message, + ApplicationManager& application_manager) : NotificationFromHMI(message, application_manager) {} OnAppActivatedNotification::~OnAppActivatedNotification() {} diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/on_app_deactivated_notification.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/on_app_deactivated_notification.cc index 3665292d17..5bbdbbbc4e 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/on_app_deactivated_notification.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/on_app_deactivated_notification.cc @@ -37,12 +37,14 @@ #include "utils/helpers.h" -namespace application_manager { +namespace sdl_rpc_plugin { +using namespace application_manager; namespace commands { OnAppDeactivatedNotification::OnAppDeactivatedNotification( - const MessageSharedPtr& message, ApplicationManager& application_manager) + const application_manager::commands::MessageSharedPtr& message, + ApplicationManager& application_manager) : NotificationFromHMI(message, application_manager) {} OnAppDeactivatedNotification::~OnAppDeactivatedNotification() {} diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/on_app_permission_changed_notification.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/on_app_permission_changed_notification.cc index 9ddb551460..26cf5e244d 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/on_app_permission_changed_notification.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/on_app_permission_changed_notification.cc @@ -32,12 +32,14 @@ #include "sdl_rpc_plugin/commands/hmi/on_app_permission_changed_notification.h" -namespace application_manager { +namespace sdl_rpc_plugin { +using namespace application_manager; namespace commands { OnAppPermissionChangedNotification::OnAppPermissionChangedNotification( - const MessageSharedPtr& message, ApplicationManager& application_manager) + const application_manager::commands::MessageSharedPtr& message, + ApplicationManager& application_manager) : NotificationToHMI(message, application_manager) {} OnAppPermissionChangedNotification::~OnAppPermissionChangedNotification() {} diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/on_app_permission_consent_notification.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/on_app_permission_consent_notification.cc index 1c85e0f352..bc76568404 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/on_app_permission_consent_notification.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/on_app_permission_consent_notification.cc @@ -108,12 +108,14 @@ struct ExternalConsentStatusAppender #endif } // namespace -namespace application_manager { +namespace sdl_rpc_plugin { +using namespace application_manager; namespace commands { OnAppPermissionConsentNotification::OnAppPermissionConsentNotification( - const MessageSharedPtr& message, ApplicationManager& application_manager) + const application_manager::commands::MessageSharedPtr& message, + ApplicationManager& application_manager) : NotificationFromHMI(message, application_manager) {} OnAppPermissionConsentNotification::~OnAppPermissionConsentNotification() {} diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/on_app_registered_notification.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/on_app_registered_notification.cc index 2f7a590260..e73da8e966 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/on_app_registered_notification.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/on_app_registered_notification.cc @@ -32,12 +32,14 @@ #include "sdl_rpc_plugin/commands/hmi/on_app_registered_notification.h" -namespace application_manager { +namespace sdl_rpc_plugin { +using namespace application_manager; namespace commands { OnAppRegisteredNotification::OnAppRegisteredNotification( - const MessageSharedPtr& message, ApplicationManager& application_manager) + const application_manager::commands::MessageSharedPtr& message, + ApplicationManager& application_manager) : NotificationToHMI(message, application_manager) {} OnAppRegisteredNotification::~OnAppRegisteredNotification() {} diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/on_app_unregistered_notification.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/on_app_unregistered_notification.cc index b7f2c47ccf..a7643cc4e7 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/on_app_unregistered_notification.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/on_app_unregistered_notification.cc @@ -34,12 +34,14 @@ #include "application_manager/event_engine/event.h" -namespace application_manager { +namespace sdl_rpc_plugin { +using namespace application_manager; namespace commands { OnAppUnregisteredNotification::OnAppUnregisteredNotification( - const MessageSharedPtr& message, ApplicationManager& application_manager) + const application_manager::commands::MessageSharedPtr& message, + ApplicationManager& application_manager) : NotificationToHMI(message, application_manager) {} OnAppUnregisteredNotification::~OnAppUnregisteredNotification() {} diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/on_audio_data_streaming_notification.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/on_audio_data_streaming_notification.cc index 432c78e13a..ba3355be37 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/on_audio_data_streaming_notification.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/on_audio_data_streaming_notification.cc @@ -32,12 +32,14 @@ #include "sdl_rpc_plugin/commands/hmi/on_audio_data_streaming_notification.h" -namespace application_manager { +namespace sdl_rpc_plugin { +using namespace application_manager; namespace commands { OnAudioDataStreamingNotification::OnAudioDataStreamingNotification( - const MessageSharedPtr& message, ApplicationManager& application_manager) + const application_manager::commands::MessageSharedPtr& message, + ApplicationManager& application_manager) : NotificationToHMI(message, application_manager) {} OnAudioDataStreamingNotification::~OnAudioDataStreamingNotification() {} diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/on_button_event_notification.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/on_button_event_notification.cc index 22a9935fc7..463812d3a1 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/on_button_event_notification.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/on_button_event_notification.cc @@ -35,14 +35,16 @@ #include "application_manager/application_impl.h" #include "utils/logger.h" -namespace application_manager { +namespace sdl_rpc_plugin { +using namespace application_manager; namespace commands { namespace hmi { OnButtonEventNotification::OnButtonEventNotification( - const MessageSharedPtr& message, ApplicationManager& application_manager) + const application_manager::commands::MessageSharedPtr& message, + ApplicationManager& application_manager) : NotificationFromHMI(message, application_manager) {} void OnButtonEventNotification::Run() { diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/on_button_press_notification.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/on_button_press_notification.cc index 024103ed81..86592ea985 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/on_button_press_notification.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/on_button_press_notification.cc @@ -36,14 +36,16 @@ #include "utils/logger.h" #include "application_manager/event_engine/event.h" -namespace application_manager { +namespace sdl_rpc_plugin { +using namespace application_manager; namespace commands { namespace hmi { OnButtonPressNotification::OnButtonPressNotification( - const MessageSharedPtr& message, ApplicationManager& application_manager) + const application_manager::commands::MessageSharedPtr& message, + ApplicationManager& application_manager) : NotificationFromHMI(message, application_manager) {} void OnButtonPressNotification::Run() { diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/on_button_subscription_notification.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/on_button_subscription_notification.cc index 12eb9550c4..157d49491d 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/on_button_subscription_notification.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/on_button_subscription_notification.cc @@ -32,14 +32,16 @@ #include "sdl_rpc_plugin/commands/hmi/on_button_subscription_notification.h" -namespace application_manager { +namespace sdl_rpc_plugin { +using namespace application_manager; namespace commands { namespace hmi { OnButtonSubscriptionNotification::OnButtonSubscriptionNotification( - const MessageSharedPtr& message, ApplicationManager& application_manager) + const application_manager::commands::MessageSharedPtr& message, + ApplicationManager& application_manager) : NotificationToHMI(message, application_manager) {} OnButtonSubscriptionNotification::~OnButtonSubscriptionNotification() {} diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/on_device_chosen_notification.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/on_device_chosen_notification.cc index 7484b3f1fa..880cc33077 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/on_device_chosen_notification.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/on_device_chosen_notification.cc @@ -32,12 +32,14 @@ #include "sdl_rpc_plugin/commands/hmi/on_device_chosen_notification.h" -namespace application_manager { +namespace sdl_rpc_plugin { +using namespace application_manager; namespace commands { OnDeviceChosenNotification::OnDeviceChosenNotification( - const MessageSharedPtr& message, ApplicationManager& application_manager) + const application_manager::commands::MessageSharedPtr& message, + ApplicationManager& application_manager) : NotificationFromHMI(message, application_manager) {} OnDeviceChosenNotification::~OnDeviceChosenNotification() {} diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/on_device_state_changed_notification.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/on_device_state_changed_notification.cc index a75acebb7a..b94fb2d020 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/on_device_state_changed_notification.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/on_device_state_changed_notification.cc @@ -74,12 +74,14 @@ std::string convert_to_bt_mac(std::string& deviceInternalId) { } } -namespace application_manager { +namespace sdl_rpc_plugin { +using namespace application_manager; namespace commands { OnDeviceStateChangedNotification::OnDeviceStateChangedNotification( - const MessageSharedPtr& message, ApplicationManager& application_manager) + const application_manager::commands::MessageSharedPtr& message, + ApplicationManager& application_manager) : NotificationFromHMI(message, application_manager) {} OnDeviceStateChangedNotification::~OnDeviceStateChangedNotification() {} diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/on_driver_distraction_notification.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/on_driver_distraction_notification.cc index 221cb34211..bf37a2753b 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/on_driver_distraction_notification.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/on_driver_distraction_notification.cc @@ -39,7 +39,8 @@ #include "interfaces/HMI_API.h" #include "utils/make_shared.h" -namespace application_manager { +namespace sdl_rpc_plugin { +using namespace application_manager; namespace commands { @@ -93,7 +94,8 @@ struct OnDriverDistractionProcessor { } OnDriverDistractionNotification::OnDriverDistractionNotification( - const MessageSharedPtr& message, ApplicationManager& application_manager) + const application_manager::commands::MessageSharedPtr& message, + ApplicationManager& application_manager) : NotificationFromHMI(message, application_manager) {} OnDriverDistractionNotification::~OnDriverDistractionNotification() {} diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/on_event_changed_notification.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/on_event_changed_notification.cc index 67f132e8e2..2d02b8c5f5 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/on_event_changed_notification.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/on_event_changed_notification.cc @@ -32,12 +32,14 @@ #include "sdl_rpc_plugin/commands/hmi/on_event_changed_notification.h" -namespace application_manager { +namespace sdl_rpc_plugin { +using namespace application_manager; namespace commands { OnEventChangedNotification::OnEventChangedNotification( - const MessageSharedPtr& message, ApplicationManager& application_manager) + const application_manager::commands::MessageSharedPtr& message, + ApplicationManager& application_manager) : NotificationFromHMI(message, application_manager) {} OnEventChangedNotification::~OnEventChangedNotification() {} diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/on_exit_all_applications_notification.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/on_exit_all_applications_notification.cc index 07dbe93ed2..e1d7450e2e 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/on_exit_all_applications_notification.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/on_exit_all_applications_notification.cc @@ -41,12 +41,14 @@ #include "application_manager/resumption/resume_ctrl.h" #include "interfaces/HMI_API.h" -namespace application_manager { +namespace sdl_rpc_plugin { +using namespace application_manager; namespace commands { OnExitAllApplicationsNotification::OnExitAllApplicationsNotification( - const MessageSharedPtr& message, ApplicationManager& application_manager) + const application_manager::commands::MessageSharedPtr& message, + ApplicationManager& application_manager) : NotificationFromHMI(message, application_manager) {} OnExitAllApplicationsNotification::~OnExitAllApplicationsNotification() {} diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/on_exit_application_notification.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/on_exit_application_notification.cc index 6c093ab2ea..b831942248 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/on_exit_application_notification.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/on_exit_application_notification.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 { OnExitApplicationNotification::OnExitApplicationNotification( - const MessageSharedPtr& message, ApplicationManager& application_manager) + const application_manager::commands::MessageSharedPtr& message, + ApplicationManager& application_manager) : NotificationFromHMI(message, application_manager) {} OnExitApplicationNotification::~OnExitApplicationNotification() {} @@ -77,7 +79,7 @@ void OnExitApplicationNotification::Run() { application_manager_.GetRPCService().ManageMobileCommand( MessageHelper::GetOnAppInterfaceUnregisteredNotificationToMobile( app_id, AppInterfaceUnregisteredReason::APP_UNAUTHORIZED), - commands::Command::SOURCE_SDL); + SOURCE_SDL); // HMI rejects registration for navi application application_manager_.UnregisterApplication(app_id, Result::SUCCESS); return; @@ -86,7 +88,7 @@ void OnExitApplicationNotification::Run() { application_manager_.GetRPCService().ManageMobileCommand( MessageHelper::GetOnAppInterfaceUnregisteredNotificationToMobile( app_id, AppInterfaceUnregisteredReason::UNSUPPORTED_HMI_RESOURCE), - commands::Command::SOURCE_SDL); + SOURCE_SDL); application_manager_.UnregisterApplication(app_id, Result::SUCCESS); return; } diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/on_file_removed_notification.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/on_file_removed_notification.cc index fd2a2d33ed..a279457ef9 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/on_file_removed_notification.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/on_file_removed_notification.cc @@ -32,12 +32,14 @@ #include "sdl_rpc_plugin/commands/hmi/on_file_removed_notification.h" -namespace application_manager { +namespace sdl_rpc_plugin { +using namespace application_manager; namespace commands { OnFileRemovedNotification::OnFileRemovedNotification( - const MessageSharedPtr& message, ApplicationManager& application_manager) + const application_manager::commands::MessageSharedPtr& message, + ApplicationManager& application_manager) : NotificationToHMI(message, application_manager) {} OnFileRemovedNotification::~OnFileRemovedNotification() {} diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/on_find_applications.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/on_find_applications.cc index 94315036e6..57bda08c81 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/on_find_applications.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/on_find_applications.cc @@ -32,12 +32,14 @@ #include "sdl_rpc_plugin/commands/hmi/on_find_applications.h" -namespace application_manager { +namespace sdl_rpc_plugin { +using namespace application_manager; namespace commands { -OnFindApplications::OnFindApplications(const MessageSharedPtr& message, - ApplicationManager& application_manager) +OnFindApplications::OnFindApplications( + const application_manager::commands::MessageSharedPtr& message, + ApplicationManager& application_manager) : NotificationFromHMI(message, application_manager) {} OnFindApplications::~OnFindApplications() {} diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/on_ignition_cycle_over_notification.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/on_ignition_cycle_over_notification.cc index ca837d0cac..e125eefa56 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/on_ignition_cycle_over_notification.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/on_ignition_cycle_over_notification.cc @@ -33,12 +33,14 @@ #include "sdl_rpc_plugin/commands/hmi/on_ignition_cycle_over_notification.h" #include "application_manager/application_manager.h" -namespace application_manager { +namespace sdl_rpc_plugin { +using namespace application_manager; namespace commands { OnIgnitionCycleOverNotification::OnIgnitionCycleOverNotification( - const MessageSharedPtr& message, ApplicationManager& application_manager) + const application_manager::commands::MessageSharedPtr& message, + ApplicationManager& application_manager) : NotificationFromHMI(message, application_manager) {} OnIgnitionCycleOverNotification::~OnIgnitionCycleOverNotification() {} diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/on_navi_tbt_client_state_notification.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/on_navi_tbt_client_state_notification.cc index f4b24a242d..e91b5f924d 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/on_navi_tbt_client_state_notification.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/on_navi_tbt_client_state_notification.cc @@ -33,12 +33,14 @@ #include "sdl_rpc_plugin/commands/hmi/on_navi_tbt_client_state_notification.h" #include "interfaces/MOBILE_API.h" -namespace application_manager { +namespace sdl_rpc_plugin { +using namespace application_manager; namespace commands { OnNaviTBTClientStateNotification::OnNaviTBTClientStateNotification( - const MessageSharedPtr& message, ApplicationManager& application_manager) + const application_manager::commands::MessageSharedPtr& message, + ApplicationManager& application_manager) : NotificationFromHMI(message, application_manager) {} OnNaviTBTClientStateNotification::~OnNaviTBTClientStateNotification() {} diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/on_navi_way_point_change_notification.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/on_navi_way_point_change_notification.cc index 42a76ff153..2416b492d6 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/on_navi_way_point_change_notification.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/on_navi_way_point_change_notification.cc @@ -32,12 +32,14 @@ #include "sdl_rpc_plugin/commands/hmi/on_navi_way_point_change_notification.h" -namespace application_manager { +namespace sdl_rpc_plugin { +using namespace application_manager; namespace commands { OnNaviWayPointChangeNotification::OnNaviWayPointChangeNotification( - const MessageSharedPtr& message, ApplicationManager& app_man) + const application_manager::commands::MessageSharedPtr& message, + ApplicationManager& app_man) : NotificationFromHMI(message, app_man) {} OnNaviWayPointChangeNotification::~OnNaviWayPointChangeNotification() {} diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/on_policy_update.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/on_policy_update.cc index f865653ca3..134f94c641 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/on_policy_update.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/on_policy_update.cc @@ -33,11 +33,13 @@ #include "sdl_rpc_plugin/commands/hmi/on_policy_update.h" #include "application_manager/application_manager.h" -namespace application_manager { +namespace sdl_rpc_plugin { +using namespace application_manager; namespace commands { -OnPolicyUpdate::OnPolicyUpdate(const MessageSharedPtr& message, - ApplicationManager& application_manager) +OnPolicyUpdate::OnPolicyUpdate( + const application_manager::commands::MessageSharedPtr& message, + ApplicationManager& application_manager) : NotificationFromHMI(message, application_manager) {} OnPolicyUpdate::~OnPolicyUpdate() {} diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/on_put_file_notification.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/on_put_file_notification.cc index a9ce3e0344..a9384e05af 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/on_put_file_notification.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/on_put_file_notification.cc @@ -33,12 +33,14 @@ #include "sdl_rpc_plugin/commands/hmi/on_put_file_notification.h" #include "interfaces/MOBILE_API.h" -namespace application_manager { +namespace sdl_rpc_plugin { +using namespace application_manager; namespace commands { OnPutFileNotification::OnPutFileNotification( - const MessageSharedPtr& message, ApplicationManager& application_manager) + const application_manager::commands::MessageSharedPtr& message, + ApplicationManager& application_manager) : NotificationToHMI(message, application_manager) {} OnPutFileNotification::~OnPutFileNotification() {} diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/on_ready_notification.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/on_ready_notification.cc index fdb9e7aa8f..abc6f627b5 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/on_ready_notification.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/on_ready_notification.cc @@ -32,12 +32,14 @@ #include "sdl_rpc_plugin/commands/hmi/on_ready_notification.h" -namespace application_manager { +namespace sdl_rpc_plugin { +using namespace application_manager; namespace commands { OnReadyNotification::OnReadyNotification( - const MessageSharedPtr& message, ApplicationManager& application_manager) + const application_manager::commands::MessageSharedPtr& message, + ApplicationManager& application_manager) : NotificationFromHMI(message, application_manager) {} OnReadyNotification::~OnReadyNotification() {} diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/on_received_policy_update.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/on_received_policy_update.cc index 2802499cf9..19c1c27161 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/on_received_policy_update.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/on_received_policy_update.cc @@ -35,12 +35,14 @@ #include "application_manager/application_manager.h" #include "utils/file_system.h" -namespace application_manager { +namespace sdl_rpc_plugin { +using namespace application_manager; namespace commands { OnReceivedPolicyUpdate::OnReceivedPolicyUpdate( - const MessageSharedPtr& message, ApplicationManager& application_manager) + const application_manager::commands::MessageSharedPtr& message, + ApplicationManager& application_manager) : NotificationFromHMI(message, application_manager) {} OnReceivedPolicyUpdate::~OnReceivedPolicyUpdate() {} diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/on_record_start_notification.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/on_record_start_notification.cc index 012fe3c382..d170d3553f 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/on_record_start_notification.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/on_record_start_notification.cc @@ -32,12 +32,14 @@ #include "sdl_rpc_plugin/commands/hmi/on_record_start_notification.h" -namespace application_manager { +namespace sdl_rpc_plugin { +using namespace application_manager; namespace commands { OnRecordStartdNotification::OnRecordStartdNotification( - const MessageSharedPtr& message, ApplicationManager& application_manager) + const application_manager::commands::MessageSharedPtr& message, + ApplicationManager& application_manager) : NotificationToHMI(message, application_manager) {} OnRecordStartdNotification::~OnRecordStartdNotification() {} diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/on_resume_audio_source_notification.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/on_resume_audio_source_notification.cc index 16f55d0a4f..ee2031c467 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/on_resume_audio_source_notification.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/on_resume_audio_source_notification.cc @@ -33,12 +33,14 @@ #include "sdl_rpc_plugin/commands/hmi/on_resume_audio_source_notification.h" #include "interfaces/MOBILE_API.h" -namespace application_manager { +namespace sdl_rpc_plugin { +using namespace application_manager; namespace commands { OnResumeAudioSourceNotification::OnResumeAudioSourceNotification( - const MessageSharedPtr& message, ApplicationManager& application_manager) + const application_manager::commands::MessageSharedPtr& message, + ApplicationManager& application_manager) : NotificationToHMI(message, application_manager) {} OnResumeAudioSourceNotification::~OnResumeAudioSourceNotification() {} diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/on_sdl_close_notification.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/on_sdl_close_notification.cc index f86c6829d7..487d8a8fc6 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/on_sdl_close_notification.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/on_sdl_close_notification.cc @@ -32,12 +32,14 @@ #include "sdl_rpc_plugin/commands/hmi/on_sdl_close_notification.h" -namespace application_manager { +namespace sdl_rpc_plugin { +using namespace application_manager; namespace commands { OnSDLCloseNotification::OnSDLCloseNotification( - const MessageSharedPtr& message, ApplicationManager& application_manager) + const application_manager::commands::MessageSharedPtr& message, + ApplicationManager& application_manager) : NotificationToHMI(message, application_manager) {} OnSDLCloseNotification::~OnSDLCloseNotification() {} diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/on_sdl_consent_needed_notification.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/on_sdl_consent_needed_notification.cc index 5bd9214396..0d88e69c0a 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/on_sdl_consent_needed_notification.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/on_sdl_consent_needed_notification.cc @@ -33,12 +33,14 @@ #include "sdl_rpc_plugin/commands/hmi/on_sdl_consent_needed_notification.h" -namespace application_manager { +namespace sdl_rpc_plugin { +using namespace application_manager; namespace commands { OnSDLConsentNeededNotification::OnSDLConsentNeededNotification( - const MessageSharedPtr& message, ApplicationManager& application_manager) + const application_manager::commands::MessageSharedPtr& message, + ApplicationManager& application_manager) : NotificationToHMI(message, application_manager) {} OnSDLConsentNeededNotification::~OnSDLConsentNeededNotification() {} diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/on_sdl_persistence_complete_notification.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/on_sdl_persistence_complete_notification.cc index b94f4b97ec..24618651ed 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/on_sdl_persistence_complete_notification.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/on_sdl_persistence_complete_notification.cc @@ -32,12 +32,14 @@ #include "sdl_rpc_plugin/commands/hmi/on_sdl_persistence_complete_notification.h" -namespace application_manager { +namespace sdl_rpc_plugin { +using namespace application_manager; namespace commands { OnSDLPersistenceCompleteNotification::OnSDLPersistenceCompleteNotification( - const MessageSharedPtr& message, ApplicationManager& application_manager) + const application_manager::commands::MessageSharedPtr& message, + ApplicationManager& application_manager) : NotificationToHMI(message, application_manager) {} OnSDLPersistenceCompleteNotification::~OnSDLPersistenceCompleteNotification() {} diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/on_start_device_discovery.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/on_start_device_discovery.cc index 642e29e959..ed2a944dc4 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/on_start_device_discovery.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/on_start_device_discovery.cc @@ -32,12 +32,14 @@ #include "sdl_rpc_plugin/commands/hmi/on_start_device_discovery.h" -namespace application_manager { +namespace sdl_rpc_plugin { +using namespace application_manager; namespace commands { OnStartDeviceDiscovery::OnStartDeviceDiscovery( - const MessageSharedPtr& message, ApplicationManager& application_manager) + const application_manager::commands::MessageSharedPtr& message, + ApplicationManager& application_manager) : NotificationFromHMI(message, application_manager) {} OnStartDeviceDiscovery::~OnStartDeviceDiscovery() {} diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/on_status_update_notification.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/on_status_update_notification.cc index 9b44d480a0..5742ae6a69 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/on_status_update_notification.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/on_status_update_notification.cc @@ -32,12 +32,14 @@ #include "sdl_rpc_plugin/commands/hmi/on_status_update_notification.h" -namespace application_manager { +namespace sdl_rpc_plugin { +using namespace application_manager; namespace commands { OnStatusUpdateNotification::OnStatusUpdateNotification( - const MessageSharedPtr& message, ApplicationManager& application_manager) + const application_manager::commands::MessageSharedPtr& message, + ApplicationManager& application_manager) : NotificationToHMI(message, application_manager) {} OnStatusUpdateNotification::~OnStatusUpdateNotification() {} diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/on_system_context_notification.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/on_system_context_notification.cc index 2c86931878..29ef9904df 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/on_system_context_notification.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/on_system_context_notification.cc @@ -36,11 +36,13 @@ #include "application_manager/state_controller.h" #include "application_manager/message_helper.h" -namespace application_manager { +namespace sdl_rpc_plugin { +using namespace application_manager; namespace commands { OnSystemContextNotification::OnSystemContextNotification( - const MessageSharedPtr& message, ApplicationManager& application_manager) + const application_manager::commands::MessageSharedPtr& message, + ApplicationManager& application_manager) : NotificationFromHMI(message, application_manager) {} OnSystemContextNotification::~OnSystemContextNotification() {} diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/on_system_error_notification.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/on_system_error_notification.cc index 48bf18da90..857df0b6de 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/on_system_error_notification.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/on_system_error_notification.cc @@ -34,12 +34,14 @@ #include "application_manager/application_manager.h" #include "interfaces/HMI_API.h" -namespace application_manager { +namespace sdl_rpc_plugin { +using namespace application_manager; namespace commands { OnSystemErrorNotification::OnSystemErrorNotification( - const MessageSharedPtr& message, ApplicationManager& application_manager) + const application_manager::commands::MessageSharedPtr& message, + ApplicationManager& application_manager) : NotificationFromHMI(message, application_manager) {} OnSystemErrorNotification::~OnSystemErrorNotification() {} diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/on_system_info_changed_notification.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/on_system_info_changed_notification.cc index 15997a21fb..1bd014b26f 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/on_system_info_changed_notification.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/on_system_info_changed_notification.cc @@ -34,12 +34,14 @@ #include "application_manager/application_manager.h" #include "application_manager/message_helper.h" -namespace application_manager { +namespace sdl_rpc_plugin { +using namespace application_manager; namespace commands { OnSystemInfoChangedNotification::OnSystemInfoChangedNotification( - const MessageSharedPtr& message, ApplicationManager& application_manager) + const application_manager::commands::MessageSharedPtr& message, + ApplicationManager& application_manager) : NotificationFromHMI(message, application_manager) {} OnSystemInfoChangedNotification::~OnSystemInfoChangedNotification() {} diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/on_system_request_notification.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/on_system_request_notification.cc index 9492bc8299..65d208a24f 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/on_system_request_notification.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/on_system_request_notification.cc @@ -39,12 +39,14 @@ using policy::PolicyHandlerInterface; -namespace application_manager { +namespace sdl_rpc_plugin { +using namespace application_manager; namespace commands { OnSystemRequestNotification::OnSystemRequestNotification( - const MessageSharedPtr& message, ApplicationManager& application_manager) + const application_manager::commands::MessageSharedPtr& message, + ApplicationManager& application_manager) : NotificationFromHMI(message, application_manager) {} OnSystemRequestNotification::~OnSystemRequestNotification() {} diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/on_tts_language_change_notification.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/on_tts_language_change_notification.cc index b053ca987c..975d8b2f03 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/on_tts_language_change_notification.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/on_tts_language_change_notification.cc @@ -37,12 +37,14 @@ #include "application_manager/rpc_service.h" #include "interfaces/MOBILE_API.h" -namespace application_manager { +namespace sdl_rpc_plugin { +using namespace application_manager; namespace commands { OnTTSLanguageChangeNotification::OnTTSLanguageChangeNotification( - const MessageSharedPtr& message, ApplicationManager& application_manager) + const application_manager::commands::MessageSharedPtr& message, + ApplicationManager& application_manager) : NotificationFromHMI(message, application_manager) {} OnTTSLanguageChangeNotification::~OnTTSLanguageChangeNotification() {} @@ -82,7 +84,7 @@ void OnTTSLanguageChangeNotification::Run() { MessageHelper::GetOnAppInterfaceUnregisteredNotificationToMobile( app->app_id(), mobile_api::AppInterfaceUnregisteredReason::LANGUAGE_CHANGE), - commands::Command::SOURCE_SDL); + SOURCE_SDL); application_manager_.UnregisterApplication( app->app_id(), mobile_apis::Result::SUCCESS, false); } diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/on_tts_reset_timeout_notification.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/on_tts_reset_timeout_notification.cc index ed5522a92a..0457bbe1a0 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/on_tts_reset_timeout_notification.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/on_tts_reset_timeout_notification.cc @@ -2,14 +2,16 @@ #include "application_manager/event_engine/event.h" #include "interfaces/HMI_API.h" -namespace application_manager { +namespace sdl_rpc_plugin { +using namespace application_manager; namespace commands { namespace hmi { OnTTSResetTimeoutNotification::OnTTSResetTimeoutNotification( - const MessageSharedPtr& message, ApplicationManager& application_manager) + const application_manager::commands::MessageSharedPtr& message, + ApplicationManager& application_manager) : NotificationFromHMI(message, application_manager) {} OnTTSResetTimeoutNotification::~OnTTSResetTimeoutNotification() {} diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/on_tts_started_notification.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/on_tts_started_notification.cc index 9f9d4bc1f3..79207ad7ce 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/on_tts_started_notification.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/on_tts_started_notification.cc @@ -32,12 +32,14 @@ #include "sdl_rpc_plugin/commands/hmi/on_tts_started_notification.h" -namespace application_manager { +namespace sdl_rpc_plugin { +using namespace application_manager; namespace commands { OnTTSStartedNotification::OnTTSStartedNotification( - const MessageSharedPtr& message, ApplicationManager& application_manager) + const application_manager::commands::MessageSharedPtr& message, + ApplicationManager& application_manager) : NotificationFromHMI(message, application_manager) {} OnTTSStartedNotification::~OnTTSStartedNotification() {} diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/on_tts_stopped_notification.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/on_tts_stopped_notification.cc index c3ae14fd96..0d1a8c2470 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/on_tts_stopped_notification.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/on_tts_stopped_notification.cc @@ -34,12 +34,14 @@ #include "application_manager/event_engine/event.h" -namespace application_manager { +namespace sdl_rpc_plugin { +using namespace application_manager; namespace commands { OnTTSStoppedNotification::OnTTSStoppedNotification( - const MessageSharedPtr& message, ApplicationManager& application_manager) + const application_manager::commands::MessageSharedPtr& message, + ApplicationManager& application_manager) : NotificationFromHMI(message, application_manager) {} OnTTSStoppedNotification::~OnTTSStoppedNotification() {} diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/on_ui_command_notification.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/on_ui_command_notification.cc index 91ebc144af..85449cebd7 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/on_ui_command_notification.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/on_ui_command_notification.cc @@ -33,12 +33,14 @@ #include "sdl_rpc_plugin/commands/hmi/on_ui_command_notification.h" #include "interfaces/MOBILE_API.h" -namespace application_manager { +namespace sdl_rpc_plugin { +using namespace application_manager; namespace commands { OnUICommandNotification::OnUICommandNotification( - const MessageSharedPtr& message, ApplicationManager& application_manager) + const application_manager::commands::MessageSharedPtr& message, + ApplicationManager& application_manager) : NotificationFromHMI(message, application_manager) {} OnUICommandNotification::~OnUICommandNotification() {} diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/on_ui_keyboard_input_notification.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/on_ui_keyboard_input_notification.cc index 58e78a41dc..05e15ba7ba 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/on_ui_keyboard_input_notification.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/on_ui_keyboard_input_notification.cc @@ -33,14 +33,16 @@ #include "sdl_rpc_plugin/commands/hmi/on_ui_keyboard_input_notification.h" #include "interfaces/MOBILE_API.h" -namespace application_manager { +namespace sdl_rpc_plugin { +using namespace application_manager; namespace commands { namespace hmi { OnUIKeyBoardInputNotification::OnUIKeyBoardInputNotification( - const MessageSharedPtr& message, ApplicationManager& application_manager) + const application_manager::commands::MessageSharedPtr& message, + ApplicationManager& application_manager) : NotificationFromHMI(message, application_manager) {} OnUIKeyBoardInputNotification::~OnUIKeyBoardInputNotification() {} diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/on_ui_language_change_notification.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/on_ui_language_change_notification.cc index 9180be158e..322601e7ce 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/on_ui_language_change_notification.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/on_ui_language_change_notification.cc @@ -37,12 +37,14 @@ #include "application_manager/rpc_service.h" #include "interfaces/MOBILE_API.h" -namespace application_manager { +namespace sdl_rpc_plugin { +using namespace application_manager; namespace commands { OnUILanguageChangeNotification::OnUILanguageChangeNotification( - const MessageSharedPtr& message, ApplicationManager& application_manager) + const application_manager::commands::MessageSharedPtr& message, + ApplicationManager& application_manager) : NotificationFromHMI(message, application_manager) {} OnUILanguageChangeNotification::~OnUILanguageChangeNotification() {} @@ -81,7 +83,7 @@ void OnUILanguageChangeNotification::Run() { MessageHelper::GetOnAppInterfaceUnregisteredNotificationToMobile( app->app_id(), mobile_api::AppInterfaceUnregisteredReason::LANGUAGE_CHANGE), - commands::Command::SOURCE_SDL); + SOURCE_SDL); application_manager_.UnregisterApplication( app->app_id(), mobile_apis::Result::SUCCESS, false); } diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/on_ui_reset_timeout_notification.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/on_ui_reset_timeout_notification.cc index e75660206f..1bb5a8cf20 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/on_ui_reset_timeout_notification.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/on_ui_reset_timeout_notification.cc @@ -34,14 +34,16 @@ #include "application_manager/event_engine/event.h" #include "interfaces/HMI_API.h" -namespace application_manager { +namespace sdl_rpc_plugin { +using namespace application_manager; namespace commands { namespace hmi { OnUIResetTimeoutNotification::OnUIResetTimeoutNotification( - const MessageSharedPtr& message, ApplicationManager& application_manager) + const application_manager::commands::MessageSharedPtr& message, + ApplicationManager& application_manager) : NotificationFromHMI(message, application_manager) {} OnUIResetTimeoutNotification::~OnUIResetTimeoutNotification() {} diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/on_ui_touch_event_notification.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/on_ui_touch_event_notification.cc index 9894cf110f..ca9cab3c0d 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/on_ui_touch_event_notification.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/on_ui_touch_event_notification.cc @@ -33,14 +33,16 @@ #include "sdl_rpc_plugin/commands/hmi/on_ui_touch_event_notification.h" #include "interfaces/MOBILE_API.h" -namespace application_manager { +namespace sdl_rpc_plugin { +using namespace application_manager; namespace commands { namespace hmi { OnUITouchEventNotification::OnUITouchEventNotification( - const MessageSharedPtr& message, ApplicationManager& application_manager) + const application_manager::commands::MessageSharedPtr& message, + ApplicationManager& application_manager) : NotificationFromHMI(message, application_manager) {} OnUITouchEventNotification::~OnUITouchEventNotification() {} diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/on_update_device_list.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/on_update_device_list.cc index 7b49e82906..2c08cbae94 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/on_update_device_list.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/on_update_device_list.cc @@ -31,12 +31,14 @@ */ #include "sdl_rpc_plugin/commands/hmi/on_update_device_list.h" -namespace application_manager { +namespace sdl_rpc_plugin { +using namespace application_manager; namespace commands { -OnUpdateDeviceList::OnUpdateDeviceList(const MessageSharedPtr& message, - ApplicationManager& application_manager) +OnUpdateDeviceList::OnUpdateDeviceList( + const application_manager::commands::MessageSharedPtr& message, + ApplicationManager& application_manager) : NotificationFromHMI(message, application_manager) {} OnUpdateDeviceList::~OnUpdateDeviceList() {} diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/on_vi_acc_pedal_position_notification.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/on_vi_acc_pedal_position_notification.cc index dcd7aa99ce..2050384e53 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/on_vi_acc_pedal_position_notification.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/on_vi_acc_pedal_position_notification.cc @@ -33,12 +33,14 @@ #include "sdl_rpc_plugin/commands/hmi/on_vi_acc_pedal_position_notification.h" #include "interfaces/MOBILE_API.h" -namespace application_manager { +namespace sdl_rpc_plugin { +using namespace application_manager; namespace commands { OnVIAccPedalPositionNotification::OnVIAccPedalPositionNotification( - const MessageSharedPtr& message, ApplicationManager& application_manager) + const application_manager::commands::MessageSharedPtr& message, + ApplicationManager& application_manager) : NotificationFromHMI(message, application_manager) {} OnVIAccPedalPositionNotification::~OnVIAccPedalPositionNotification() {} diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/on_vi_belt_status_notification.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/on_vi_belt_status_notification.cc index c37aa616a0..794a9dffe5 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/on_vi_belt_status_notification.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/on_vi_belt_status_notification.cc @@ -33,12 +33,14 @@ #include "sdl_rpc_plugin/commands/hmi/on_vi_belt_status_notification.h" #include "interfaces/MOBILE_API.h" -namespace application_manager { +namespace sdl_rpc_plugin { +using namespace application_manager; namespace commands { OnVIBeltStatusNotification::OnVIBeltStatusNotification( - const MessageSharedPtr& message, ApplicationManager& application_manager) + const application_manager::commands::MessageSharedPtr& message, + ApplicationManager& application_manager) : NotificationFromHMI(message, application_manager) {} OnVIBeltStatusNotification::~OnVIBeltStatusNotification() {} diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/on_vi_body_information_notification.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/on_vi_body_information_notification.cc index d61002e808..2e8ad0fd0c 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/on_vi_body_information_notification.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/on_vi_body_information_notification.cc @@ -33,12 +33,14 @@ #include "sdl_rpc_plugin/commands/hmi/on_vi_body_information_notification.h" #include "interfaces/MOBILE_API.h" -namespace application_manager { +namespace sdl_rpc_plugin { +using namespace application_manager; namespace commands { OnVIBodyInformationNotification::OnVIBodyInformationNotification( - const MessageSharedPtr& message, ApplicationManager& application_manager) + const application_manager::commands::MessageSharedPtr& message, + ApplicationManager& application_manager) : NotificationFromHMI(message, application_manager) {} OnVIBodyInformationNotification::~OnVIBodyInformationNotification() {} diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/on_vi_device_status_notification.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/on_vi_device_status_notification.cc index 4a84f648f6..32f3a5437f 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/on_vi_device_status_notification.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/on_vi_device_status_notification.cc @@ -33,12 +33,14 @@ #include "sdl_rpc_plugin/commands/hmi/on_vi_device_status_notification.h" #include "interfaces/MOBILE_API.h" -namespace application_manager { +namespace sdl_rpc_plugin { +using namespace application_manager; namespace commands { OnVIDeviceStatusNotification::OnVIDeviceStatusNotification( - const MessageSharedPtr& message, ApplicationManager& application_manager) + const application_manager::commands::MessageSharedPtr& message, + ApplicationManager& application_manager) : NotificationFromHMI(message, application_manager) {} OnVIDeviceStatusNotification::~OnVIDeviceStatusNotification() {} diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/on_vi_driver_braking_notification.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/on_vi_driver_braking_notification.cc index d1b6f24806..6ef2385b09 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/on_vi_driver_braking_notification.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/on_vi_driver_braking_notification.cc @@ -33,12 +33,14 @@ #include "sdl_rpc_plugin/commands/hmi/on_vi_driver_braking_notification.h" #include "interfaces/MOBILE_API.h" -namespace application_manager { +namespace sdl_rpc_plugin { +using namespace application_manager; namespace commands { OnVIDriverBrakingNotification::OnVIDriverBrakingNotification( - const MessageSharedPtr& message, ApplicationManager& application_manager) + const application_manager::commands::MessageSharedPtr& message, + ApplicationManager& application_manager) : NotificationFromHMI(message, application_manager) {} OnVIDriverBrakingNotification::~OnVIDriverBrakingNotification() {} diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/on_vi_engine_torque_notification.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/on_vi_engine_torque_notification.cc index 2d0d54c971..5b0fa5fef6 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/on_vi_engine_torque_notification.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/on_vi_engine_torque_notification.cc @@ -33,12 +33,14 @@ #include "sdl_rpc_plugin/commands/hmi/on_vi_engine_torque_notification.h" #include "interfaces/MOBILE_API.h" -namespace application_manager { +namespace sdl_rpc_plugin { +using namespace application_manager; namespace commands { OnVIEngineTorqueNotification::OnVIEngineTorqueNotification( - const MessageSharedPtr& message, ApplicationManager& application_manager) + const application_manager::commands::MessageSharedPtr& message, + ApplicationManager& application_manager) : NotificationFromHMI(message, application_manager) {} OnVIEngineTorqueNotification::~OnVIEngineTorqueNotification() {} diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/on_vi_external_temperature_notification.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/on_vi_external_temperature_notification.cc index 13d228c495..a57ef6afb4 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/on_vi_external_temperature_notification.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/on_vi_external_temperature_notification.cc @@ -33,12 +33,14 @@ #include "sdl_rpc_plugin/commands/hmi/on_vi_external_temperature_notification.h" #include "interfaces/MOBILE_API.h" -namespace application_manager { +namespace sdl_rpc_plugin { +using namespace application_manager; namespace commands { OnVIExternalTemperatureNotification::OnVIExternalTemperatureNotification( - const MessageSharedPtr& message, ApplicationManager& application_manager) + const application_manager::commands::MessageSharedPtr& message, + ApplicationManager& application_manager) : NotificationFromHMI(message, application_manager) {} OnVIExternalTemperatureNotification::~OnVIExternalTemperatureNotification() {} diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/on_vi_fuel_level_notification.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/on_vi_fuel_level_notification.cc index 5f79b61261..b8829a6983 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/on_vi_fuel_level_notification.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/on_vi_fuel_level_notification.cc @@ -33,12 +33,14 @@ #include "sdl_rpc_plugin/commands/hmi/on_vi_fuel_level_notification.h" #include "interfaces/MOBILE_API.h" -namespace application_manager { +namespace sdl_rpc_plugin { +using namespace application_manager; namespace commands { OnVIFuelLevelNotification::OnVIFuelLevelNotification( - const MessageSharedPtr& message, ApplicationManager& application_manager) + const application_manager::commands::MessageSharedPtr& message, + ApplicationManager& application_manager) : NotificationFromHMI(message, application_manager) {} OnVIFuelLevelNotification::~OnVIFuelLevelNotification() {} diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/on_vi_fuel_level_state_notification.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/on_vi_fuel_level_state_notification.cc index 057524e176..e932eb8f53 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/on_vi_fuel_level_state_notification.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/on_vi_fuel_level_state_notification.cc @@ -33,12 +33,14 @@ #include "sdl_rpc_plugin/commands/hmi/on_vi_fuel_level_state_notification.h" #include "interfaces/MOBILE_API.h" -namespace application_manager { +namespace sdl_rpc_plugin { +using namespace application_manager; namespace commands { OnVIFuelLevelStateNotification::OnVIFuelLevelStateNotification( - const MessageSharedPtr& message, ApplicationManager& application_manager) + const application_manager::commands::MessageSharedPtr& message, + ApplicationManager& application_manager) : NotificationFromHMI(message, application_manager) {} OnVIFuelLevelStateNotification::~OnVIFuelLevelStateNotification() {} diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/on_vi_gps_data_notification.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/on_vi_gps_data_notification.cc index d393380cae..79e6f61773 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/on_vi_gps_data_notification.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/on_vi_gps_data_notification.cc @@ -33,12 +33,14 @@ #include "sdl_rpc_plugin/commands/hmi/on_vi_gps_data_notification.h" #include "interfaces/MOBILE_API.h" -namespace application_manager { +namespace sdl_rpc_plugin { +using namespace application_manager; namespace commands { OnVIGpsDataNotification::OnVIGpsDataNotification( - const MessageSharedPtr& message, ApplicationManager& application_manager) + const application_manager::commands::MessageSharedPtr& message, + ApplicationManager& application_manager) : NotificationFromHMI(message, application_manager) {} OnVIGpsDataNotification::~OnVIGpsDataNotification() {} diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/on_vi_head_lamp_status_notification.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/on_vi_head_lamp_status_notification.cc index 2bdf887b55..e7222080e1 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/on_vi_head_lamp_status_notification.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/on_vi_head_lamp_status_notification.cc @@ -33,12 +33,14 @@ #include "sdl_rpc_plugin/commands/hmi/on_vi_head_lamp_status_notification.h" #include "interfaces/MOBILE_API.h" -namespace application_manager { +namespace sdl_rpc_plugin { +using namespace application_manager; namespace commands { OnVIHeadLampStatusNotification::OnVIHeadLampStatusNotification( - const MessageSharedPtr& message, ApplicationManager& application_manager) + const application_manager::commands::MessageSharedPtr& message, + ApplicationManager& application_manager) : NotificationFromHMI(message, application_manager) {} OnVIHeadLampStatusNotification::~OnVIHeadLampStatusNotification() {} diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/on_vi_instant_fuel_consumption_notification.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/on_vi_instant_fuel_consumption_notification.cc index c266201b8c..21c327ef62 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/on_vi_instant_fuel_consumption_notification.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/on_vi_instant_fuel_consumption_notification.cc @@ -33,12 +33,14 @@ #include "sdl_rpc_plugin/commands/hmi/on_vi_instant_fuel_consumption_notification.h" #include "interfaces/MOBILE_API.h" -namespace application_manager { +namespace sdl_rpc_plugin { +using namespace application_manager; namespace commands { OnVIInstantFuelConsumptionNotification::OnVIInstantFuelConsumptionNotification( - const MessageSharedPtr& message, ApplicationManager& application_manager) + const application_manager::commands::MessageSharedPtr& message, + ApplicationManager& application_manager) : NotificationFromHMI(message, application_manager) {} OnVIInstantFuelConsumptionNotification:: diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/on_vi_my_key_notification.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/on_vi_my_key_notification.cc index 0c5136f7dd..8253216056 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/on_vi_my_key_notification.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/on_vi_my_key_notification.cc @@ -33,12 +33,14 @@ #include "sdl_rpc_plugin/commands/hmi/on_vi_my_key_notification.h" #include "interfaces/MOBILE_API.h" -namespace application_manager { +namespace sdl_rpc_plugin { +using namespace application_manager; namespace commands { OnVIMyKeyNotification::OnVIMyKeyNotification( - const MessageSharedPtr& message, ApplicationManager& application_manager) + const application_manager::commands::MessageSharedPtr& message, + ApplicationManager& application_manager) : NotificationFromHMI(message, application_manager) {} OnVIMyKeyNotification::~OnVIMyKeyNotification() {} diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/on_vi_odometer_notification.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/on_vi_odometer_notification.cc index a670061680..11de1ee053 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/on_vi_odometer_notification.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/on_vi_odometer_notification.cc @@ -33,12 +33,14 @@ #include "sdl_rpc_plugin/commands/hmi/on_vi_odometer_notification.h" #include "interfaces/MOBILE_API.h" -namespace application_manager { +namespace sdl_rpc_plugin { +using namespace application_manager; namespace commands { OnVIOdometerNotification::OnVIOdometerNotification( - const MessageSharedPtr& message, ApplicationManager& application_manager) + const application_manager::commands::MessageSharedPtr& message, + ApplicationManager& application_manager) : NotificationFromHMI(message, application_manager) {} OnVIOdometerNotification::~OnVIOdometerNotification() {} diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/on_vi_prndl_notification.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/on_vi_prndl_notification.cc index 441447e725..0c57cceeb5 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/on_vi_prndl_notification.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/on_vi_prndl_notification.cc @@ -33,12 +33,14 @@ #include "sdl_rpc_plugin/commands/hmi/on_vi_prndl_notification.h" #include "interfaces/MOBILE_API.h" -namespace application_manager { +namespace sdl_rpc_plugin { +using namespace application_manager; namespace commands { OnVIPrndlNotification::OnVIPrndlNotification( - const MessageSharedPtr& message, ApplicationManager& application_manager) + const application_manager::commands::MessageSharedPtr& message, + ApplicationManager& application_manager) : NotificationFromHMI(message, application_manager) {} OnVIPrndlNotification::~OnVIPrndlNotification() {} diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/on_vi_rpm_notification.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/on_vi_rpm_notification.cc index 7a971113f7..f198877279 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/on_vi_rpm_notification.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/on_vi_rpm_notification.cc @@ -33,12 +33,14 @@ #include "sdl_rpc_plugin/commands/hmi/on_vi_rpm_notification.h" #include "interfaces/MOBILE_API.h" -namespace application_manager { +namespace sdl_rpc_plugin { +using namespace application_manager; namespace commands { OnVIRpmNotification::OnVIRpmNotification( - const MessageSharedPtr& message, ApplicationManager& application_manager) + const application_manager::commands::MessageSharedPtr& message, + ApplicationManager& application_manager) : NotificationFromHMI(message, application_manager) {} OnVIRpmNotification::~OnVIRpmNotification() {} diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/on_vi_speed_notification.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/on_vi_speed_notification.cc index a5abd73b7e..bfa13c4d95 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/on_vi_speed_notification.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/on_vi_speed_notification.cc @@ -33,12 +33,14 @@ #include "sdl_rpc_plugin/commands/hmi/on_vi_speed_notification.h" #include "interfaces/MOBILE_API.h" -namespace application_manager { +namespace sdl_rpc_plugin { +using namespace application_manager; namespace commands { OnVISpeedNotification::OnVISpeedNotification( - const MessageSharedPtr& message, ApplicationManager& application_manager) + const application_manager::commands::MessageSharedPtr& message, + ApplicationManager& application_manager) : NotificationFromHMI(message, application_manager) {} OnVISpeedNotification::~OnVISpeedNotification() {} diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/on_vi_steering_wheel_angle_notification.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/on_vi_steering_wheel_angle_notification.cc index 932d1d6e40..82770593f7 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/on_vi_steering_wheel_angle_notification.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/on_vi_steering_wheel_angle_notification.cc @@ -33,12 +33,14 @@ #include "sdl_rpc_plugin/commands/hmi/on_vi_steering_wheel_angle_notification.h" #include "interfaces/MOBILE_API.h" -namespace application_manager { +namespace sdl_rpc_plugin { +using namespace application_manager; namespace commands { OnVISteeringWheelAngleNotification::OnVISteeringWheelAngleNotification( - const MessageSharedPtr& message, ApplicationManager& application_manager) + const application_manager::commands::MessageSharedPtr& message, + ApplicationManager& application_manager) : NotificationFromHMI(message, application_manager) {} OnVISteeringWheelAngleNotification::~OnVISteeringWheelAngleNotification() {} diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/on_vi_tire_pressure_notification.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/on_vi_tire_pressure_notification.cc index 485cd157ea..7ff35bd370 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/on_vi_tire_pressure_notification.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/on_vi_tire_pressure_notification.cc @@ -33,12 +33,14 @@ #include "sdl_rpc_plugin/commands/hmi/on_vi_tire_pressure_notification.h" #include "interfaces/MOBILE_API.h" -namespace application_manager { +namespace sdl_rpc_plugin { +using namespace application_manager; namespace commands { OnVITirePressureNotification::OnVITirePressureNotification( - const MessageSharedPtr& message, ApplicationManager& application_manager) + const application_manager::commands::MessageSharedPtr& message, + ApplicationManager& application_manager) : NotificationFromHMI(message, application_manager) {} OnVITirePressureNotification::~OnVITirePressureNotification() {} diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/on_vi_vehicle_data_notification.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/on_vi_vehicle_data_notification.cc index 033f40bd6a..7477f2fd1f 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/on_vi_vehicle_data_notification.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/on_vi_vehicle_data_notification.cc @@ -33,12 +33,14 @@ #include "sdl_rpc_plugin/commands/hmi/on_vi_vehicle_data_notification.h" #include "interfaces/MOBILE_API.h" -namespace application_manager { +namespace sdl_rpc_plugin { +using namespace application_manager; namespace commands { OnVIVehicleDataNotification::OnVIVehicleDataNotification( - const MessageSharedPtr& message, ApplicationManager& application_manager) + const application_manager::commands::MessageSharedPtr& message, + ApplicationManager& application_manager) : NotificationFromHMI(message, application_manager) {} OnVIVehicleDataNotification::~OnVIVehicleDataNotification() {} diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/on_vi_vin_notification.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/on_vi_vin_notification.cc index 4f683bba04..a16d0250a8 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/on_vi_vin_notification.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/on_vi_vin_notification.cc @@ -33,12 +33,14 @@ #include "sdl_rpc_plugin/commands/hmi/on_vi_vin_notification.h" #include "interfaces/MOBILE_API.h" -namespace application_manager { +namespace sdl_rpc_plugin { +using namespace application_manager; namespace commands { OnVIVinNotification::OnVIVinNotification( - const MessageSharedPtr& message, ApplicationManager& application_manager) + const application_manager::commands::MessageSharedPtr& message, + ApplicationManager& application_manager) : NotificationFromHMI(message, application_manager) {} OnVIVinNotification::~OnVIVinNotification() {} diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/on_vi_wiper_status_notification.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/on_vi_wiper_status_notification.cc index 82fda0a90c..e39dddf0d0 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/on_vi_wiper_status_notification.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/on_vi_wiper_status_notification.cc @@ -33,12 +33,14 @@ #include "sdl_rpc_plugin/commands/hmi/on_vi_wiper_status_notification.h" #include "interfaces/MOBILE_API.h" -namespace application_manager { +namespace sdl_rpc_plugin { +using namespace application_manager; namespace commands { OnVIWiperStatusNotification::OnVIWiperStatusNotification( - const MessageSharedPtr& message, ApplicationManager& application_manager) + const application_manager::commands::MessageSharedPtr& message, + ApplicationManager& application_manager) : NotificationFromHMI(message, application_manager) {} OnVIWiperStatusNotification::~OnVIWiperStatusNotification() {} diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/on_video_data_streaming_notification.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/on_video_data_streaming_notification.cc index 0c61c45b55..1033bd3853 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/on_video_data_streaming_notification.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/on_video_data_streaming_notification.cc @@ -33,12 +33,14 @@ #include "sdl_rpc_plugin/commands/hmi/on_video_data_streaming_notification.h" -namespace application_manager { +namespace sdl_rpc_plugin { +using namespace application_manager; namespace commands { OnVideoDataStreamingNotification::OnVideoDataStreamingNotification( - const MessageSharedPtr& message, ApplicationManager& application_manager) + const application_manager::commands::MessageSharedPtr& message, + ApplicationManager& application_manager) : NotificationToHMI(message, application_manager) {} OnVideoDataStreamingNotification::~OnVideoDataStreamingNotification() {} diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/on_vr_command_notification.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/on_vr_command_notification.cc index 6f6da58399..80edee5052 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/on_vr_command_notification.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/on_vr_command_notification.cc @@ -40,12 +40,14 @@ #include "interfaces/HMI_API.h" #include "application_manager/event_engine/event.h" -namespace application_manager { +namespace sdl_rpc_plugin { +using namespace application_manager; namespace commands { OnVRCommandNotification::OnVRCommandNotification( - const MessageSharedPtr& message, ApplicationManager& application_manager) + const application_manager::commands::MessageSharedPtr& message, + ApplicationManager& application_manager) : NotificationFromHMI(message, application_manager) {} OnVRCommandNotification::~OnVRCommandNotification() {} diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/on_vr_language_change_notification.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/on_vr_language_change_notification.cc index 0e78ab733d..1fd2310b66 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/on_vr_language_change_notification.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/on_vr_language_change_notification.cc @@ -38,12 +38,14 @@ #include "application_manager/rpc_service.h" #include "interfaces/MOBILE_API.h" -namespace application_manager { +namespace sdl_rpc_plugin { +using namespace application_manager; namespace commands { OnVRLanguageChangeNotification::OnVRLanguageChangeNotification( - const MessageSharedPtr& message, ApplicationManager& application_manager) + const application_manager::commands::MessageSharedPtr& message, + ApplicationManager& application_manager) : NotificationFromHMI(message, application_manager) {} OnVRLanguageChangeNotification::~OnVRLanguageChangeNotification() {} @@ -80,7 +82,7 @@ void OnVRLanguageChangeNotification::Run() { MessageHelper::GetOnAppInterfaceUnregisteredNotificationToMobile( app->app_id(), mobile_api::AppInterfaceUnregisteredReason::LANGUAGE_CHANGE), - commands::Command::SOURCE_SDL); + SOURCE_SDL); application_manager_.UnregisterApplication( app->app_id(), mobile_apis::Result::SUCCESS, false); } diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/on_vr_started_notification.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/on_vr_started_notification.cc index f05554a4cd..d48ce75095 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/on_vr_started_notification.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/on_vr_started_notification.cc @@ -32,12 +32,14 @@ #include "sdl_rpc_plugin/commands/hmi/on_vr_started_notification.h" -namespace application_manager { +namespace sdl_rpc_plugin { +using namespace application_manager; namespace commands { OnVRStartedNotification::OnVRStartedNotification( - const MessageSharedPtr& message, ApplicationManager& application_manager) + const application_manager::commands::MessageSharedPtr& message, + ApplicationManager& application_manager) : NotificationFromHMI(message, application_manager) {} OnVRStartedNotification::~OnVRStartedNotification() {} diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/on_vr_stopped_notification.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/on_vr_stopped_notification.cc index eb2e558b01..9ffbf1c0ec 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/on_vr_stopped_notification.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/on_vr_stopped_notification.cc @@ -32,12 +32,14 @@ #include "sdl_rpc_plugin/commands/hmi/on_vr_stopped_notification.h" -namespace application_manager { +namespace sdl_rpc_plugin { +using namespace application_manager; namespace commands { OnVRStoppedNotification::OnVRStoppedNotification( - const MessageSharedPtr& message, ApplicationManager& application_manager) + const application_manager::commands::MessageSharedPtr& message, + ApplicationManager& application_manager) : NotificationFromHMI(message, application_manager) {} OnVRStoppedNotification::~OnVRStoppedNotification() {} diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/rc_get_capabilities_request.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/rc_get_capabilities_request.cc index 4914294e60..432b46a430 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/rc_get_capabilities_request.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/rc_get_capabilities_request.cc @@ -32,12 +32,14 @@ #include "sdl_rpc_plugin/commands/hmi/rc_get_capabilities_request.h" -namespace application_manager { +namespace sdl_rpc_plugin { +using namespace application_manager; namespace commands { RCGetCapabilitiesRequest::RCGetCapabilitiesRequest( - const MessageSharedPtr& message, ApplicationManager& application_manager) + const application_manager::commands::MessageSharedPtr& message, + ApplicationManager& application_manager) : RequestToHMI(message, application_manager) {} RCGetCapabilitiesRequest::~RCGetCapabilitiesRequest() {} diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/rc_get_capabilities_response.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/rc_get_capabilities_response.cc index 4164181aa7..953ab41f92 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/rc_get_capabilities_response.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/rc_get_capabilities_response.cc @@ -31,12 +31,14 @@ */ #include "sdl_rpc_plugin/commands/hmi/rc_get_capabilities_response.h" -namespace application_manager { +namespace sdl_rpc_plugin { +using namespace application_manager; namespace commands { RCGetCapabilitiesResponse::RCGetCapabilitiesResponse( - const MessageSharedPtr& message, ApplicationManager& application_manager) + const application_manager::commands::MessageSharedPtr& message, + ApplicationManager& application_manager) : ResponseFromHMI(message, application_manager) {} RCGetCapabilitiesResponse::~RCGetCapabilitiesResponse() {} diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/rc_is_ready_request.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/rc_is_ready_request.cc index c2245d3517..c1aa47f554 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/rc_is_ready_request.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/rc_is_ready_request.cc @@ -33,12 +33,14 @@ #include "sdl_rpc_plugin/commands/hmi/rc_is_ready_request.h" #include "application_manager/rpc_service.h" -namespace application_manager { +namespace sdl_rpc_plugin { +using namespace application_manager; namespace commands { -RCIsReadyRequest::RCIsReadyRequest(const MessageSharedPtr& message, - ApplicationManager& application_manager) +RCIsReadyRequest::RCIsReadyRequest( + const application_manager::commands::MessageSharedPtr& message, + ApplicationManager& application_manager) : RequestToHMI(message, application_manager) , EventObserver(application_manager.event_dispatcher()) {} @@ -57,7 +59,7 @@ void RCIsReadyRequest::on_event(const event_engine::Event& event) { case hmi_apis::FunctionID::RC_IsReady: { LOG4CXX_DEBUG(logger_, "Received RC_IsReady event"); unsubscribe_from_event(hmi_apis::FunctionID::RC_IsReady); - const bool is_available = ChangeInterfaceState( + const bool is_available = app_mngr::commands::ChangeInterfaceState( application_manager_, message, HmiInterfaces::HMI_INTERFACE_RC); HMICapabilities& hmi_capabilities = @@ -67,8 +69,8 @@ void RCIsReadyRequest::on_event(const event_engine::Event& event) { hmi_capabilities.set_rc_supported(false); } - if (!CheckAvailabilityHMIInterfaces(application_manager_, - HmiInterfaces::HMI_INTERFACE_RC)) { + if (!app_mngr::commands::CheckAvailabilityHMIInterfaces( + application_manager_, HmiInterfaces::HMI_INTERFACE_RC)) { LOG4CXX_INFO(logger_, "HmiInterfaces::HMI_INTERFACE_RC isn't available"); return; diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/rc_is_ready_response.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/rc_is_ready_response.cc index bd7dc62481..27eee2b446 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/rc_is_ready_response.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/rc_is_ready_response.cc @@ -31,12 +31,14 @@ */ #include "sdl_rpc_plugin/commands/hmi/rc_is_ready_response.h" -namespace application_manager { +namespace sdl_rpc_plugin { +using namespace application_manager; namespace commands { -RCIsReadyResponse::RCIsReadyResponse(const MessageSharedPtr& message, - ApplicationManager& application_manager) +RCIsReadyResponse::RCIsReadyResponse( + const application_manager::commands::MessageSharedPtr& message, + ApplicationManager& application_manager) : ResponseFromHMI(message, application_manager) {} RCIsReadyResponse::~RCIsReadyResponse() {} diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/response_from_hmi.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/response_from_hmi.cc index 7e7cb557dc..1405e8124c 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/response_from_hmi.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/response_from_hmi.cc @@ -30,16 +30,18 @@ POSSIBILITY OF SUCH DAMAGE. */ -#include "sdl_rpc_plugin/commands/hmi/response_from_hmi.h" +#include "application_manager/commands/response_from_hmi.h" #include "application_manager/rpc_service.h" #include "smart_objects/smart_object.h" -namespace application_manager { +namespace sdl_rpc_plugin { +using namespace application_manager; namespace commands { -ResponseFromHMI::ResponseFromHMI(const MessageSharedPtr& message, - ApplicationManager& application_manager) +ResponseFromHMI::ResponseFromHMI( + const application_manager::commands::MessageSharedPtr& message, + ApplicationManager& application_manager) : CommandImpl(message, application_manager) { // If it is error response, shift info if ((*message)[strings::params].keyExists(hmi_response::message)) { @@ -64,7 +66,8 @@ bool ResponseFromHMI::CleanUp() { void ResponseFromHMI::Run() {} void ResponseFromHMI::SendResponseToMobile( - const MessageSharedPtr& message, ApplicationManager& application_manager) { + const application_manager::commands::MessageSharedPtr& message, + ApplicationManager& application_manager) { (*message)[strings::params][strings::message_type] = MessageType::kResponse; application_manager_.GetRPCService().ManageMobileCommand(message, SOURCE_SDL); diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/response_to_hmi.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/response_to_hmi.cc index 149a82e971..87abafbdb5 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/response_to_hmi.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/response_to_hmi.cc @@ -30,16 +30,18 @@ POSSIBILITY OF SUCH DAMAGE. */ -#include "sdl_rpc_plugin/commands/hmi/response_to_hmi.h" +#include "application_manager/commands/response_to_hmi.h" #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 { -ResponseToHMI::ResponseToHMI(const MessageSharedPtr& message, - ApplicationManager& application_manager) +ResponseToHMI::ResponseToHMI( + const application_manager::commands::MessageSharedPtr& message, + ApplicationManager& application_manager) : CommandImpl(message, application_manager) {} ResponseToHMI::~ResponseToHMI() {} diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/sdl_activate_app_request.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/sdl_activate_app_request.cc index 36fddf2bf5..272587d2b7 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/sdl_activate_app_request.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/sdl_activate_app_request.cc @@ -34,7 +34,8 @@ #include "application_manager/state_controller.h" #include "application_manager/message_helper.h" -namespace application_manager { +namespace sdl_rpc_plugin { +using namespace application_manager; namespace commands { @@ -82,7 +83,8 @@ struct SendLaunchApp } SDLActivateAppRequest::SDLActivateAppRequest( - const MessageSharedPtr& message, ApplicationManager& application_manager) + const application_manager::commands::MessageSharedPtr& message, + ApplicationManager& application_manager) : RequestFromHMI(message, application_manager) {} SDLActivateAppRequest::~SDLActivateAppRequest() {} diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/sdl_activate_app_response.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/sdl_activate_app_response.cc index 2521dcc8e4..fb7cd2626e 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/sdl_activate_app_response.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/sdl_activate_app_response.cc @@ -33,12 +33,14 @@ #include "sdl_rpc_plugin/commands/hmi/sdl_activate_app_response.h" #include "application_manager/rpc_service.h" -namespace application_manager { +namespace sdl_rpc_plugin { +using namespace application_manager; namespace commands { SDLActivateAppResponse::SDLActivateAppResponse( - const MessageSharedPtr& message, ApplicationManager& application_manager) + const application_manager::commands::MessageSharedPtr& message, + ApplicationManager& application_manager) : ResponseToHMI(message, application_manager) {} SDLActivateAppResponse::~SDLActivateAppResponse() {} diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/sdl_get_list_of_permissions_request.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/sdl_get_list_of_permissions_request.cc index 2af0f4f38e..08115ee85b 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/sdl_get_list_of_permissions_request.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/sdl_get_list_of_permissions_request.cc @@ -33,12 +33,14 @@ #include "sdl_rpc_plugin/commands/hmi/sdl_get_list_of_permissions_request.h" #include "application_manager/application_manager.h" -namespace application_manager { +namespace sdl_rpc_plugin { +using namespace application_manager; namespace commands { SDLGetListOfPermissionsRequest::SDLGetListOfPermissionsRequest( - const MessageSharedPtr& message, ApplicationManager& application_manager) + const application_manager::commands::MessageSharedPtr& message, + ApplicationManager& application_manager) : RequestFromHMI(message, application_manager) {} SDLGetListOfPermissionsRequest::~SDLGetListOfPermissionsRequest() {} diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/sdl_get_list_of_permissions_response.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/sdl_get_list_of_permissions_response.cc index 9e4be91d9e..4c8e3898f6 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/sdl_get_list_of_permissions_response.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/sdl_get_list_of_permissions_response.cc @@ -33,12 +33,14 @@ #include "sdl_rpc_plugin/commands/hmi/sdl_get_list_of_permissions_response.h" #include "application_manager/rpc_service.h" -namespace application_manager { +namespace sdl_rpc_plugin { +using namespace application_manager; namespace commands { SDLGetListOfPermissionsResponse::SDLGetListOfPermissionsResponse( - const MessageSharedPtr& message, ApplicationManager& application_manager) + const application_manager::commands::MessageSharedPtr& message, + ApplicationManager& application_manager) : ResponseToHMI(message, application_manager) {} SDLGetListOfPermissionsResponse::~SDLGetListOfPermissionsResponse() {} diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/sdl_get_status_update_request.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/sdl_get_status_update_request.cc index 6c7cd1e7a5..e492d1c9f8 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/sdl_get_status_update_request.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/sdl_get_status_update_request.cc @@ -33,12 +33,14 @@ #include "sdl_rpc_plugin/commands/hmi/sdl_get_status_update_request.h" #include "application_manager/application_manager.h" -namespace application_manager { +namespace sdl_rpc_plugin { +using namespace application_manager; namespace commands { SDLGetStatusUpdateRequest::SDLGetStatusUpdateRequest( - const MessageSharedPtr& message, ApplicationManager& application_manager) + const application_manager::commands::MessageSharedPtr& message, + ApplicationManager& application_manager) : RequestFromHMI(message, application_manager) {} SDLGetStatusUpdateRequest::~SDLGetStatusUpdateRequest() {} diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/sdl_get_status_update_response.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/sdl_get_status_update_response.cc index 85ac3de729..434fd436ed 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/sdl_get_status_update_response.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/sdl_get_status_update_response.cc @@ -33,12 +33,14 @@ #include "sdl_rpc_plugin/commands/hmi/sdl_get_status_update_response.h" #include "application_manager/rpc_service.h" -namespace application_manager { +namespace sdl_rpc_plugin { +using namespace application_manager; namespace commands { SDLGetStatusUpdateResponse::SDLGetStatusUpdateResponse( - const MessageSharedPtr& message, ApplicationManager& application_manager) + const application_manager::commands::MessageSharedPtr& message, + ApplicationManager& application_manager) : ResponseToHMI(message, application_manager) {} SDLGetStatusUpdateResponse::~SDLGetStatusUpdateResponse() {} diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/sdl_get_user_friendly_message_request.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/sdl_get_user_friendly_message_request.cc index bc944faaa9..d55ea5aef2 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/sdl_get_user_friendly_message_request.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/sdl_get_user_friendly_message_request.cc @@ -33,12 +33,14 @@ #include "sdl_rpc_plugin/commands/hmi/sdl_get_user_friendly_message_request.h" #include "application_manager/message_helper.h" -namespace application_manager { +namespace sdl_rpc_plugin { +using namespace application_manager; namespace commands { SDLGetUserFriendlyMessageRequest::SDLGetUserFriendlyMessageRequest( - const MessageSharedPtr& message, ApplicationManager& application_manager) + const application_manager::commands::MessageSharedPtr& message, + ApplicationManager& application_manager) : RequestFromHMI(message, application_manager) {} SDLGetUserFriendlyMessageRequest::~SDLGetUserFriendlyMessageRequest() {} diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/sdl_get_user_friendly_message_response.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/sdl_get_user_friendly_message_response.cc index e8736f6260..ec9a1e8506 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/sdl_get_user_friendly_message_response.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/sdl_get_user_friendly_message_response.cc @@ -33,12 +33,14 @@ #include "sdl_rpc_plugin/commands/hmi/sdl_get_user_friendly_message_response.h" #include "application_manager/rpc_service.h" -namespace application_manager { +namespace sdl_rpc_plugin { +using namespace application_manager; namespace commands { SDLGetUserFriendlyMessageResponse::SDLGetUserFriendlyMessageResponse( - const MessageSharedPtr& message, ApplicationManager& application_manager) + const application_manager::commands::MessageSharedPtr& message, + ApplicationManager& application_manager) : ResponseToHMI(message, application_manager) {} SDLGetUserFriendlyMessageResponse::~SDLGetUserFriendlyMessageResponse() {} diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/sdl_policy_update.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/sdl_policy_update.cc index e06dad82b7..f437ac3429 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/sdl_policy_update.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/sdl_policy_update.cc @@ -32,12 +32,14 @@ #include "sdl_rpc_plugin/commands/hmi/sdl_policy_update.h" -namespace application_manager { +namespace sdl_rpc_plugin { +using namespace application_manager; namespace commands { -SDLPolicyUpdate::SDLPolicyUpdate(const MessageSharedPtr& message, - ApplicationManager& application_manager) +SDLPolicyUpdate::SDLPolicyUpdate( + const application_manager::commands::MessageSharedPtr& message, + ApplicationManager& application_manager) : RequestToHMI(message, application_manager) {} SDLPolicyUpdate::~SDLPolicyUpdate() {} diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/sdl_policy_update_response.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/sdl_policy_update_response.cc index e305b01053..c43cdc64a1 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/sdl_policy_update_response.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/sdl_policy_update_response.cc @@ -32,11 +32,13 @@ #include "sdl_rpc_plugin/commands/hmi/sdl_policy_update_response.h" -namespace application_manager { +namespace sdl_rpc_plugin { +using namespace application_manager; namespace commands { SDLPolicyUpdateResponse::SDLPolicyUpdateResponse( - const MessageSharedPtr& message, ApplicationManager& application_manager) + const application_manager::commands::MessageSharedPtr& message, + ApplicationManager& application_manager) : ResponseFromHMI(message, application_manager) {} SDLPolicyUpdateResponse::~SDLPolicyUpdateResponse() {} diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/tts_change_registration_request.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/tts_change_registration_request.cc index 3195a60393..dc650e26c6 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/tts_change_registration_request.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/tts_change_registration_request.cc @@ -32,12 +32,14 @@ #include "sdl_rpc_plugin/commands/hmi/tts_change_registration_request.h" -namespace application_manager { +namespace sdl_rpc_plugin { +using namespace application_manager; namespace commands { TTSChangeRegistrationRequest::TTSChangeRegistrationRequest( - const MessageSharedPtr& message, ApplicationManager& application_manager) + const application_manager::commands::MessageSharedPtr& message, + ApplicationManager& application_manager) : RequestToHMI(message, application_manager) {} TTSChangeRegistrationRequest::~TTSChangeRegistrationRequest() {} diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/tts_change_registration_response.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/tts_change_registration_response.cc index 3b8e921b25..51a05e8a62 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/tts_change_registration_response.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/tts_change_registration_response.cc @@ -34,12 +34,14 @@ #include "interfaces/HMI_API.h" -namespace application_manager { +namespace sdl_rpc_plugin { +using namespace application_manager; namespace commands { TTSChangeRegistratioResponse::TTSChangeRegistratioResponse( - const MessageSharedPtr& message, ApplicationManager& application_manager) + const application_manager::commands::MessageSharedPtr& message, + ApplicationManager& application_manager) : ResponseFromHMI(message, application_manager) {} TTSChangeRegistratioResponse::~TTSChangeRegistratioResponse() {} diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/tts_get_capabilities_request.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/tts_get_capabilities_request.cc index e70909a2a6..3d8eb68e97 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/tts_get_capabilities_request.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/tts_get_capabilities_request.cc @@ -32,12 +32,14 @@ #include "sdl_rpc_plugin/commands/hmi/tts_get_capabilities_request.h" -namespace application_manager { +namespace sdl_rpc_plugin { +using namespace application_manager; namespace commands { TTSGetCapabilitiesRequest::TTSGetCapabilitiesRequest( - const MessageSharedPtr& message, ApplicationManager& application_manager) + const application_manager::commands::MessageSharedPtr& message, + ApplicationManager& application_manager) : RequestToHMI(message, application_manager) {} TTSGetCapabilitiesRequest::~TTSGetCapabilitiesRequest() {} diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/tts_get_capabilities_response.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/tts_get_capabilities_response.cc index 8bbd18701d..1b1810302a 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/tts_get_capabilities_response.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/tts_get_capabilities_response.cc @@ -31,12 +31,14 @@ */ #include "sdl_rpc_plugin/commands/hmi/tts_get_capabilities_response.h" -namespace application_manager { +namespace sdl_rpc_plugin { +using namespace application_manager; namespace commands { TTSGetCapabilitiesResponse::TTSGetCapabilitiesResponse( - const MessageSharedPtr& message, ApplicationManager& application_manager) + const application_manager::commands::MessageSharedPtr& message, + ApplicationManager& application_manager) : ResponseFromHMI(message, application_manager) {} TTSGetCapabilitiesResponse::~TTSGetCapabilitiesResponse() {} diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/tts_get_language_request.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/tts_get_language_request.cc index bd1bfe3345..fe10976155 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/tts_get_language_request.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/tts_get_language_request.cc @@ -32,12 +32,14 @@ #include "sdl_rpc_plugin/commands/hmi/tts_get_language_request.h" -namespace application_manager { +namespace sdl_rpc_plugin { +using namespace application_manager; namespace commands { TTSGetLanguageRequest::TTSGetLanguageRequest( - const MessageSharedPtr& message, ApplicationManager& application_manager) + const application_manager::commands::MessageSharedPtr& message, + ApplicationManager& application_manager) : RequestToHMI(message, application_manager) {} TTSGetLanguageRequest::~TTSGetLanguageRequest() {} diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/tts_get_language_response.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/tts_get_language_response.cc index f2b381fdb5..802e28be97 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/tts_get_language_response.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/tts_get_language_response.cc @@ -33,12 +33,14 @@ #include "application_manager/event_engine/event.h" -namespace application_manager { +namespace sdl_rpc_plugin { +using namespace application_manager; namespace commands { TTSGetLanguageResponse::TTSGetLanguageResponse( - const MessageSharedPtr& message, ApplicationManager& application_manager) + const application_manager::commands::MessageSharedPtr& message, + ApplicationManager& application_manager) : ResponseFromHMI(message, application_manager) {} TTSGetLanguageResponse::~TTSGetLanguageResponse() {} diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/tts_get_supported_languages_request.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/tts_get_supported_languages_request.cc index 5fa7e42fbe..e9638caf6d 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/tts_get_supported_languages_request.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/tts_get_supported_languages_request.cc @@ -32,12 +32,14 @@ #include "sdl_rpc_plugin/commands/hmi/tts_get_supported_languages_request.h" -namespace application_manager { +namespace sdl_rpc_plugin { +using namespace application_manager; namespace commands { TTSGetSupportedLanguagesRequest::TTSGetSupportedLanguagesRequest( - const MessageSharedPtr& message, ApplicationManager& application_manager) + const application_manager::commands::MessageSharedPtr& message, + ApplicationManager& application_manager) : RequestToHMI(message, application_manager) {} TTSGetSupportedLanguagesRequest::~TTSGetSupportedLanguagesRequest() {} diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/tts_get_supported_languages_response.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/tts_get_supported_languages_response.cc index 36bb8c4669..9768340ee6 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/tts_get_supported_languages_response.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/tts_get_supported_languages_response.cc @@ -33,12 +33,14 @@ #include "interfaces/HMI_API.h" -namespace application_manager { +namespace sdl_rpc_plugin { +using namespace application_manager; namespace commands { TTSGetSupportedLanguagesResponse::TTSGetSupportedLanguagesResponse( - const MessageSharedPtr& message, ApplicationManager& application_manager) + const application_manager::commands::MessageSharedPtr& message, + ApplicationManager& application_manager) : ResponseFromHMI(message, application_manager) {} TTSGetSupportedLanguagesResponse::~TTSGetSupportedLanguagesResponse() {} diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/tts_is_ready_request.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/tts_is_ready_request.cc index a409615bdb..dd87ba7c76 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/tts_is_ready_request.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/tts_is_ready_request.cc @@ -34,12 +34,14 @@ #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 { -TTSIsReadyRequest::TTSIsReadyRequest(const MessageSharedPtr& message, - ApplicationManager& application_manager) +TTSIsReadyRequest::TTSIsReadyRequest( + const app_mngr::commands::MessageSharedPtr& message, + ApplicationManager& application_manager) : RequestToHMI(message, application_manager) , EventObserver(application_manager.event_dispatcher()) {} @@ -59,13 +61,13 @@ void TTSIsReadyRequest::on_event(const event_engine::Event& event) { case hmi_apis::FunctionID::TTS_IsReady: { LOG4CXX_DEBUG(logger_, "Received TTS_IsReady event"); unsubscribe_from_event(hmi_apis::FunctionID::TTS_IsReady); - const bool is_available = ChangeInterfaceState( + const bool is_available = app_mngr::commands::ChangeInterfaceState( application_manager_, message, HmiInterfaces::HMI_INTERFACE_TTS); HMICapabilities& hmi_capabilities = application_manager_.hmi_capabilities(); hmi_capabilities.set_is_tts_cooperating(is_available); - if (!CheckAvailabilityHMIInterfaces(application_manager_, - HmiInterfaces::HMI_INTERFACE_TTS)) { + if (!app_mngr::commands::CheckAvailabilityHMIInterfaces( + application_manager_, HmiInterfaces::HMI_INTERFACE_TTS)) { LOG4CXX_INFO(logger_, "HmiInterfaces::HMI_INTERFACE_TTS isn't available"); return; diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/tts_is_ready_response.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/tts_is_ready_response.cc index e103a0911b..4cabdcd442 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/tts_is_ready_response.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/tts_is_ready_response.cc @@ -31,12 +31,14 @@ */ #include "sdl_rpc_plugin/commands/hmi/tts_is_ready_response.h" -namespace application_manager { +namespace sdl_rpc_plugin { +using namespace application_manager; namespace commands { -TTSIsReadyResponse::TTSIsReadyResponse(const MessageSharedPtr& message, - ApplicationManager& application_manager) +TTSIsReadyResponse::TTSIsReadyResponse( + const application_manager::commands::MessageSharedPtr& message, + ApplicationManager& application_manager) : ResponseFromHMI(message, application_manager) {} TTSIsReadyResponse::~TTSIsReadyResponse() {} diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/tts_set_global_properties_request.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/tts_set_global_properties_request.cc index 237b7385a6..f5b83a7537 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/tts_set_global_properties_request.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/tts_set_global_properties_request.cc @@ -32,12 +32,14 @@ #include "sdl_rpc_plugin/commands/hmi/tts_set_global_properties_request.h" -namespace application_manager { +namespace sdl_rpc_plugin { +using namespace application_manager; namespace commands { TTSSetGlobalPropertiesRequest::TTSSetGlobalPropertiesRequest( - const MessageSharedPtr& message, ApplicationManager& application_manager) + const application_manager::commands::MessageSharedPtr& message, + ApplicationManager& application_manager) : RequestToHMI(message, application_manager) {} TTSSetGlobalPropertiesRequest::~TTSSetGlobalPropertiesRequest() {} diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/tts_set_global_properties_response.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/tts_set_global_properties_response.cc index 1e21d0741d..6e140a563e 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/tts_set_global_properties_response.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/tts_set_global_properties_response.cc @@ -34,12 +34,14 @@ #include "interfaces/HMI_API.h" -namespace application_manager { +namespace sdl_rpc_plugin { +using namespace application_manager; namespace commands { TTSSetGlobalPropertiesResponse::TTSSetGlobalPropertiesResponse( - const MessageSharedPtr& message, ApplicationManager& application_manager) + const application_manager::commands::MessageSharedPtr& message, + ApplicationManager& application_manager) : ResponseFromHMI(message, application_manager) {} TTSSetGlobalPropertiesResponse::~TTSSetGlobalPropertiesResponse() {} diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/tts_speak_request.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/tts_speak_request.cc index a561608a9a..9d572a3fab 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/tts_speak_request.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/tts_speak_request.cc @@ -32,12 +32,14 @@ #include "sdl_rpc_plugin/commands/hmi/tts_speak_request.h" -namespace application_manager { +namespace sdl_rpc_plugin { +using namespace application_manager; namespace commands { -TTSSpeakRequest::TTSSpeakRequest(const MessageSharedPtr& message, - ApplicationManager& application_manager) +TTSSpeakRequest::TTSSpeakRequest( + const application_manager::commands::MessageSharedPtr& message, + ApplicationManager& application_manager) : RequestToHMI(message, application_manager) {} TTSSpeakRequest::~TTSSpeakRequest() {} diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/tts_speak_response.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/tts_speak_response.cc index 26e1d44ad1..9bdd1d39c5 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/tts_speak_response.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/tts_speak_response.cc @@ -35,12 +35,14 @@ #include "interfaces/MOBILE_API.h" #include "interfaces/HMI_API.h" -namespace application_manager { +namespace sdl_rpc_plugin { +using namespace application_manager; namespace commands { -TTSSpeakResponse::TTSSpeakResponse(const MessageSharedPtr& message, - ApplicationManager& application_manager) +TTSSpeakResponse::TTSSpeakResponse( + const application_manager::commands::MessageSharedPtr& message, + ApplicationManager& application_manager) : ResponseFromHMI(message, application_manager) {} TTSSpeakResponse::~TTSSpeakResponse() {} diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/tts_stop_speaking_request.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/tts_stop_speaking_request.cc index 107daf6f32..86f5787dab 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/tts_stop_speaking_request.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/tts_stop_speaking_request.cc @@ -32,12 +32,14 @@ #include "sdl_rpc_plugin/commands/hmi/tts_stop_speaking_request.h" -namespace application_manager { +namespace sdl_rpc_plugin { +using namespace application_manager; namespace commands { TTSStopSpeakingRequest::TTSStopSpeakingRequest( - const MessageSharedPtr& message, ApplicationManager& application_manager) + const application_manager::commands::MessageSharedPtr& message, + ApplicationManager& application_manager) : RequestToHMI(message, application_manager) {} TTSStopSpeakingRequest::~TTSStopSpeakingRequest() {} diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/tts_stop_speaking_response.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/tts_stop_speaking_response.cc index e6ea6647fa..d69d627c07 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/tts_stop_speaking_response.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/tts_stop_speaking_response.cc @@ -33,12 +33,14 @@ #include "application_manager/event_engine/event.h" -namespace application_manager { +namespace sdl_rpc_plugin { +using namespace application_manager; namespace commands { TTSStopSpeakingResponse::TTSStopSpeakingResponse( - const MessageSharedPtr& message, ApplicationManager& application_manager) + const application_manager::commands::MessageSharedPtr& message, + ApplicationManager& application_manager) : ResponseFromHMI(message, application_manager) {} TTSStopSpeakingResponse::~TTSStopSpeakingResponse() {} diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/ui_add_command_request.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/ui_add_command_request.cc index cd18849619..a0439c3b7f 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/ui_add_command_request.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/ui_add_command_request.cc @@ -32,12 +32,14 @@ #include "sdl_rpc_plugin/commands/hmi/ui_add_command_request.h" -namespace application_manager { +namespace sdl_rpc_plugin { +using namespace application_manager; namespace commands { UIAddCommandRequest::UIAddCommandRequest( - const MessageSharedPtr& message, ApplicationManager& application_manager) + const application_manager::commands::MessageSharedPtr& message, + ApplicationManager& application_manager) : RequestToHMI(message, application_manager) {} UIAddCommandRequest::~UIAddCommandRequest() {} diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/ui_add_command_response.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/ui_add_command_response.cc index 6b74f2b895..5099d553ef 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/ui_add_command_response.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/ui_add_command_response.cc @@ -33,12 +33,14 @@ #include "application_manager/event_engine/event.h" #include "interfaces/HMI_API.h" -namespace application_manager { +namespace sdl_rpc_plugin { +using namespace application_manager; namespace commands { UIAddCommandResponse::UIAddCommandResponse( - const MessageSharedPtr& message, ApplicationManager& application_manager) + const application_manager::commands::MessageSharedPtr& message, + ApplicationManager& application_manager) : ResponseFromHMI(message, application_manager) {} UIAddCommandResponse::~UIAddCommandResponse() {} diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/ui_add_submenu_request.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/ui_add_submenu_request.cc index 7490dc08fd..f14640b18c 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/ui_add_submenu_request.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/ui_add_submenu_request.cc @@ -32,12 +32,14 @@ #include "sdl_rpc_plugin/commands/hmi/ui_add_submenu_request.h" -namespace application_manager { +namespace sdl_rpc_plugin { +using namespace application_manager; namespace commands { UIAddSubmenuRequest::UIAddSubmenuRequest( - const MessageSharedPtr& message, ApplicationManager& application_manager) + const application_manager::commands::MessageSharedPtr& message, + ApplicationManager& application_manager) : RequestToHMI(message, application_manager) {} UIAddSubmenuRequest::~UIAddSubmenuRequest() {} diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/ui_add_submenu_response.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/ui_add_submenu_response.cc index c57ac3c870..39432cc0ed 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/ui_add_submenu_response.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/ui_add_submenu_response.cc @@ -34,12 +34,14 @@ #include "interfaces/HMI_API.h" -namespace application_manager { +namespace sdl_rpc_plugin { +using namespace application_manager; namespace commands { UIAddSubmenuResponse::UIAddSubmenuResponse( - const MessageSharedPtr& message, ApplicationManager& application_manager) + const application_manager::commands::MessageSharedPtr& message, + ApplicationManager& application_manager) : ResponseFromHMI(message, application_manager) {} UIAddSubmenuResponse::~UIAddSubmenuResponse() {} diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/ui_alert_request.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/ui_alert_request.cc index 4fc3138a1f..361a87514f 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/ui_alert_request.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/ui_alert_request.cc @@ -32,12 +32,14 @@ #include "sdl_rpc_plugin/commands/hmi/ui_alert_request.h" -namespace application_manager { +namespace sdl_rpc_plugin { +using namespace application_manager; namespace commands { -UIAlertRequest::UIAlertRequest(const MessageSharedPtr& message, - ApplicationManager& application_manager) +UIAlertRequest::UIAlertRequest( + const application_manager::commands::MessageSharedPtr& message, + ApplicationManager& application_manager) : RequestToHMI(message, application_manager) {} UIAlertRequest::~UIAlertRequest() {} diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/ui_alert_response.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/ui_alert_response.cc index f36d3e105a..4218e5b147 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/ui_alert_response.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/ui_alert_response.cc @@ -34,12 +34,14 @@ #include "interfaces/HMI_API.h" -namespace application_manager { +namespace sdl_rpc_plugin { +using namespace application_manager; namespace commands { -UIAlertResponse::UIAlertResponse(const MessageSharedPtr& message, - ApplicationManager& application_manager) +UIAlertResponse::UIAlertResponse( + const application_manager::commands::MessageSharedPtr& message, + ApplicationManager& application_manager) : ResponseFromHMI(message, application_manager) {} UIAlertResponse::~UIAlertResponse() {} diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/ui_change_registration_request.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/ui_change_registration_request.cc index 57ab6c52eb..c082f2bb8f 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/ui_change_registration_request.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/ui_change_registration_request.cc @@ -32,12 +32,14 @@ #include "sdl_rpc_plugin/commands/hmi/ui_change_registration_request.h" -namespace application_manager { +namespace sdl_rpc_plugin { +using namespace application_manager; namespace commands { UIChangeRegistrationRequest::UIChangeRegistrationRequest( - const MessageSharedPtr& message, ApplicationManager& application_manager) + const application_manager::commands::MessageSharedPtr& message, + ApplicationManager& application_manager) : RequestToHMI(message, application_manager) {} UIChangeRegistrationRequest::~UIChangeRegistrationRequest() {} diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/ui_change_registration_response.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/ui_change_registration_response.cc index 4cf839d4a2..1a9cee6a34 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/ui_change_registration_response.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/ui_change_registration_response.cc @@ -34,12 +34,14 @@ #include "interfaces/HMI_API.h" -namespace application_manager { +namespace sdl_rpc_plugin { +using namespace application_manager; namespace commands { UIChangeRegistratioResponse::UIChangeRegistratioResponse( - const MessageSharedPtr& message, ApplicationManager& application_manager) + const application_manager::commands::MessageSharedPtr& message, + ApplicationManager& application_manager) : ResponseFromHMI(message, application_manager) {} UIChangeRegistratioResponse::~UIChangeRegistratioResponse() {} diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/ui_delete_command_request.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/ui_delete_command_request.cc index 815332ec8c..4bd8616762 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/ui_delete_command_request.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/ui_delete_command_request.cc @@ -32,12 +32,14 @@ #include "sdl_rpc_plugin/commands/hmi/ui_delete_command_request.h" -namespace application_manager { +namespace sdl_rpc_plugin { +using namespace application_manager; namespace commands { UIDeleteCommandRequest::UIDeleteCommandRequest( - const MessageSharedPtr& message, ApplicationManager& application_manager) + const application_manager::commands::MessageSharedPtr& message, + ApplicationManager& application_manager) : RequestToHMI(message, application_manager) {} UIDeleteCommandRequest::~UIDeleteCommandRequest() {} diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/ui_delete_command_response.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/ui_delete_command_response.cc index c34dd7b3e1..ea1a37e8b2 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/ui_delete_command_response.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/ui_delete_command_response.cc @@ -34,12 +34,14 @@ #include "interfaces/HMI_API.h" -namespace application_manager { +namespace sdl_rpc_plugin { +using namespace application_manager; namespace commands { UIDeleteCommandResponse::UIDeleteCommandResponse( - const MessageSharedPtr& message, ApplicationManager& application_manager) + const application_manager::commands::MessageSharedPtr& message, + ApplicationManager& application_manager) : ResponseFromHMI(message, application_manager) {} UIDeleteCommandResponse::~UIDeleteCommandResponse() {} diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/ui_delete_submenu_request.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/ui_delete_submenu_request.cc index 5f9915f171..35500c1e35 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/ui_delete_submenu_request.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/ui_delete_submenu_request.cc @@ -32,12 +32,14 @@ #include "sdl_rpc_plugin/commands/hmi/ui_delete_submenu_request.h" -namespace application_manager { +namespace sdl_rpc_plugin { +using namespace application_manager; namespace commands { UIDeleteSubmenuRequest::UIDeleteSubmenuRequest( - const MessageSharedPtr& message, ApplicationManager& application_manager) + const application_manager::commands::MessageSharedPtr& message, + ApplicationManager& application_manager) : RequestToHMI(message, application_manager) {} UIDeleteSubmenuRequest::~UIDeleteSubmenuRequest() {} diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/ui_delete_submenu_response.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/ui_delete_submenu_response.cc index f243b1b3c1..b6ba8523fd 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/ui_delete_submenu_response.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/ui_delete_submenu_response.cc @@ -34,12 +34,14 @@ #include "interfaces/HMI_API.h" -namespace application_manager { +namespace sdl_rpc_plugin { +using namespace application_manager; namespace commands { UIDeleteSubmenuResponse::UIDeleteSubmenuResponse( - const MessageSharedPtr& message, ApplicationManager& application_manager) + const application_manager::commands::MessageSharedPtr& message, + ApplicationManager& application_manager) : ResponseFromHMI(message, application_manager) {} UIDeleteSubmenuResponse::~UIDeleteSubmenuResponse() {} diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/ui_end_audio_pass_thru_request.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/ui_end_audio_pass_thru_request.cc index d68146a5ae..f12db15937 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/ui_end_audio_pass_thru_request.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/ui_end_audio_pass_thru_request.cc @@ -32,12 +32,14 @@ #include "sdl_rpc_plugin/commands/hmi/ui_end_audio_pass_thru_request.h" -namespace application_manager { +namespace sdl_rpc_plugin { +using namespace application_manager; namespace commands { UIEndAudioPassThruRequest::UIEndAudioPassThruRequest( - const MessageSharedPtr& message, ApplicationManager& application_manager) + const application_manager::commands::MessageSharedPtr& message, + ApplicationManager& application_manager) : RequestToHMI(message, application_manager) {} UIEndAudioPassThruRequest::~UIEndAudioPassThruRequest() {} diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/ui_end_audio_pass_thru_response.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/ui_end_audio_pass_thru_response.cc index 27b96379c2..46f742d6c7 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/ui_end_audio_pass_thru_response.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/ui_end_audio_pass_thru_response.cc @@ -34,12 +34,14 @@ #include "interfaces/HMI_API.h" -namespace application_manager { +namespace sdl_rpc_plugin { +using namespace application_manager; namespace commands { UIEndAudioPassThruResponse::UIEndAudioPassThruResponse( - const MessageSharedPtr& message, ApplicationManager& application_manager) + const application_manager::commands::MessageSharedPtr& message, + ApplicationManager& application_manager) : ResponseFromHMI(message, application_manager) {} UIEndAudioPassThruResponse::~UIEndAudioPassThruResponse() {} diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/ui_get_capabilities_request.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/ui_get_capabilities_request.cc index f4cb64a8a3..ec53be1d61 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/ui_get_capabilities_request.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/ui_get_capabilities_request.cc @@ -32,12 +32,14 @@ #include "sdl_rpc_plugin/commands/hmi/ui_get_capabilities_request.h" -namespace application_manager { +namespace sdl_rpc_plugin { +using namespace application_manager; namespace commands { UIGetCapabilitiesRequest::UIGetCapabilitiesRequest( - const MessageSharedPtr& message, ApplicationManager& application_manager) + const application_manager::commands::MessageSharedPtr& message, + ApplicationManager& application_manager) : RequestToHMI(message, application_manager) {} UIGetCapabilitiesRequest::~UIGetCapabilitiesRequest() {} diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/ui_get_capabilities_response.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/ui_get_capabilities_response.cc index 34ccd62b94..6f50deed3b 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/ui_get_capabilities_response.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/ui_get_capabilities_response.cc @@ -31,12 +31,14 @@ */ #include "sdl_rpc_plugin/commands/hmi/ui_get_capabilities_response.h" -namespace application_manager { +namespace sdl_rpc_plugin { +using namespace application_manager; namespace commands { UIGetCapabilitiesResponse::UIGetCapabilitiesResponse( - const MessageSharedPtr& message, ApplicationManager& application_manager) + const application_manager::commands::MessageSharedPtr& message, + ApplicationManager& application_manager) : ResponseFromHMI(message, application_manager) {} UIGetCapabilitiesResponse::~UIGetCapabilitiesResponse() {} diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/ui_get_language_request.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/ui_get_language_request.cc index 1e2d1fa2d1..c50b15c8eb 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/ui_get_language_request.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/ui_get_language_request.cc @@ -32,12 +32,14 @@ #include "sdl_rpc_plugin/commands/hmi/ui_get_language_request.h" -namespace application_manager { +namespace sdl_rpc_plugin { +using namespace application_manager; namespace commands { UIGetLanguageRequest::UIGetLanguageRequest( - const MessageSharedPtr& message, ApplicationManager& application_manager) + const application_manager::commands::MessageSharedPtr& message, + ApplicationManager& application_manager) : RequestToHMI(message, application_manager) {} UIGetLanguageRequest::~UIGetLanguageRequest() {} diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/ui_get_language_response.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/ui_get_language_response.cc index f45e02b63b..1feba12abe 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/ui_get_language_response.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/ui_get_language_response.cc @@ -34,12 +34,14 @@ #include "application_manager/event_engine/event.h" #include "interfaces/HMI_API.h" -namespace application_manager { +namespace sdl_rpc_plugin { +using namespace application_manager; namespace commands { UIGetLanguageResponse::UIGetLanguageResponse( - const MessageSharedPtr& message, ApplicationManager& application_manager) + const application_manager::commands::MessageSharedPtr& message, + ApplicationManager& application_manager) : ResponseFromHMI(message, application_manager) {} UIGetLanguageResponse::~UIGetLanguageResponse() {} diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/ui_get_supported_languages_request.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/ui_get_supported_languages_request.cc index 23944edd3b..a2b848038a 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/ui_get_supported_languages_request.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/ui_get_supported_languages_request.cc @@ -32,12 +32,14 @@ #include "sdl_rpc_plugin/commands/hmi/ui_get_supported_languages_request.h" -namespace application_manager { +namespace sdl_rpc_plugin { +using namespace application_manager; namespace commands { UIGetSupportedLanguagesRequest::UIGetSupportedLanguagesRequest( - const MessageSharedPtr& message, ApplicationManager& application_manager) + const application_manager::commands::MessageSharedPtr& message, + ApplicationManager& application_manager) : RequestToHMI(message, application_manager) {} UIGetSupportedLanguagesRequest::~UIGetSupportedLanguagesRequest() {} diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/ui_get_supported_languages_response.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/ui_get_supported_languages_response.cc index d6e068368a..87fa40964a 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/ui_get_supported_languages_response.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/ui_get_supported_languages_response.cc @@ -33,12 +33,14 @@ #include "interfaces/HMI_API.h" -namespace application_manager { +namespace sdl_rpc_plugin { +using namespace application_manager; namespace commands { UIGetSupportedLanguagesResponse::UIGetSupportedLanguagesResponse( - const MessageSharedPtr& message, ApplicationManager& application_manager) + const application_manager::commands::MessageSharedPtr& message, + ApplicationManager& application_manager) : ResponseFromHMI(message, application_manager) {} UIGetSupportedLanguagesResponse::~UIGetSupportedLanguagesResponse() {} diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/ui_is_ready_request.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/ui_is_ready_request.cc index 8aa3af58d5..5f5da94542 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/ui_is_ready_request.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/ui_is_ready_request.cc @@ -34,12 +34,14 @@ #include "application_manager/message_helper.h" #include "application_manager/rpc_service.h" -namespace application_manager { +namespace sdl_rpc_plugin { +using namespace application_manager; namespace commands { -UIIsReadyRequest::UIIsReadyRequest(const MessageSharedPtr& message, - ApplicationManager& application_manager) +UIIsReadyRequest::UIIsReadyRequest( + const application_manager::commands::MessageSharedPtr& message, + ApplicationManager& application_manager) : RequestToHMI(message, application_manager) , EventObserver(application_manager.event_dispatcher()) {} @@ -58,13 +60,13 @@ void UIIsReadyRequest::on_event(const event_engine::Event& event) { case hmi_apis::FunctionID::UI_IsReady: { LOG4CXX_DEBUG(logger_, "Received UI_IsReady event"); unsubscribe_from_event(hmi_apis::FunctionID::UI_IsReady); - const bool is_available = ChangeInterfaceState( + const bool is_available = app_mngr::commands::ChangeInterfaceState( application_manager_, message, HmiInterfaces::HMI_INTERFACE_UI); HMICapabilities& hmi_capabilities = application_manager_.hmi_capabilities(); hmi_capabilities.set_is_ui_cooperating(is_available); - if (!CheckAvailabilityHMIInterfaces(application_manager_, - HmiInterfaces::HMI_INTERFACE_UI)) { + if (!app_mngr::commands::CheckAvailabilityHMIInterfaces( + application_manager_, HmiInterfaces::HMI_INTERFACE_UI)) { LOG4CXX_INFO(logger_, "HmiInterfaces::HMI_INTERFACE_UI isn't available"); return; diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/ui_is_ready_response.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/ui_is_ready_response.cc index 869b5f13cb..8faa4feba2 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/ui_is_ready_response.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/ui_is_ready_response.cc @@ -31,12 +31,14 @@ */ #include "sdl_rpc_plugin/commands/hmi/ui_is_ready_response.h" -namespace application_manager { +namespace sdl_rpc_plugin { +using namespace application_manager; namespace commands { -UIIsReadyResponse::UIIsReadyResponse(const MessageSharedPtr& message, - ApplicationManager& application_manager) +UIIsReadyResponse::UIIsReadyResponse( + const application_manager::commands::MessageSharedPtr& message, + ApplicationManager& application_manager) : ResponseFromHMI(message, application_manager) {} UIIsReadyResponse::~UIIsReadyResponse() {} diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/ui_perform_audio_pass_thru_request.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/ui_perform_audio_pass_thru_request.cc index 57f852ff95..26092d4764 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/ui_perform_audio_pass_thru_request.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/ui_perform_audio_pass_thru_request.cc @@ -32,12 +32,14 @@ #include "sdl_rpc_plugin/commands/hmi/ui_perform_audio_pass_thru_request.h" -namespace application_manager { +namespace sdl_rpc_plugin { +using namespace application_manager; namespace commands { UIPerformAudioPassThruRequest::UIPerformAudioPassThruRequest( - const MessageSharedPtr& message, ApplicationManager& application_manager) + const application_manager::commands::MessageSharedPtr& message, + ApplicationManager& application_manager) : RequestToHMI(message, application_manager) {} UIPerformAudioPassThruRequest::~UIPerformAudioPassThruRequest() {} diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/ui_perform_audio_pass_thru_response.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/ui_perform_audio_pass_thru_response.cc index 0a03b3b829..c31b5b91e8 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/ui_perform_audio_pass_thru_response.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/ui_perform_audio_pass_thru_response.cc @@ -33,12 +33,14 @@ #include "application_manager/event_engine/event.h" #include "interfaces/MOBILE_API.h" -namespace application_manager { +namespace sdl_rpc_plugin { +using namespace application_manager; namespace commands { UIPerformAudioPassThruResponse::UIPerformAudioPassThruResponse( - const MessageSharedPtr& message, ApplicationManager& application_manager) + const application_manager::commands::MessageSharedPtr& message, + ApplicationManager& application_manager) : ResponseFromHMI(message, application_manager) {} UIPerformAudioPassThruResponse::~UIPerformAudioPassThruResponse() {} diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/ui_perform_interaction_request.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/ui_perform_interaction_request.cc index 1136987009..079cbbe46d 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/ui_perform_interaction_request.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/ui_perform_interaction_request.cc @@ -32,12 +32,14 @@ #include "sdl_rpc_plugin/commands/hmi/ui_perform_interaction_request.h" -namespace application_manager { +namespace sdl_rpc_plugin { +using namespace application_manager; namespace commands { UIPerformInteractionRequest::UIPerformInteractionRequest( - const MessageSharedPtr& message, ApplicationManager& application_manager) + const application_manager::commands::MessageSharedPtr& message, + ApplicationManager& application_manager) : RequestToHMI(message, application_manager) {} UIPerformInteractionRequest::~UIPerformInteractionRequest() {} diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/ui_perform_interaction_response.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/ui_perform_interaction_response.cc index 328de7e936..ce80d2eef0 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/ui_perform_interaction_response.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/ui_perform_interaction_response.cc @@ -33,12 +33,14 @@ #include "application_manager/event_engine/event.h" #include "interfaces/HMI_API.h" -namespace application_manager { +namespace sdl_rpc_plugin { +using namespace application_manager; namespace commands { UIPerformInteractionResponse::UIPerformInteractionResponse( - const MessageSharedPtr& message, ApplicationManager& application_manager) + const application_manager::commands::MessageSharedPtr& message, + ApplicationManager& application_manager) : ResponseFromHMI(message, application_manager) {} UIPerformInteractionResponse::~UIPerformInteractionResponse() {} diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/ui_scrollable_message_request.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/ui_scrollable_message_request.cc index 700460d2a1..ad3e9a6692 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/ui_scrollable_message_request.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/ui_scrollable_message_request.cc @@ -32,12 +32,14 @@ #include "sdl_rpc_plugin/commands/hmi/ui_scrollable_message_request.h" -namespace application_manager { +namespace sdl_rpc_plugin { +using namespace application_manager; namespace commands { UIScrollableMessageRequest::UIScrollableMessageRequest( - const MessageSharedPtr& message, ApplicationManager& application_manager) + const application_manager::commands::MessageSharedPtr& message, + ApplicationManager& application_manager) : RequestToHMI(message, application_manager) {} UIScrollableMessageRequest::~UIScrollableMessageRequest() {} diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/ui_scrollable_message_response.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/ui_scrollable_message_response.cc index ace5074b2b..049bfa44b4 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/ui_scrollable_message_response.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/ui_scrollable_message_response.cc @@ -33,12 +33,14 @@ #include "application_manager/event_engine/event.h" #include "interfaces/HMI_API.h" -namespace application_manager { +namespace sdl_rpc_plugin { +using namespace application_manager; namespace commands { UIScrollableMessageResponse::UIScrollableMessageResponse( - const MessageSharedPtr& message, ApplicationManager& application_manager) + const application_manager::commands::MessageSharedPtr& message, + ApplicationManager& application_manager) : ResponseFromHMI(message, application_manager) {} UIScrollableMessageResponse::~UIScrollableMessageResponse() {} diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/ui_send_haptic_data_request.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/ui_send_haptic_data_request.cc index af85062af1..6e6e8ed065 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/ui_send_haptic_data_request.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/ui_send_haptic_data_request.cc @@ -32,12 +32,14 @@ #include "sdl_rpc_plugin/commands/hmi/ui_send_haptic_data_request.h" -namespace application_manager { +namespace sdl_rpc_plugin { +using namespace application_manager; namespace commands { UISendHapticDataRequest::UISendHapticDataRequest( - const MessageSharedPtr& message, ApplicationManager& application_manager) + const application_manager::commands::MessageSharedPtr& message, + ApplicationManager& application_manager) : RequestToHMI(message, application_manager) {} UISendHapticDataRequest::~UISendHapticDataRequest() {} diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/ui_send_haptic_data_response.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/ui_send_haptic_data_response.cc index 2917f0e9ef..d2851f1cb5 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/ui_send_haptic_data_response.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/ui_send_haptic_data_response.cc @@ -34,12 +34,14 @@ #include "interfaces/HMI_API.h" -namespace application_manager { +namespace sdl_rpc_plugin { +using namespace application_manager; namespace commands { UISendHapticDataResponse::UISendHapticDataResponse( - const MessageSharedPtr& message, ApplicationManager& application_manager) + const application_manager::commands::MessageSharedPtr& message, + ApplicationManager& application_manager) : ResponseFromHMI(message, application_manager) {} UISendHapticDataResponse::~UISendHapticDataResponse() {} diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/ui_set_app_icon_request.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/ui_set_app_icon_request.cc index 844066087a..8a1f085876 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/ui_set_app_icon_request.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/ui_set_app_icon_request.cc @@ -32,12 +32,14 @@ #include "sdl_rpc_plugin/commands/hmi/ui_set_app_icon_request.h" -namespace application_manager { +namespace sdl_rpc_plugin { +using namespace application_manager; namespace commands { UISetAppIconRequest::UISetAppIconRequest( - const MessageSharedPtr& message, ApplicationManager& application_manager) + const application_manager::commands::MessageSharedPtr& message, + ApplicationManager& application_manager) : RequestToHMI(message, application_manager) {} UISetAppIconRequest::~UISetAppIconRequest() {} diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/ui_set_app_icon_response.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/ui_set_app_icon_response.cc index f4c618a6eb..894c195466 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/ui_set_app_icon_response.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/ui_set_app_icon_response.cc @@ -33,12 +33,14 @@ #include "application_manager/event_engine/event.h" #include "interfaces/HMI_API.h" -namespace application_manager { +namespace sdl_rpc_plugin { +using namespace application_manager; namespace commands { UISetAppIconResponse::UISetAppIconResponse( - const MessageSharedPtr& message, ApplicationManager& application_manager) + const application_manager::commands::MessageSharedPtr& message, + ApplicationManager& application_manager) : ResponseFromHMI(message, application_manager) {} UISetAppIconResponse::~UISetAppIconResponse() {} diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/ui_set_display_layout_request.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/ui_set_display_layout_request.cc index 53b7a5fdaa..38db95a26d 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/ui_set_display_layout_request.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/ui_set_display_layout_request.cc @@ -32,12 +32,14 @@ #include "sdl_rpc_plugin/commands/hmi/ui_set_display_layout_request.h" -namespace application_manager { +namespace sdl_rpc_plugin { +using namespace application_manager; namespace commands { UiSetDisplayLayoutRequest::UiSetDisplayLayoutRequest( - const MessageSharedPtr& message, ApplicationManager& application_manager) + const application_manager::commands::MessageSharedPtr& message, + ApplicationManager& application_manager) : RequestToHMI(message, application_manager) {} UiSetDisplayLayoutRequest::~UiSetDisplayLayoutRequest() {} diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/ui_set_display_layout_response.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/ui_set_display_layout_response.cc index 2ecd865aa8..ed0e09da12 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/ui_set_display_layout_response.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/ui_set_display_layout_response.cc @@ -34,12 +34,14 @@ #include "application_manager/event_engine/event.h" #include "interfaces/HMI_API.h" -namespace application_manager { +namespace sdl_rpc_plugin { +using namespace application_manager; namespace commands { UiSetDisplayLayoutResponse::UiSetDisplayLayoutResponse( - const MessageSharedPtr& message, ApplicationManager& application_manager) + const application_manager::commands::MessageSharedPtr& message, + ApplicationManager& application_manager) : ResponseFromHMI(message, application_manager) {} UiSetDisplayLayoutResponse::~UiSetDisplayLayoutResponse() {} diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/ui_set_global_properties_request.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/ui_set_global_properties_request.cc index 458a254033..1b64ca3eae 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/ui_set_global_properties_request.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/ui_set_global_properties_request.cc @@ -32,12 +32,14 @@ #include "sdl_rpc_plugin/commands/hmi/ui_set_global_properties_request.h" -namespace application_manager { +namespace sdl_rpc_plugin { +using namespace application_manager; namespace commands { UISetGlobalPropertiesRequest::UISetGlobalPropertiesRequest( - const MessageSharedPtr& message, ApplicationManager& application_manager) + const application_manager::commands::MessageSharedPtr& message, + ApplicationManager& application_manager) : RequestToHMI(message, application_manager) {} UISetGlobalPropertiesRequest::~UISetGlobalPropertiesRequest() {} diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/ui_set_global_properties_response.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/ui_set_global_properties_response.cc index a7da45645c..897c0b7030 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/ui_set_global_properties_response.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/ui_set_global_properties_response.cc @@ -33,12 +33,14 @@ #include "application_manager/event_engine/event.h" #include "interfaces/HMI_API.h" -namespace application_manager { +namespace sdl_rpc_plugin { +using namespace application_manager; namespace commands { UISetGlobalPropertiesResponse::UISetGlobalPropertiesResponse( - const MessageSharedPtr& message, ApplicationManager& application_manager) + const application_manager::commands::MessageSharedPtr& message, + ApplicationManager& application_manager) : ResponseFromHMI(message, application_manager) {} UISetGlobalPropertiesResponse::~UISetGlobalPropertiesResponse() {} diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/ui_set_icon_request.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/ui_set_icon_request.cc index 5f3dceed12..1bade6dcef 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/ui_set_icon_request.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/ui_set_icon_request.cc @@ -32,12 +32,14 @@ #include "sdl_rpc_plugin/commands/hmi/ui_set_icon_request.h" -namespace application_manager { +namespace sdl_rpc_plugin { +using namespace application_manager; namespace commands { -UISetIconRequest::UISetIconRequest(const MessageSharedPtr& message, - ApplicationManager& application_manager) +UISetIconRequest::UISetIconRequest( + const application_manager::commands::MessageSharedPtr& message, + ApplicationManager& application_manager) : RequestToHMI(message, application_manager) {} UISetIconRequest::~UISetIconRequest() {} diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/ui_set_media_clock_timer_request.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/ui_set_media_clock_timer_request.cc index bfebb880bf..df1ab8ddd3 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/ui_set_media_clock_timer_request.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/ui_set_media_clock_timer_request.cc @@ -32,12 +32,14 @@ #include "sdl_rpc_plugin/commands/hmi/ui_set_media_clock_timer_request.h" -namespace application_manager { +namespace sdl_rpc_plugin { +using namespace application_manager; namespace commands { UISetMediaClockTimerRequest::UISetMediaClockTimerRequest( - const MessageSharedPtr& message, ApplicationManager& application_manager) + const application_manager::commands::MessageSharedPtr& message, + ApplicationManager& application_manager) : RequestToHMI(message, application_manager) {} UISetMediaClockTimerRequest::~UISetMediaClockTimerRequest() {} diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/ui_set_media_clock_timer_response.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/ui_set_media_clock_timer_response.cc index f677675721..9058550d28 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/ui_set_media_clock_timer_response.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/ui_set_media_clock_timer_response.cc @@ -33,12 +33,14 @@ #include "application_manager/event_engine/event.h" #include "interfaces/HMI_API.h" -namespace application_manager { +namespace sdl_rpc_plugin { +using namespace application_manager; namespace commands { UISetMediaClockTimerResponse::UISetMediaClockTimerResponse( - const MessageSharedPtr& message, ApplicationManager& application_manager) + const application_manager::commands::MessageSharedPtr& message, + ApplicationManager& application_manager) : ResponseFromHMI(message, application_manager) {} UISetMediaClockTimerResponse::~UISetMediaClockTimerResponse() {} diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/ui_show_request.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/ui_show_request.cc index 38d29abe9e..f106359792 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/ui_show_request.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/ui_show_request.cc @@ -32,12 +32,14 @@ #include "sdl_rpc_plugin/commands/hmi/ui_show_request.h" -namespace application_manager { +namespace sdl_rpc_plugin { +using namespace application_manager; namespace commands { -UIShowRequest::UIShowRequest(const MessageSharedPtr& message, - ApplicationManager& application_manager) +UIShowRequest::UIShowRequest( + const application_manager::commands::MessageSharedPtr& message, + ApplicationManager& application_manager) : RequestToHMI(message, application_manager) {} UIShowRequest::~UIShowRequest() {} diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/ui_show_response.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/ui_show_response.cc index 61b9ad45fe..bc2b922b0a 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/ui_show_response.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/ui_show_response.cc @@ -32,12 +32,14 @@ #include "sdl_rpc_plugin/commands/hmi/ui_show_response.h" #include "application_manager/event_engine/event.h" -namespace application_manager { +namespace sdl_rpc_plugin { +using namespace application_manager; namespace commands { -UIShowResponse::UIShowResponse(const MessageSharedPtr& message, - ApplicationManager& application_manager) +UIShowResponse::UIShowResponse( + const application_manager::commands::MessageSharedPtr& message, + ApplicationManager& application_manager) : ResponseFromHMI(message, application_manager) {} UIShowResponse::~UIShowResponse() {} diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/ui_slider_request.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/ui_slider_request.cc index 39fff5c3ef..c2ba0aa76d 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/ui_slider_request.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/ui_slider_request.cc @@ -32,12 +32,14 @@ #include "sdl_rpc_plugin/commands/hmi/ui_slider_request.h" -namespace application_manager { +namespace sdl_rpc_plugin { +using namespace application_manager; namespace commands { -UISliderRequest::UISliderRequest(const MessageSharedPtr& message, - ApplicationManager& application_manager) +UISliderRequest::UISliderRequest( + const application_manager::commands::MessageSharedPtr& message, + ApplicationManager& application_manager) : RequestToHMI(message, application_manager) {} UISliderRequest::~UISliderRequest() {} diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/ui_slider_response.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/ui_slider_response.cc index 3fe65c8d21..1fa10ce22c 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/ui_slider_response.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/ui_slider_response.cc @@ -33,12 +33,14 @@ #include "application_manager/event_engine/event.h" #include "interfaces/HMI_API.h" -namespace application_manager { +namespace sdl_rpc_plugin { +using namespace application_manager; namespace commands { -UISliderResponse::UISliderResponse(const MessageSharedPtr& message, - ApplicationManager& application_manager) +UISliderResponse::UISliderResponse( + const application_manager::commands::MessageSharedPtr& message, + ApplicationManager& application_manager) : ResponseFromHMI(message, application_manager) {} UISliderResponse::~UISliderResponse() {} diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/update_app_list_request.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/update_app_list_request.cc index 83c0fbc036..b8e56f8b0c 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/update_app_list_request.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/update_app_list_request.cc @@ -32,12 +32,14 @@ #include "sdl_rpc_plugin/commands/hmi/update_app_list_request.h" -namespace application_manager { +namespace sdl_rpc_plugin { +using namespace application_manager; namespace commands { UpdateAppListRequest::UpdateAppListRequest( - const MessageSharedPtr& message, ApplicationManager& application_manager) + const application_manager::commands::MessageSharedPtr& message, + ApplicationManager& application_manager) : RequestToHMI(message, application_manager) {} UpdateAppListRequest::~UpdateAppListRequest() {} diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/update_app_list_response.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/update_app_list_response.cc index 9ceea3927c..cfe248653b 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/update_app_list_response.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/update_app_list_response.cc @@ -32,12 +32,14 @@ #include "sdl_rpc_plugin/commands/hmi/update_app_list_response.h" -namespace application_manager { +namespace sdl_rpc_plugin { +using namespace application_manager; namespace commands { UpdateAppListResponse::UpdateAppListResponse( - const MessageSharedPtr& message, ApplicationManager& application_manager) + const application_manager::commands::MessageSharedPtr& message, + ApplicationManager& application_manager) : ResponseFromHMI(message, application_manager) {} UpdateAppListResponse::~UpdateAppListResponse() {} diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/update_device_list_request.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/update_device_list_request.cc index 72deef28a2..502c99a628 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/update_device_list_request.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/update_device_list_request.cc @@ -36,12 +36,14 @@ #include <unistd.h> -namespace application_manager { +namespace sdl_rpc_plugin { +using namespace application_manager; namespace commands { UpdateDeviceListRequest::UpdateDeviceListRequest( - const MessageSharedPtr& message, ApplicationManager& application_manager) + const application_manager::commands::MessageSharedPtr& message, + ApplicationManager& application_manager) : RequestToHMI(message, application_manager) , EventObserver(application_manager_.event_dispatcher()) {} diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/update_device_list_response.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/update_device_list_response.cc index 1730775122..72502f7ef1 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/update_device_list_response.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/update_device_list_response.cc @@ -31,12 +31,14 @@ */ #include "sdl_rpc_plugin/commands/hmi/update_device_list_response.h" -namespace application_manager { +namespace sdl_rpc_plugin { +using namespace application_manager; namespace commands { UpdateDeviceListResponse::UpdateDeviceListResponse( - const MessageSharedPtr& message, ApplicationManager& application_manager) + const application_manager::commands::MessageSharedPtr& message, + ApplicationManager& application_manager) : ResponseFromHMI(message, application_manager) {} UpdateDeviceListResponse::~UpdateDeviceListResponse() {} diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/update_sdl_request.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/update_sdl_request.cc index cee6b9577f..46c20aebd8 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/update_sdl_request.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/update_sdl_request.cc @@ -33,12 +33,14 @@ #include "sdl_rpc_plugin/commands/hmi/update_sdl_request.h" -namespace application_manager { +namespace sdl_rpc_plugin { +using namespace application_manager; namespace commands { -UpdateSDLRequest::UpdateSDLRequest(const MessageSharedPtr& message, - ApplicationManager& application_manager) +UpdateSDLRequest::UpdateSDLRequest( + const application_manager::commands::MessageSharedPtr& message, + ApplicationManager& application_manager) : RequestToHMI(message, application_manager) {} UpdateSDLRequest::~UpdateSDLRequest() {} diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/update_sdl_response.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/update_sdl_response.cc index a211053868..5284d0c721 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/update_sdl_response.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/update_sdl_response.cc @@ -32,12 +32,14 @@ #include "sdl_rpc_plugin/commands/hmi/update_sdl_response.h" #include "application_manager/rpc_service.h" -namespace application_manager { +namespace sdl_rpc_plugin { +using namespace application_manager; namespace commands { -UpdateSDLResponse::UpdateSDLResponse(const MessageSharedPtr& message, - ApplicationManager& application_manager) +UpdateSDLResponse::UpdateSDLResponse( + const application_manager::commands::MessageSharedPtr& message, + ApplicationManager& application_manager) : ResponseFromHMI(message, application_manager) {} UpdateSDLResponse::~UpdateSDLResponse() {} diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/vi_diagnostic_message_request.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/vi_diagnostic_message_request.cc index 0e17b23ca6..0aede55815 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/vi_diagnostic_message_request.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/vi_diagnostic_message_request.cc @@ -32,12 +32,14 @@ #include "sdl_rpc_plugin/commands/hmi/vi_diagnostic_message_request.h" -namespace application_manager { +namespace sdl_rpc_plugin { +using namespace application_manager; namespace commands { VIDiagnosticMessageRequest::VIDiagnosticMessageRequest( - const MessageSharedPtr& message, ApplicationManager& application_manager) + const application_manager::commands::MessageSharedPtr& message, + ApplicationManager& application_manager) : RequestToHMI(message, application_manager) {} VIDiagnosticMessageRequest::~VIDiagnosticMessageRequest() {} diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/vi_diagnostic_message_response.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/vi_diagnostic_message_response.cc index 7893671ded..a10890854a 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/vi_diagnostic_message_response.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/vi_diagnostic_message_response.cc @@ -33,12 +33,14 @@ #include "application_manager/event_engine/event.h" #include "interfaces/HMI_API.h" -namespace application_manager { +namespace sdl_rpc_plugin { +using namespace application_manager; namespace commands { VIDiagnosticMessageResponse::VIDiagnosticMessageResponse( - const MessageSharedPtr& message, ApplicationManager& application_manager) + const application_manager::commands::MessageSharedPtr& message, + ApplicationManager& application_manager) : ResponseFromHMI(message, application_manager) {} VIDiagnosticMessageResponse::~VIDiagnosticMessageResponse() {} diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/vi_get_dtcs_request.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/vi_get_dtcs_request.cc index 768dfeb064..6e44f94566 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/vi_get_dtcs_request.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/vi_get_dtcs_request.cc @@ -32,12 +32,14 @@ #include "sdl_rpc_plugin/commands/hmi/vi_get_dtcs_request.h" -namespace application_manager { +namespace sdl_rpc_plugin { +using namespace application_manager; namespace commands { -VIGetDTCsRequest::VIGetDTCsRequest(const MessageSharedPtr& message, - ApplicationManager& application_manager) +VIGetDTCsRequest::VIGetDTCsRequest( + const application_manager::commands::MessageSharedPtr& message, + ApplicationManager& application_manager) : RequestToHMI(message, application_manager) {} VIGetDTCsRequest::~VIGetDTCsRequest() {} diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/vi_get_dtcs_response.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/vi_get_dtcs_response.cc index 1ae1dbb17a..e42e1e83ed 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/vi_get_dtcs_response.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/vi_get_dtcs_response.cc @@ -33,12 +33,14 @@ #include "application_manager/event_engine/event.h" #include "interfaces/HMI_API.h" -namespace application_manager { +namespace sdl_rpc_plugin { +using namespace application_manager; namespace commands { -VIGetDTCsResponse::VIGetDTCsResponse(const MessageSharedPtr& message, - ApplicationManager& application_manager) +VIGetDTCsResponse::VIGetDTCsResponse( + const application_manager::commands::MessageSharedPtr& message, + ApplicationManager& application_manager) : ResponseFromHMI(message, application_manager) {} VIGetDTCsResponse::~VIGetDTCsResponse() {} diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/vi_get_vehicle_data_request.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/vi_get_vehicle_data_request.cc index 5c591f6c25..1b3f6af723 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/vi_get_vehicle_data_request.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/vi_get_vehicle_data_request.cc @@ -32,12 +32,14 @@ #include "sdl_rpc_plugin/commands/hmi/vi_get_vehicle_data_request.h" -namespace application_manager { +namespace sdl_rpc_plugin { +using namespace application_manager; namespace commands { VIGetVehicleDataRequest::VIGetVehicleDataRequest( - const MessageSharedPtr& message, ApplicationManager& application_manager) + const application_manager::commands::MessageSharedPtr& message, + ApplicationManager& application_manager) : RequestToHMI(message, application_manager) {} VIGetVehicleDataRequest::~VIGetVehicleDataRequest() {} diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/vi_get_vehicle_data_response.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/vi_get_vehicle_data_response.cc index db26b1f1ba..03b88eaa0d 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/vi_get_vehicle_data_response.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/vi_get_vehicle_data_response.cc @@ -33,11 +33,13 @@ #include "application_manager/event_engine/event.h" #include "interfaces/HMI_API.h" -namespace application_manager { +namespace sdl_rpc_plugin { +using namespace application_manager; namespace commands { VIGetVehicleDataResponse::VIGetVehicleDataResponse( - const MessageSharedPtr& message, ApplicationManager& application_manager) + const application_manager::commands::MessageSharedPtr& message, + ApplicationManager& application_manager) : ResponseFromHMI(message, application_manager) {} VIGetVehicleDataResponse::~VIGetVehicleDataResponse() {} diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/vi_get_vehicle_type_request.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/vi_get_vehicle_type_request.cc index 96d33bbf95..1998d4304b 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/vi_get_vehicle_type_request.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/vi_get_vehicle_type_request.cc @@ -32,12 +32,14 @@ #include "sdl_rpc_plugin/commands/hmi/vi_get_vehicle_type_request.h" -namespace application_manager { +namespace sdl_rpc_plugin { +using namespace application_manager; namespace commands { VIGetVehicleTypeRequest::VIGetVehicleTypeRequest( - const MessageSharedPtr& message, ApplicationManager& application_manager) + const application_manager::commands::MessageSharedPtr& message, + ApplicationManager& application_manager) : RequestToHMI(message, application_manager) {} VIGetVehicleTypeRequest::~VIGetVehicleTypeRequest() {} diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/vi_get_vehicle_type_response.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/vi_get_vehicle_type_response.cc index ad8675c36b..3296784f0a 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/vi_get_vehicle_type_response.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/vi_get_vehicle_type_response.cc @@ -31,12 +31,14 @@ */ #include "sdl_rpc_plugin/commands/hmi/vi_get_vehicle_type_response.h" -namespace application_manager { +namespace sdl_rpc_plugin { +using namespace application_manager; namespace commands { VIGetVehicleTypeResponse::VIGetVehicleTypeResponse( - const MessageSharedPtr& message, ApplicationManager& application_manager) + const application_manager::commands::MessageSharedPtr& message, + ApplicationManager& application_manager) : ResponseFromHMI(message, application_manager) {} VIGetVehicleTypeResponse::~VIGetVehicleTypeResponse() {} diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/vi_is_ready_request.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/vi_is_ready_request.cc index 4c139ff519..2a94cc3191 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/vi_is_ready_request.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/vi_is_ready_request.cc @@ -34,12 +34,14 @@ #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 { -VIIsReadyRequest::VIIsReadyRequest(const MessageSharedPtr& message, - ApplicationManager& application_manager) +VIIsReadyRequest::VIIsReadyRequest( + const application_manager::commands::MessageSharedPtr& message, + ApplicationManager& application_manager) : RequestToHMI(message, application_manager) , EventObserver(application_manager.event_dispatcher()) {} @@ -59,16 +61,16 @@ void VIIsReadyRequest::on_event(const event_engine::Event& event) { case hmi_apis::FunctionID::VehicleInfo_IsReady: { LOG4CXX_DEBUG(logger_, "VehicleInfo_IsReady event"); unsubscribe_from_event(hmi_apis::FunctionID::VehicleInfo_IsReady); - const bool is_available = - ChangeInterfaceState(application_manager_, - message, - HmiInterfaces::HMI_INTERFACE_VehicleInfo); + const bool is_available = app_mngr::commands::ChangeInterfaceState( + application_manager_, + message, + HmiInterfaces::HMI_INTERFACE_VehicleInfo); HMICapabilities& hmi_capabilities = application_manager_.hmi_capabilities(); hmi_capabilities.set_is_ivi_cooperating(is_available); application_manager_.GetPolicyHandler().OnVIIsReady(); - if (!CheckAvailabilityHMIInterfaces( + if (!app_mngr::commands::CheckAvailabilityHMIInterfaces( application_manager_, HmiInterfaces::HMI_INTERFACE_VehicleInfo)) { LOG4CXX_INFO( logger_, diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/vi_is_ready_response.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/vi_is_ready_response.cc index ed29a98b59..63f7511043 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/vi_is_ready_response.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/vi_is_ready_response.cc @@ -31,12 +31,14 @@ */ #include "sdl_rpc_plugin/commands/hmi/vi_is_ready_response.h" -namespace application_manager { +namespace sdl_rpc_plugin { +using namespace application_manager; namespace commands { -VIIsReadyResponse::VIIsReadyResponse(const MessageSharedPtr& message, - ApplicationManager& application_manager) +VIIsReadyResponse::VIIsReadyResponse( + const application_manager::commands::MessageSharedPtr& message, + ApplicationManager& application_manager) : ResponseFromHMI(message, application_manager) {} VIIsReadyResponse::~VIIsReadyResponse() {} diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/vi_read_did_request.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/vi_read_did_request.cc index 113aa1b38b..47be52d6a7 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/vi_read_did_request.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/vi_read_did_request.cc @@ -32,12 +32,14 @@ #include "sdl_rpc_plugin/commands/hmi/vi_read_did_request.h" -namespace application_manager { +namespace sdl_rpc_plugin { +using namespace application_manager; namespace commands { -VIReadDIDRequest::VIReadDIDRequest(const MessageSharedPtr& message, - ApplicationManager& application_manager) +VIReadDIDRequest::VIReadDIDRequest( + const application_manager::commands::MessageSharedPtr& message, + ApplicationManager& application_manager) : RequestToHMI(message, application_manager) {} VIReadDIDRequest::~VIReadDIDRequest() {} diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/vi_read_did_response.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/vi_read_did_response.cc index bd200a9007..b1e00b2ded 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/vi_read_did_response.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/vi_read_did_response.cc @@ -32,12 +32,14 @@ #include "sdl_rpc_plugin/commands/hmi/vi_read_did_response.h" #include "application_manager/event_engine/event.h" -namespace application_manager { +namespace sdl_rpc_plugin { +using namespace application_manager; namespace commands { -VIReadDIDResponse::VIReadDIDResponse(const MessageSharedPtr& message, - ApplicationManager& application_manager) +VIReadDIDResponse::VIReadDIDResponse( + const application_manager::commands::MessageSharedPtr& message, + ApplicationManager& application_manager) : ResponseFromHMI(message, application_manager) {} VIReadDIDResponse::~VIReadDIDResponse() {} diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/vi_subscribe_vehicle_data_request.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/vi_subscribe_vehicle_data_request.cc index fa8bb03c42..4f0162c92a 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/vi_subscribe_vehicle_data_request.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/vi_subscribe_vehicle_data_request.cc @@ -32,12 +32,14 @@ #include "sdl_rpc_plugin/commands/hmi/vi_subscribe_vehicle_data_request.h" -namespace application_manager { +namespace sdl_rpc_plugin { +using namespace application_manager; namespace commands { VISubscribeVehicleDataRequest::VISubscribeVehicleDataRequest( - const MessageSharedPtr& message, ApplicationManager& application_manager) + const application_manager::commands::MessageSharedPtr& message, + ApplicationManager& application_manager) : RequestToHMI(message, application_manager) {} VISubscribeVehicleDataRequest::~VISubscribeVehicleDataRequest() {} diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/vi_subscribe_vehicle_data_response.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/vi_subscribe_vehicle_data_response.cc index 508d99940c..160f2744d5 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/vi_subscribe_vehicle_data_response.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/vi_subscribe_vehicle_data_response.cc @@ -33,11 +33,13 @@ #include "application_manager/event_engine/event.h" #include "interfaces/MOBILE_API.h" -namespace application_manager { +namespace sdl_rpc_plugin { +using namespace application_manager; namespace commands { VISubscribeVehicleDataResponse::VISubscribeVehicleDataResponse( - const MessageSharedPtr& message, ApplicationManager& application_manager) + const application_manager::commands::MessageSharedPtr& message, + ApplicationManager& application_manager) : ResponseFromHMI(message, application_manager) {} VISubscribeVehicleDataResponse::~VISubscribeVehicleDataResponse() {} diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/vi_unsubscribe_vehicle_data_request.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/vi_unsubscribe_vehicle_data_request.cc index 37a9597c9a..b6a885fb4c 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/vi_unsubscribe_vehicle_data_request.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/vi_unsubscribe_vehicle_data_request.cc @@ -32,12 +32,14 @@ #include "sdl_rpc_plugin/commands/hmi/vi_unsubscribe_vehicle_data_request.h" -namespace application_manager { +namespace sdl_rpc_plugin { +using namespace application_manager; namespace commands { VIUnsubscribeVehicleDataRequest::VIUnsubscribeVehicleDataRequest( - const MessageSharedPtr& message, ApplicationManager& application_manager) + const application_manager::commands::MessageSharedPtr& message, + ApplicationManager& application_manager) : RequestToHMI(message, application_manager) {} VIUnsubscribeVehicleDataRequest::~VIUnsubscribeVehicleDataRequest() {} diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/vi_unsubscribe_vehicle_data_response.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/vi_unsubscribe_vehicle_data_response.cc index 0113c44145..bdbb1b83b8 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/vi_unsubscribe_vehicle_data_response.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/vi_unsubscribe_vehicle_data_response.cc @@ -33,11 +33,13 @@ #include "application_manager/event_engine/event.h" #include "interfaces/MOBILE_API.h" -namespace application_manager { +namespace sdl_rpc_plugin { +using namespace application_manager; namespace commands { VIUnsubscribeVehicleDataResponse::VIUnsubscribeVehicleDataResponse( - const MessageSharedPtr& message, ApplicationManager& application_manager) + const application_manager::commands::MessageSharedPtr& message, + ApplicationManager& application_manager) : ResponseFromHMI(message, application_manager) {} VIUnsubscribeVehicleDataResponse::~VIUnsubscribeVehicleDataResponse() {} diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/vr_add_command_request.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/vr_add_command_request.cc index f4f04cd205..500f6b4c11 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/vr_add_command_request.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/vr_add_command_request.cc @@ -32,12 +32,14 @@ #include "sdl_rpc_plugin/commands/hmi/vr_add_command_request.h" -namespace application_manager { +namespace sdl_rpc_plugin { +using namespace application_manager; namespace commands { VRAddCommandRequest::VRAddCommandRequest( - const MessageSharedPtr& message, ApplicationManager& application_manager) + const application_manager::commands::MessageSharedPtr& message, + ApplicationManager& application_manager) : RequestToHMI(message, application_manager) {} VRAddCommandRequest::~VRAddCommandRequest() {} diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/vr_add_command_response.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/vr_add_command_response.cc index 0b4a225fdd..a66af9e44e 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/vr_add_command_response.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/vr_add_command_response.cc @@ -34,12 +34,14 @@ #include "interfaces/HMI_API.h" -namespace application_manager { +namespace sdl_rpc_plugin { +using namespace application_manager; namespace commands { VRAddCommandResponse::VRAddCommandResponse( - const MessageSharedPtr& message, ApplicationManager& application_manager) + const application_manager::commands::MessageSharedPtr& message, + ApplicationManager& application_manager) : ResponseFromHMI(message, application_manager) {} VRAddCommandResponse::~VRAddCommandResponse() {} diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/vr_change_registration_request.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/vr_change_registration_request.cc index 4bb68fde97..c6b37175c4 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/vr_change_registration_request.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/vr_change_registration_request.cc @@ -32,12 +32,14 @@ #include "sdl_rpc_plugin/commands/hmi/vr_change_registration_request.h" -namespace application_manager { +namespace sdl_rpc_plugin { +using namespace application_manager; namespace commands { VRChangeRegistrationRequest::VRChangeRegistrationRequest( - const MessageSharedPtr& message, ApplicationManager& application_manager) + const application_manager::commands::MessageSharedPtr& message, + ApplicationManager& application_manager) : RequestToHMI(message, application_manager) {} VRChangeRegistrationRequest::~VRChangeRegistrationRequest() {} diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/vr_change_registration_response.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/vr_change_registration_response.cc index 6350190715..212caf6bce 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/vr_change_registration_response.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/vr_change_registration_response.cc @@ -33,12 +33,14 @@ #include "application_manager/event_engine/event.h" #include "interfaces/HMI_API.h" -namespace application_manager { +namespace sdl_rpc_plugin { +using namespace application_manager; namespace commands { VRChangeRegistrationResponse::VRChangeRegistrationResponse( - const MessageSharedPtr& message, ApplicationManager& application_manager) + const application_manager::commands::MessageSharedPtr& message, + ApplicationManager& application_manager) : ResponseFromHMI(message, application_manager) {} VRChangeRegistrationResponse::~VRChangeRegistrationResponse() {} diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/vr_delete_command_request.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/vr_delete_command_request.cc index 0e9d22300e..a1d16c218d 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/vr_delete_command_request.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/vr_delete_command_request.cc @@ -32,12 +32,14 @@ #include "sdl_rpc_plugin/commands/hmi/vr_delete_command_request.h" -namespace application_manager { +namespace sdl_rpc_plugin { +using namespace application_manager; namespace commands { VRDeleteCommandRequest::VRDeleteCommandRequest( - const MessageSharedPtr& message, ApplicationManager& application_manager) + const application_manager::commands::MessageSharedPtr& message, + ApplicationManager& application_manager) : RequestToHMI(message, application_manager) {} VRDeleteCommandRequest::~VRDeleteCommandRequest() {} diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/vr_delete_command_response.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/vr_delete_command_response.cc index c6bd8f4d81..1cd27a3613 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/vr_delete_command_response.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/vr_delete_command_response.cc @@ -33,12 +33,14 @@ #include "application_manager/event_engine/event.h" #include "interfaces/HMI_API.h" -namespace application_manager { +namespace sdl_rpc_plugin { +using namespace application_manager; namespace commands { VRDeleteCommandResponse::VRDeleteCommandResponse( - const MessageSharedPtr& message, ApplicationManager& application_manager) + const application_manager::commands::MessageSharedPtr& message, + ApplicationManager& application_manager) : ResponseFromHMI(message, application_manager) {} VRDeleteCommandResponse::~VRDeleteCommandResponse() {} diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/vr_get_capabilities_request.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/vr_get_capabilities_request.cc index 08a1846c09..23678f84cd 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/vr_get_capabilities_request.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/vr_get_capabilities_request.cc @@ -32,12 +32,14 @@ #include "sdl_rpc_plugin/commands/hmi/vr_get_capabilities_request.h" -namespace application_manager { +namespace sdl_rpc_plugin { +using namespace application_manager; namespace commands { VRGetCapabilitiesRequest::VRGetCapabilitiesRequest( - const MessageSharedPtr& message, ApplicationManager& application_manager) + const application_manager::commands::MessageSharedPtr& message, + ApplicationManager& application_manager) : RequestToHMI(message, application_manager) {} VRGetCapabilitiesRequest::~VRGetCapabilitiesRequest() {} diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/vr_get_capabilities_response.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/vr_get_capabilities_response.cc index e226c19298..f2c0e3c32b 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/vr_get_capabilities_response.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/vr_get_capabilities_response.cc @@ -31,12 +31,14 @@ */ #include "sdl_rpc_plugin/commands/hmi/vr_get_capabilities_response.h" -namespace application_manager { +namespace sdl_rpc_plugin { +using namespace application_manager; namespace commands { VRGetCapabilitiesResponse::VRGetCapabilitiesResponse( - const MessageSharedPtr& message, ApplicationManager& application_manager) + const application_manager::commands::MessageSharedPtr& message, + ApplicationManager& application_manager) : ResponseFromHMI(message, application_manager) {} VRGetCapabilitiesResponse::~VRGetCapabilitiesResponse() {} diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/vr_get_language_request.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/vr_get_language_request.cc index 7e020c0fd7..fbee753701 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/vr_get_language_request.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/vr_get_language_request.cc @@ -32,12 +32,14 @@ #include "sdl_rpc_plugin/commands/hmi/vr_get_language_request.h" -namespace application_manager { +namespace sdl_rpc_plugin { +using namespace application_manager; namespace commands { VRGetLanguageRequest::VRGetLanguageRequest( - const MessageSharedPtr& message, ApplicationManager& application_manager) + const application_manager::commands::MessageSharedPtr& message, + ApplicationManager& application_manager) : RequestToHMI(message, application_manager) {} VRGetLanguageRequest::~VRGetLanguageRequest() {} diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/vr_get_language_response.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/vr_get_language_response.cc index bd65d78405..dd0a6f86cb 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/vr_get_language_response.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/vr_get_language_response.cc @@ -34,12 +34,14 @@ #include "application_manager/event_engine/event.h" #include "interfaces/HMI_API.h" -namespace application_manager { +namespace sdl_rpc_plugin { +using namespace application_manager; namespace commands { VRGetLanguageResponse::VRGetLanguageResponse( - const MessageSharedPtr& message, ApplicationManager& application_manager) + const application_manager::commands::MessageSharedPtr& message, + ApplicationManager& application_manager) : ResponseFromHMI(message, application_manager) {} VRGetLanguageResponse::~VRGetLanguageResponse() {} diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/vr_get_supported_languages_request.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/vr_get_supported_languages_request.cc index aba45a2130..b668ef95b6 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/vr_get_supported_languages_request.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/vr_get_supported_languages_request.cc @@ -32,12 +32,14 @@ #include "sdl_rpc_plugin/commands/hmi/vr_get_supported_languages_request.h" -namespace application_manager { +namespace sdl_rpc_plugin { +using namespace application_manager; namespace commands { VRGetSupportedLanguagesRequest::VRGetSupportedLanguagesRequest( - const MessageSharedPtr& message, ApplicationManager& application_manager) + const application_manager::commands::MessageSharedPtr& message, + ApplicationManager& application_manager) : RequestToHMI(message, application_manager) {} VRGetSupportedLanguagesRequest::~VRGetSupportedLanguagesRequest() {} diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/vr_get_supported_languages_response.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/vr_get_supported_languages_response.cc index 1f9a322533..c3579b3266 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/vr_get_supported_languages_response.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/vr_get_supported_languages_response.cc @@ -34,12 +34,14 @@ #include "interfaces/MOBILE_API.h" #include "interfaces/HMI_API.h" -namespace application_manager { +namespace sdl_rpc_plugin { +using namespace application_manager; namespace commands { VRGetSupportedLanguagesResponse::VRGetSupportedLanguagesResponse( - const MessageSharedPtr& message, ApplicationManager& application_manager) + const application_manager::commands::MessageSharedPtr& message, + ApplicationManager& application_manager) : ResponseFromHMI(message, application_manager) {} VRGetSupportedLanguagesResponse::~VRGetSupportedLanguagesResponse() {} diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/vr_is_ready_request.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/vr_is_ready_request.cc index 1a7bfd6e00..37523f69f4 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/vr_is_ready_request.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/vr_is_ready_request.cc @@ -33,12 +33,14 @@ #include "sdl_rpc_plugin/commands/hmi/vr_is_ready_request.h" #include "application_manager/rpc_service.h" -namespace application_manager { +namespace sdl_rpc_plugin { +using namespace application_manager; namespace commands { -VRIsReadyRequest::VRIsReadyRequest(const MessageSharedPtr& message, - ApplicationManager& application_manager) +VRIsReadyRequest::VRIsReadyRequest( + const application_manager::commands::MessageSharedPtr& message, + ApplicationManager& application_manager) : RequestToHMI(message, application_manager) , EventObserver(application_manager.event_dispatcher()) {} @@ -57,14 +59,14 @@ void VRIsReadyRequest::on_event(const event_engine::Event& event) { case hmi_apis::FunctionID::VR_IsReady: { LOG4CXX_DEBUG(logger_, "Received VR_IsReady event"); unsubscribe_from_event(hmi_apis::FunctionID::VR_IsReady); - const bool is_available = ChangeInterfaceState( + const bool is_available = app_mngr::commands::ChangeInterfaceState( application_manager_, message, HmiInterfaces::HMI_INTERFACE_VR); HMICapabilities& hmi_capabilities = application_manager_.hmi_capabilities(); hmi_capabilities.set_is_vr_cooperating(is_available); - if (!CheckAvailabilityHMIInterfaces(application_manager_, - HmiInterfaces::HMI_INTERFACE_VR)) { + if (!app_mngr::commands::CheckAvailabilityHMIInterfaces( + application_manager_, HmiInterfaces::HMI_INTERFACE_VR)) { LOG4CXX_INFO(logger_, "HmiInterfaces::HMI_INTERFACE_VR isn't available"); return; diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/vr_is_ready_response.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/vr_is_ready_response.cc index b2d1be019a..0c4d07779b 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/vr_is_ready_response.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/vr_is_ready_response.cc @@ -31,12 +31,14 @@ */ #include "sdl_rpc_plugin/commands/hmi/vr_is_ready_response.h" -namespace application_manager { +namespace sdl_rpc_plugin { +using namespace application_manager; namespace commands { -VRIsReadyResponse::VRIsReadyResponse(const MessageSharedPtr& message, - ApplicationManager& application_manager) +VRIsReadyResponse::VRIsReadyResponse( + const application_manager::commands::MessageSharedPtr& message, + ApplicationManager& application_manager) : ResponseFromHMI(message, application_manager) {} VRIsReadyResponse::~VRIsReadyResponse() {} diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/vr_perform_interaction_request.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/vr_perform_interaction_request.cc index ec341d2498..728f8a734b 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/vr_perform_interaction_request.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/vr_perform_interaction_request.cc @@ -32,12 +32,14 @@ #include "sdl_rpc_plugin/commands/hmi/vr_perform_interaction_request.h" -namespace application_manager { +namespace sdl_rpc_plugin { +using namespace application_manager; namespace commands { VRPerformInteractionRequest::VRPerformInteractionRequest( - const MessageSharedPtr& message, ApplicationManager& application_manager) + const application_manager::commands::MessageSharedPtr& message, + ApplicationManager& application_manager) : RequestToHMI(message, application_manager) {} VRPerformInteractionRequest::~VRPerformInteractionRequest() {} diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/vr_perform_interaction_response.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/vr_perform_interaction_response.cc index 6d2dab9a6e..0740f07d98 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/vr_perform_interaction_response.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/vr_perform_interaction_response.cc @@ -32,12 +32,14 @@ #include "sdl_rpc_plugin/commands/hmi/vr_perform_interaction_response.h" #include "application_manager/event_engine/event.h" -namespace application_manager { +namespace sdl_rpc_plugin { +using namespace application_manager; namespace commands { VRPerformInteractionResponse::VRPerformInteractionResponse( - const MessageSharedPtr& message, ApplicationManager& application_manager) + const application_manager::commands::MessageSharedPtr& message, + ApplicationManager& application_manager) : ResponseFromHMI(message, application_manager) {} VRPerformInteractionResponse::~VRPerformInteractionResponse() {} 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() {} |