diff options
Diffstat (limited to 'src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile')
100 files changed, 2143 insertions, 157 deletions
diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/add_command_request.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/add_command_request.cc index a57d222765..89adc2ca2c 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 @@ -32,13 +32,44 @@ */ #include "sdl_rpc_plugin/commands/mobile/add_command_request.h" + +#include <bits/stdint-intn.h> +#include <bits/stdint-uintn.h> +#include <log4cxx/helpers/objectptr.h> +#include <log4cxx/logger.h> +#include <stddef.h> +#include <algorithm> +#include <map> +#include <memory> +#include <ostream> #include <string> +#include <utility> #include "application_manager/application.h" +#include "application_manager/application_manager.h" +#include "application_manager/commands/command_impl.h" +#include "application_manager/event_engine/event.h" +#include "application_manager/help_prompt_manager.h" +#include "application_manager/hmi_interfaces.h" #include "application_manager/message_helper.h" +#include "application_manager/smart_object_keys.h" +#include "interfaces/MOBILE_API.h" +#include "smart_objects/smart_object.h" #include "utils/custom_string.h" -#include "utils/file_system.h" +#include "utils/data_accessor.h" #include "utils/helpers.h" +#include "utils/logger.h" + +namespace application_manager { +class HMICapabilities; +namespace rpc_service { +class RPCService; +} // namespace rpc_service +} // namespace application_manager + +namespace policy { +class PolicyHandlerInterface; +} // namespace policy namespace sdl_rpc_plugin { using namespace application_manager; 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 24ff3b5a28..aec03ce30b 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 @@ -32,7 +32,19 @@ */ #include "sdl_rpc_plugin/commands/mobile/add_command_response.h" + +#include "application_manager/commands/command_impl.h" #include "application_manager/rpc_service.h" +#include "utils/logger.h" + +namespace application_manager { +class ApplicationManager; +class HMICapabilities; +} // namespace application_manager + +namespace policy { +class PolicyHandlerInterface; +} // namespace policy namespace sdl_rpc_plugin { using namespace application_manager; 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 3541f7f7cb..b6ada8539b 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 @@ -33,9 +33,35 @@ #include "sdl_rpc_plugin/commands/mobile/add_sub_menu_request.h" +#include <bits/stdint-intn.h> +#include <log4cxx/helpers/objectptr.h> +#include <log4cxx/logger.h> +#include <stddef.h> +#include <memory> +#include <ostream> + #include "application_manager/application.h" +#include "application_manager/application_manager.h" +#include "application_manager/commands/command_impl.h" +#include "application_manager/event_engine/event.h" +#include "application_manager/hmi_interfaces.h" #include "application_manager/message_helper.h" -#include "utils/helpers.h" +#include "application_manager/smart_object_keys.h" +#include "interfaces/HMI_API.h" +#include "interfaces/MOBILE_API.h" +#include "smart_objects/smart_object.h" +#include "utils/logger.h" + +namespace application_manager { +class HMICapabilities; +namespace rpc_service { +class RPCService; +} // namespace rpc_service +} // namespace application_manager + +namespace policy { +class PolicyHandlerInterface; +} // namespace policy namespace sdl_rpc_plugin { using namespace application_manager; 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 d91f13f1df..051bb16118 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 @@ -32,8 +32,18 @@ */ #include "sdl_rpc_plugin/commands/mobile/add_sub_menu_response.h" -#include "application_manager/application_impl.h" + +#include "application_manager/commands/command_impl.h" #include "application_manager/rpc_service.h" +#include "utils/logger.h" + +namespace application_manager { +class ApplicationManager; +class HMICapabilities; +} // namespace application_manager +namespace policy { +class PolicyHandlerInterface; +} // namespace policy namespace sdl_rpc_plugin { using namespace application_manager; 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 9f36f260ae..423c3545d5 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 @@ -26,11 +26,33 @@ */ #include "sdl_rpc_plugin/commands/mobile/alert_maneuver_request.h" + +#include <log4cxx/helpers/objectptr.h> +#include <log4cxx/logger.h> #include <cstring> -#include <string> -#include "application_manager/application_impl.h" +#include <memory> +#include <vector> + +#include "application_manager/application.h" +#include "application_manager/application_manager.h" +#include "application_manager/commands/command_impl.h" +#include "application_manager/event_engine/event.h" +#include "application_manager/hmi_interfaces.h" #include "application_manager/message_helper.h" -#include "application_manager/policies/policy_handler.h" +#include "application_manager/smart_object_keys.h" +#include "smart_objects/smart_object.h" +#include "utils/logger.h" + +namespace application_manager { +class HMICapabilities; +namespace rpc_service { +class RPCService; +} // namespace rpc_service +} // namespace application_manager + +namespace policy { +class PolicyHandlerInterface; +} // namespace policy namespace sdl_rpc_plugin { using namespace application_manager; 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 97c93d7455..5702047222 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 @@ -32,8 +32,19 @@ */ #include "sdl_rpc_plugin/commands/mobile/alert_maneuver_response.h" + +#include "application_manager/commands/command_impl.h" #include "application_manager/rpc_service.h" -#include "interfaces/HMI_API.h" +#include "utils/logger.h" + +namespace application_manager { +class ApplicationManager; +class HMICapabilities; +} // namespace application_manager + +namespace policy { +class PolicyHandlerInterface; +} // namespace policy namespace sdl_rpc_plugin { using namespace application_manager; 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 7173aaf2d0..38eb62709d 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 @@ -33,14 +33,31 @@ #include "sdl_rpc_plugin/commands/mobile/alert_request.h" +#include <log4cxx/helpers/objectptr.h> +#include <log4cxx/logger.h> #include <string.h> - -#include "application_manager/application_impl.h" +#include <memory> +#include <ostream> + +#include "application_manager/application.h" +#include "application_manager/application_manager.h" +#include "application_manager/commands/command_impl.h" +#include "application_manager/event_engine/event.h" +#include "application_manager/hmi_interfaces.h" #include "application_manager/message_helper.h" - -#include "application_manager/policies/policy_handler.h" +#include "application_manager/smart_object_keys.h" #include "smart_objects/smart_object.h" -#include "utils/helpers.h" +#include "utils/logger.h" + +namespace application_manager { +class HMICapabilities; +namespace rpc_service { +class RPCService; +} // namespace rpc_service +} // namespace application_manager +namespace policy { +class PolicyHandlerInterface; +} // namespace policy namespace sdl_rpc_plugin { using namespace application_manager; @@ -380,7 +397,6 @@ void AlertRequest::SendSpeakRequest(int32_t app_id, bool tts_chunks_exists, size_t length_tts_chunks) { LOG4CXX_AUTO_TRACE(logger_); - using namespace hmi_apis; using namespace smart_objects; // crate HMI speak request SmartObject msg_params = smart_objects::SmartObject(SmartType_Map); @@ -395,9 +411,9 @@ void AlertRequest::SendSpeakRequest(int32_t app_id, msg_params[strings::play_tone] = true; } msg_params[strings::app_id] = app_id; - msg_params[hmi_request::speak_type] = Common_MethodName::ALERT; + msg_params[hmi_request::speak_type] = hmi_apis::Common_MethodName::ALERT; StartAwaitForInterface(HmiInterfaces::HMI_INTERFACE_TTS); - SendHMIRequest(FunctionID::TTS_Speak, &msg_params, true); + SendHMIRequest(hmi_apis::FunctionID::TTS_Speak, &msg_params, true); } bool AlertRequest::CheckStringsOfAlertRequest() { 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 b709d13958..588797ff18 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 @@ -32,10 +32,18 @@ */ #include "sdl_rpc_plugin/commands/mobile/alert_response.h" -#include "application_manager/application_impl.h" + +#include "application_manager/commands/command_impl.h" #include "application_manager/rpc_service.h" -#include "interfaces/HMI_API.h" -#include "interfaces/MOBILE_API.h" +#include "utils/logger.h" + +namespace application_manager { +class ApplicationManager; +class HMICapabilities; +} // namespace application_manager +namespace policy { +class PolicyHandlerInterface; +} // namespace policy namespace sdl_rpc_plugin { using namespace application_manager; 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 ef81babdd6..ab810e1e54 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 @@ -32,13 +32,45 @@ */ #include "sdl_rpc_plugin/commands/mobile/change_registration_request.h" + +#include <bits/stdint-uintn.h> +#include <log4cxx/helpers/objectptr.h> +#include <log4cxx/logger.h> #include <string.h> + #include <algorithm> -#include "application_manager/application_impl.h" +#include <memory> +#include <ostream> +#include <set> +#include <string> +#include <vector> + #include "application_manager/application_manager.h" +#include "application_manager/commands/command_impl.h" +#include "application_manager/event_engine/event.h" +#include "application_manager/hmi_capabilities.h" +#include "application_manager/hmi_interfaces.h" #include "application_manager/message_helper.h" +#include "application_manager/policies/policy_handler_interface.h" +#include "application_manager/smart_object_keys.h" #include "interfaces/HMI_API.h" #include "interfaces/MOBILE_API.h" +#include "policy/policy_types.h" +#include "policy/usage_statistics/counter.h" +#include "policy/usage_statistics/statistics_manager.h" +#include "utils/data_accessor.h" +#include "utils/helpers.h" +#include "utils/logger.h" + +namespace application_manager { +namespace rpc_service { +class RPCService; + +class RPCService; + +class RPCService; +} // namespace rpc_service +} // namespace application_manager namespace { namespace custom_str = utils::custom_string; 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 78c60bc746..ab5f9c9a0d 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 @@ -32,7 +32,19 @@ */ #include "sdl_rpc_plugin/commands/mobile/change_registration_response.h" + +#include "application_manager/commands/command_impl.h" #include "application_manager/rpc_service.h" +#include "utils/logger.h" + +namespace application_manager { +class ApplicationManager; +class HMICapabilities; +} // namespace application_manager + +namespace policy { +class PolicyHandlerInterface; +} // namespace policy namespace sdl_rpc_plugin { using namespace application_manager; 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 258aefd63f..330f7a2b1e 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 @@ -32,15 +32,36 @@ */ #include "sdl_rpc_plugin/commands/mobile/create_interaction_choice_set_request.h" -#include <algorithm> -#include <cstring> -#include <string> + +#include <log4cxx/helpers/objectptr.h> +#include <log4cxx/logger.h> +#include <strings.h> + +#include <cstdint> +#include <memory> +#include <ostream> +#include <set> +#include <utility> #include <vector> -#include "application_manager/application_impl.h" +#include "application_manager/application_manager.h" +#include "application_manager/commands/command_impl.h" +#include "application_manager/event_engine/event.h" +#include "application_manager/hmi_interfaces.h" #include "application_manager/message_helper.h" -#include "utils/gen_hash.h" #include "utils/helpers.h" +#include "utils/logger.h" + +namespace application_manager { +class HMICapabilities; +namespace rpc_service { +class RPCService; +} // namespace rpc_service +} // namespace application_manager + +namespace policy { +class PolicyHandlerInterface; +} // namespace policy const char* kInvalidImageWarningInfo = "Requested image(s) not found."; 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 43dba2f238..31bbb19ec4 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 @@ -33,8 +33,26 @@ #include "sdl_rpc_plugin/commands/mobile/create_interaction_choice_set_response.h" -#include "application_manager/application_impl.h" -#include "interfaces/MOBILE_API.h" +#include <log4cxx/helpers/objectptr.h> +#include <log4cxx/logger.h> +#include <memory> + +#include "application_manager/commands/command_impl.h" +#include "application_manager/smart_object_keys.h" +#include "smart_objects/smart_object.h" +#include "utils/logger.h" + +namespace application_manager { +class ApplicationManager; +class HMICapabilities; +namespace rpc_service { +class RPCService; +} // namespace rpc_service +} // namespace application_manager + +namespace policy { +class PolicyHandlerInterface; +} // namespace policy namespace sdl_rpc_plugin { using namespace application_manager; 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 363b14f92f..e011eac2b7 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 @@ -33,11 +33,39 @@ #include "sdl_rpc_plugin/commands/mobile/delete_command_request.h" -#include "application_manager/application_impl.h" +#include <bits/stdint-intn.h> +#include <bits/stdint-uintn.h> +#include <log4cxx/helpers/objectptr.h> +#include <log4cxx/logger.h> +#include <stddef.h> +#include <memory> +#include <ostream> +#include <string> + +#include "application_manager/application.h" +#include "application_manager/application_manager.h" +#include "application_manager/commands/command_impl.h" +#include "application_manager/event_engine/event.h" +#include "application_manager/help_prompt_manager.h" +#include "application_manager/hmi_interfaces.h" #include "application_manager/message_helper.h" +#include "application_manager/smart_object_keys.h" #include "interfaces/HMI_API.h" #include "interfaces/MOBILE_API.h" +#include "smart_objects/smart_object.h" #include "utils/helpers.h" +#include "utils/logger.h" + +namespace application_manager { +class HMICapabilities; +namespace rpc_service { +class RPCService; +} // namespace rpc_service +} // namespace application_manager + +namespace policy { +class PolicyHandlerInterface; +} // namespace policy namespace sdl_rpc_plugin { using namespace application_manager; 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 919385ee50..dcd2ef9b68 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 @@ -32,7 +32,19 @@ */ #include "sdl_rpc_plugin/commands/mobile/delete_command_response.h" + +#include "application_manager/commands/command_impl.h" #include "application_manager/rpc_service.h" +#include "utils/logger.h" + +namespace application_manager { +class ApplicationManager; +class HMICapabilities; +} // namespace application_manager + +namespace policy { +class PolicyHandlerInterface; +} // namespace policy namespace sdl_rpc_plugin { using namespace application_manager; 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 b2c9a3377f..6a5be8cdf6 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 @@ -33,9 +33,33 @@ #include "sdl_rpc_plugin/commands/mobile/delete_file_request.h" -#include "application_manager/application_impl.h" - +#include <log4cxx/helpers/objectptr.h> +#include <log4cxx/logger.h> +#include <iosfwd> +#include <memory> +#include <string> + +#include "application_manager/application.h" +#include "application_manager/application_manager.h" +#include "application_manager/application_manager_settings.h" +#include "application_manager/commands/command_impl.h" +#include "application_manager/smart_object_keys.h" +#include "interfaces/HMI_API.h" +#include "interfaces/MOBILE_API.h" +#include "smart_objects/smart_object.h" #include "utils/file_system.h" +#include "utils/logger.h" + +namespace application_manager { +class HMICapabilities; +namespace rpc_service { +class RPCService; +} // namespace rpc_service +} // namespace application_manager + +namespace policy { +class PolicyHandlerInterface; +} // namespace policy namespace sdl_rpc_plugin { using namespace application_manager; 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 732a1e56b5..8e96f6649d 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 @@ -33,7 +33,29 @@ #include "sdl_rpc_plugin/commands/mobile/delete_file_response.h" -#include "application_manager/application_impl.h" +#include <bits/stdint-uintn.h> +#include <log4cxx/helpers/objectptr.h> +#include <log4cxx/logger.h> +#include <memory> + +#include "application_manager/application.h" +#include "application_manager/application_manager.h" +#include "application_manager/commands/command_impl.h" +#include "application_manager/smart_object_keys.h" +#include "interfaces/MOBILE_API.h" +#include "smart_objects/smart_object.h" +#include "utils/logger.h" + +namespace application_manager { +class HMICapabilities; +namespace rpc_service { +class RPCService; +} // namespace rpc_service +} // namespace application_manager + +namespace policy { +class PolicyHandlerInterface; +} // namespace policy namespace sdl_rpc_plugin { using namespace application_manager; 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 7950595b1c..b413a0912d 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 @@ -33,10 +33,34 @@ #include "sdl_rpc_plugin/commands/mobile/delete_interaction_choice_set_request.h" -#include "application_manager/application_impl.h" -#include "application_manager/message_helper.h" +#include <bits/stdint-intn.h> +#include <bits/stdint-uintn.h> +#include <log4cxx/helpers/objectptr.h> +#include <log4cxx/logger.h> +#include <map> +#include <memory> +#include <ostream> +#include <utility> + +#include "application_manager/application_manager.h" +#include "application_manager/commands/command_impl.h" +#include "application_manager/smart_object_keys.h" #include "interfaces/HMI_API.h" #include "interfaces/MOBILE_API.h" +#include "smart_objects/smart_object.h" +#include "utils/data_accessor.h" +#include "utils/logger.h" + +namespace application_manager { +class HMICapabilities; +namespace rpc_service { +class RPCService; +} // namespace rpc_service +} // namespace application_manager + +namespace policy { +class PolicyHandlerInterface; +} // namespace policy namespace sdl_rpc_plugin { using namespace application_manager; 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 cf5ad3a2c2..1be1b67815 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 @@ -33,9 +33,28 @@ #include "sdl_rpc_plugin/commands/mobile/delete_interaction_choice_set_response.h" -#include "application_manager/application_impl.h" +#include <bits/stdint-intn.h> +#include <log4cxx/helpers/objectptr.h> +#include <log4cxx/logger.h> +#include <memory> + +#include "application_manager/commands/command_impl.h" +#include "application_manager/smart_object_keys.h" #include "interfaces/HMI_API.h" -#include "interfaces/MOBILE_API.h" +#include "smart_objects/smart_object.h" +#include "utils/logger.h" + +namespace application_manager { +class ApplicationManager; +class HMICapabilities; +namespace rpc_service { +class RPCService; +} // namespace rpc_service +} // namespace application_manager + +namespace policy { +class PolicyHandlerInterface; +} // namespace policy namespace sdl_rpc_plugin { using namespace application_manager; 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 6aaa2406e8..80ecae04f6 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 @@ -33,10 +33,39 @@ #include "sdl_rpc_plugin/commands/mobile/delete_sub_menu_request.h" -#include "application_manager/application_impl.h" +#include <bits/stdint-intn.h> +#include <bits/stdint-uintn.h> +#include <log4cxx/helpers/objectptr.h> +#include <log4cxx/logger.h> +#include <stddef.h> +#include <map> +#include <memory> +#include <ostream> +#include <utility> + +#include "application_manager/application_manager.h" +#include "application_manager/commands/command_impl.h" +#include "application_manager/event_engine/event.h" +#include "application_manager/help_prompt_manager.h" +#include "application_manager/hmi_interfaces.h" #include "application_manager/message_helper.h" +#include "application_manager/smart_object_keys.h" #include "interfaces/HMI_API.h" -#include "utils/helpers.h" +#include "interfaces/MOBILE_API.h" +#include "smart_objects/smart_object.h" +#include "utils/data_accessor.h" +#include "utils/logger.h" + +namespace application_manager { +class HMICapabilities; +namespace rpc_service { +class RPCService; +} // namespace rpc_service +} // namespace application_manager + +namespace policy { +class PolicyHandlerInterface; +} // namespace policy namespace sdl_rpc_plugin { using namespace application_manager; 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 3cefef5c38..08223f2326 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 @@ -32,7 +32,19 @@ */ #include "sdl_rpc_plugin/commands/mobile/delete_sub_menu_response.h" + +#include "application_manager/commands/command_impl.h" #include "application_manager/rpc_service.h" +#include "utils/logger.h" + +namespace application_manager { +class ApplicationManager; +class HMICapabilities; +} // namespace application_manager + +namespace policy { +class PolicyHandlerInterface; +} // namespace policy namespace sdl_rpc_plugin { using namespace application_manager; 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 1de7a3ea03..86c9ce34e8 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 @@ -31,10 +31,32 @@ */ #include "sdl_rpc_plugin/commands/mobile/dial_number_request.h" -#include <algorithm> -#include <string> -#include "application_manager/application_impl.h" +#include <log4cxx/helpers/objectptr.h> +#include <log4cxx/logger.h> +#include <stddef.h> +#include <memory> + +#include "application_manager/application.h" +#include "application_manager/application_manager.h" +#include "application_manager/commands/command_impl.h" +#include "application_manager/event_engine/event.h" +#include "application_manager/hmi_interfaces.h" +#include "application_manager/smart_object_keys.h" +#include "interfaces/HMI_API.h" +#include "interfaces/MOBILE_API.h" +#include "smart_objects/smart_object.h" +#include "utils/logger.h" + +namespace application_manager { +class HMICapabilities; +namespace rpc_service { +class RPCService; +} // namespace rpc_service +} // namespace application_manager +namespace policy { +class PolicyHandlerInterface; +} // namespace policy namespace sdl_rpc_plugin { using namespace application_manager; 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 4385b3fe90..8b1263901a 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 @@ -31,7 +31,19 @@ */ #include "sdl_rpc_plugin/commands/mobile/dial_number_response.h" + +#include "application_manager/commands/command_impl.h" #include "application_manager/rpc_service.h" +#include "utils/logger.h" + +namespace application_manager { +class ApplicationManager; +class HMICapabilities; +} // namespace application_manager + +namespace policy { +class PolicyHandlerInterface; +} // namespace policy namespace sdl_rpc_plugin { using namespace application_manager; 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 66ff7b48d5..271a9a5d19 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 @@ -32,7 +32,33 @@ */ #include "sdl_rpc_plugin/commands/mobile/end_audio_pass_thru_request.h" + +#include <bits/stdint-uintn.h> +#include <log4cxx/helpers/objectptr.h> +#include <log4cxx/logger.h> +#include <stddef.h> +#include <iosfwd> + +#include "application_manager/application_manager.h" +#include "application_manager/commands/command_impl.h" +#include "application_manager/event_engine/event.h" +#include "application_manager/hmi_interfaces.h" #include "application_manager/message_helper.h" +#include "application_manager/smart_object_keys.h" +#include "interfaces/HMI_API.h" +#include "smart_objects/smart_object.h" +#include "utils/logger.h" + +namespace application_manager { +class HMICapabilities; +namespace rpc_service { +class RPCService; +} // namespace rpc_service +} // namespace application_manager + +namespace policy { +class PolicyHandlerInterface; +} // namespace policy namespace sdl_rpc_plugin { using namespace application_manager; 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 6c9bd05e09..1519006667 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 @@ -32,7 +32,19 @@ */ #include "sdl_rpc_plugin/commands/mobile/end_audio_pass_thru_response.h" + +#include "application_manager/commands/command_impl.h" #include "application_manager/rpc_service.h" +#include "utils/logger.h" + +namespace application_manager { +class ApplicationManager; +class HMICapabilities; +} // namespace application_manager + +namespace policy { +class PolicyHandlerInterface; +} // namespace policy namespace sdl_rpc_plugin { using namespace application_manager; 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 fda6cc64e5..7d61ac99af 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 @@ -33,7 +33,12 @@ #include "sdl_rpc_plugin/commands/mobile/generic_response.h" -#include "application_manager/application_impl.h" +#include <memory> + +#include "application_manager/message.h" +#include "application_manager/smart_object_keys.h" +#include "interfaces/MOBILE_API.h" +#include "smart_objects/smart_object.h" namespace sdl_rpc_plugin { using namespace application_manager; diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/get_cloud_app_properties_request.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/get_cloud_app_properties_request.cc index 34ed30c243..6e80581d9b 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/get_cloud_app_properties_request.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/get_cloud_app_properties_request.cc @@ -1,5 +1,47 @@ #include "sdl_rpc_plugin/commands/mobile/get_cloud_app_properties_request.h" +#include <log4cxx/helpers/objectptr.h> +#include <log4cxx/logger.h> +#include <stddef.h> +#include <iosfwd> +#include <memory> + +#include "application_manager/application.h" +#include "application_manager/application_manager.h" +#include "application_manager/commands/command_impl.h" +#include "application_manager/policies/policy_handler_interface.h" +#include "application_manager/smart_object_keys.h" +#include "interfaces/MOBILE_API.h" +#include "policy/policy_types.h" +#include "smart_objects/smart_object.h" +#include "utils/logger.h" + +namespace application_manager { +class HMICapabilities; +namespace event_engine { +class Event; +} // namespace event_engine +namespace rpc_service { +class RPCService; +} // namespace rpc_service + +class HMICapabilities; +namespace event_engine { +class Event; +} // namespace event_engine +namespace rpc_service { +class RPCService; +} // namespace rpc_service + +class HMICapabilities; +namespace event_engine { +class Event; +} // namespace event_engine +namespace rpc_service { +class RPCService; +} // namespace rpc_service +} // namespace application_manager + namespace sdl_rpc_plugin { using namespace application_manager; diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/get_cloud_app_properties_response.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/get_cloud_app_properties_response.cc index f50897303a..96f7c69781 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/get_cloud_app_properties_response.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/get_cloud_app_properties_response.cc @@ -1,6 +1,16 @@ #include "sdl_rpc_plugin/commands/mobile/get_cloud_app_properties_response.h" -#include "application_manager/application_manager.h" + +#include "application_manager/commands/command_impl.h" #include "application_manager/rpc_service.h" +#include "utils/logger.h" + +namespace application_manager { +class ApplicationManager; +class HMICapabilities; +} // namespace application_manager +namespace policy { +class PolicyHandlerInterface; +} // namespace policy namespace sdl_rpc_plugin { using namespace application_manager; diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/get_file_request.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/get_file_request.cc index 75263494c2..3b574c80ce 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/get_file_request.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/get_file_request.cc @@ -32,13 +32,42 @@ #include "sdl_rpc_plugin/commands/mobile/get_file_request.h" +#include <log4cxx/helpers/objectptr.h> +#include <log4cxx/logger.h> +#include <stddef.h> +#include <algorithm> #include <boost/crc.hpp> +#include <cstdint> +#include <memory> +#include <ostream> +#include <string> +#include <vector> + #include "application_manager/app_service_manager.h" -#include "application_manager/application_impl.h" +#include "application_manager/application.h" +#include "application_manager/application_manager.h" +#include "application_manager/application_manager_settings.h" +#include "application_manager/commands/command_impl.h" +#include "application_manager/event_engine/event.h" +#include "application_manager/hmi_interfaces.h" #include "application_manager/message_helper.h" -#include "application_manager/rpc_service.h" +#include "application_manager/smart_object_keys.h" +#include "interfaces/HMI_API.h" #include "interfaces/MOBILE_API.h" +#include "smart_objects/smart_object.h" #include "utils/file_system.h" +#include "utils/logger.h" + +namespace application_manager { +class HMICapabilities; +namespace rpc_service { +class RPCService; +} // namespace rpc_service +} // namespace application_manager + +namespace policy { +class PolicyHandlerInterface; +} // namespace policy namespace { /** diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/get_file_response.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/get_file_response.cc index 2ea8dde02a..9f2de0dfc2 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/get_file_response.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/get_file_response.cc @@ -31,9 +31,21 @@ */ #include "sdl_rpc_plugin/commands/mobile/get_file_response.h" -#include "application_manager/application_impl.h" + +#include <log4cxx/helpers/objectptr.h> +#include <log4cxx/logger.h> + +#include "application_manager/commands/command_impl.h" #include "application_manager/rpc_service.h" -#include "interfaces/MOBILE_API.h" +#include "utils/logger.h" + +namespace application_manager { +class ApplicationManager; +class HMICapabilities; +} // namespace application_manager +namespace policy { +class PolicyHandlerInterface; +} // namespace policy namespace sdl_rpc_plugin { using namespace application_manager; 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 4b34db9934..8a81d7d033 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 @@ -32,10 +32,57 @@ #include "sdl_rpc_plugin/commands/mobile/get_system_capability_request.h" -#include <set> +#include <log4cxx/helpers/objectptr.h> +#include <log4cxx/logger.h> +#include <stddef.h> +#include <memory> +#include <ostream> + #include "application_manager/app_service_manager.h" +#include "application_manager/application.h" +#include "application_manager/application_manager.h" +#include "application_manager/commands/command_impl.h" +#include "application_manager/hmi_capabilities.h" #include "application_manager/message_helper.h" +#include "application_manager/smart_object_keys.h" +#include "interfaces/MOBILE_API.h" #include "sdl_rpc_plugin/extensions/system_capability_app_extension.h" +#include "smart_objects/smart_object.h" +#include "utils/logger.h" + +namespace application_manager { +namespace event_engine { +class Event; +} // namespace event_engine +} // namespace application_manager +namespace policy { +class PolicyHandlerInterface; +} // namespace policy + +namespace application_manager { +namespace rpc_service { +class RPCService; + +class RPCService; +} // namespace rpc_service +} // namespace application_manager +namespace policy { +class PolicyHandlerInterface; +} // namespace policy + +namespace application_manager { +namespace event_engine { +class Event; + +class Event; +} // namespace event_engine +namespace rpc_service { +class RPCService; +} // namespace rpc_service +} // namespace application_manager +namespace policy { +class PolicyHandlerInterface; +} // namespace policy namespace sdl_rpc_plugin { using namespace application_manager; 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 5df0c72607..4aef7526ad 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 @@ -31,8 +31,18 @@ */ #include "sdl_rpc_plugin/commands/mobile/get_system_capability_response.h" -#include "application_manager/application_manager.h" + +#include "application_manager/commands/command_impl.h" #include "application_manager/rpc_service.h" +#include "utils/logger.h" + +namespace application_manager { +class ApplicationManager; +class HMICapabilities; +} // namespace application_manager +namespace policy { +class PolicyHandlerInterface; +} // namespace policy namespace sdl_rpc_plugin { using namespace application_manager; 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 cd7d7a37b7..5cdf380c41 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 @@ -31,8 +31,35 @@ */ #include "sdl_rpc_plugin/commands/mobile/get_way_points_request.h" + +#include <log4cxx/helpers/objectptr.h> +#include <log4cxx/logger.h> +#include <stddef.h> +#include <memory> +#include <ostream> + +#include "application_manager/application.h" #include "application_manager/application_manager.h" +#include "application_manager/commands/command_impl.h" +#include "application_manager/event_engine/event.h" +#include "application_manager/hmi_interfaces.h" #include "application_manager/message_helper.h" +#include "application_manager/smart_object_keys.h" +#include "interfaces/HMI_API.h" +#include "interfaces/MOBILE_API.h" +#include "smart_objects/smart_object.h" +#include "utils/logger.h" + +namespace application_manager { +class HMICapabilities; +namespace rpc_service { +class RPCService; +} // namespace rpc_service +} // namespace application_manager + +namespace policy { +class PolicyHandlerInterface; +} // namespace policy namespace sdl_rpc_plugin { using namespace application_manager; 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 e481c926b8..87a5860b7e 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 @@ -31,8 +31,18 @@ */ #include "sdl_rpc_plugin/commands/mobile/get_way_points_response.h" -#include "application_manager/application_manager.h" + +#include "application_manager/commands/command_impl.h" #include "application_manager/rpc_service.h" +#include "utils/logger.h" + +namespace application_manager { +class ApplicationManager; +class HMICapabilities; +} // namespace application_manager +namespace policy { +class PolicyHandlerInterface; +} // namespace policy namespace sdl_rpc_plugin { using namespace application_manager; 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 46a39513d5..a85d6f34ca 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 @@ -32,12 +32,38 @@ */ #include "sdl_rpc_plugin/commands/mobile/list_files_request.h" -#include <string> - -#include "application_manager/application_impl.h" -#include "sdl_rpc_plugin/mobile_command_factory.h" +#include <bits/stdint-intn.h> +#include <bits/stdint-uintn.h> +#include <log4cxx/helpers/objectptr.h> +#include <log4cxx/logger.h> +#include <stddef.h> +#include <iosfwd> +#include <memory> +#include <string> +#include <vector> + +#include "application_manager/application.h" +#include "application_manager/application_manager.h" +#include "application_manager/application_manager_settings.h" +#include "application_manager/commands/command_impl.h" +#include "application_manager/message.h" +#include "application_manager/smart_object_keys.h" +#include "interfaces/MOBILE_API.h" +#include "smart_objects/smart_object.h" #include "utils/file_system.h" +#include "utils/logger.h" + +namespace application_manager { +class HMICapabilities; +namespace rpc_service { +class RPCService; +} // namespace rpc_service +} // namespace application_manager + +namespace policy { +class PolicyHandlerInterface; +} // namespace policy namespace sdl_rpc_plugin { using namespace application_manager; 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 ffa8a443d5..def2e12db6 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 @@ -32,8 +32,18 @@ */ #include "sdl_rpc_plugin/commands/mobile/list_files_response.h" -#include "application_manager/application_impl.h" + +#include "application_manager/commands/command_impl.h" #include "application_manager/rpc_service.h" +#include "utils/logger.h" + +namespace application_manager { +class ApplicationManager; +class HMICapabilities; +} // namespace application_manager +namespace policy { +class PolicyHandlerInterface; +} // namespace policy namespace sdl_rpc_plugin { using namespace application_manager; 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 5714043a51..15f4ee5c8e 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 @@ -32,8 +32,20 @@ */ #include "sdl_rpc_plugin/commands/mobile/on_app_interface_unregistered_notification.h" -#include "application_manager/message.h" -#include "interfaces/MOBILE_API.h" + +#include "application_manager/commands/command_impl.h" +#include "utils/logger.h" + +namespace application_manager { +class ApplicationManager; +class HMICapabilities; +namespace rpc_service { +class RPCService; +} // namespace rpc_service +} // namespace application_manager +namespace policy { +class PolicyHandlerInterface; +} // namespace policy namespace sdl_rpc_plugin { using namespace application_manager; 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 3088c7df33..df8dd2d716 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,6 +33,21 @@ #include "sdl_rpc_plugin/commands/mobile/on_audio_pass_thru_notification.h" +#include "application_manager/commands/command_impl.h" +#include "utils/logger.h" + +namespace application_manager { +class ApplicationManager; +class HMICapabilities; +namespace rpc_service { +class RPCService; +} // namespace rpc_service +} // namespace application_manager + +namespace policy { +class PolicyHandlerInterface; +} // namespace policy + 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/on_button_event_notification.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/on_button_event_notification.cc index f0368a742d..1d83cc473e 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 @@ -33,8 +33,32 @@ #include "sdl_rpc_plugin/commands/mobile/on_button_event_notification.h" -#include "application_manager/application_impl.h" +#include <bits/stdint-intn.h> +#include <bits/stdint-uintn.h> +#include <log4cxx/helpers/objectptr.h> +#include <log4cxx/logger.h> +#include <memory> +#include <ostream> +#include <vector> + +#include "application_manager/application_manager.h" +#include "application_manager/commands/command_impl.h" +#include "application_manager/smart_object_keys.h" #include "interfaces/MOBILE_API.h" +#include "smart_objects/smart_object.h" +#include "utils/logger.h" +#include "utils/semantic_version.h" + +namespace application_manager { +class HMICapabilities; +namespace rpc_service { +class RPCService; +} // namespace rpc_service +} // namespace application_manager + +namespace policy { +class PolicyHandlerInterface; +} // namespace policy namespace sdl_rpc_plugin { using namespace application_manager; 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 7c77e29298..b49a897358 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 @@ -33,10 +33,33 @@ #include "sdl_rpc_plugin/commands/mobile/on_button_press_notification.h" -#include "application_manager/application_impl.h" +#include <bits/stdint-intn.h> +#include <bits/stdint-uintn.h> +#include <log4cxx/helpers/objectptr.h> +#include <log4cxx/logger.h> +#include <memory> +#include <ostream> +#include <vector> + +#include "application_manager/application_manager.h" +#include "application_manager/commands/command_impl.h" +#include "application_manager/smart_object_keys.h" #include "interfaces/MOBILE_API.h" +#include "smart_objects/smart_object.h" +#include "utils/logger.h" #include "utils/semantic_version.h" +namespace application_manager { +class HMICapabilities; +namespace rpc_service { +class RPCService; +} // namespace rpc_service +} // namespace application_manager + +namespace policy { +class PolicyHandlerInterface; +} // namespace policy + namespace sdl_rpc_plugin { using namespace application_manager; 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 9c7edf74e6..c4ee817856 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 @@ -33,7 +33,28 @@ #include "sdl_rpc_plugin/commands/mobile/on_command_notification.h" -#include "application_manager/application_impl.h" +#include <bits/stdint-uintn.h> +#include <log4cxx/helpers/objectptr.h> +#include <log4cxx/logger.h> +#include <memory> + +#include "application_manager/application.h" +#include "application_manager/application_manager.h" +#include "application_manager/commands/command_impl.h" +#include "application_manager/smart_object_keys.h" +#include "smart_objects/smart_object.h" +#include "utils/logger.h" + +namespace application_manager { +class HMICapabilities; +namespace rpc_service { +class RPCService; +} // namespace rpc_service +} // namespace application_manager + +namespace policy { +class PolicyHandlerInterface; +} // namespace policy namespace sdl_rpc_plugin { using namespace application_manager; 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 42a1928f2e..adbbc1224b 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 @@ -33,8 +33,20 @@ #include "sdl_rpc_plugin/commands/mobile/on_driver_distraction_notification.h" -#include "application_manager/application_impl.h" -#include "interfaces/MOBILE_API.h" +#include "application_manager/commands/command_impl.h" +#include "utils/logger.h" + +namespace application_manager { +class ApplicationManager; +class HMICapabilities; +namespace rpc_service { +class RPCService; +} // namespace rpc_service +} // namespace application_manager + +namespace policy { +class PolicyHandlerInterface; +} // namespace policy namespace sdl_rpc_plugin { using namespace application_manager; 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 c2ce2550b9..b6d8c4017b 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 @@ -34,9 +34,30 @@ #include "sdl_rpc_plugin/commands/mobile/on_hash_change_notification.h" -#include <string> -#include "application_manager/application_impl.h" -#include "interfaces/MOBILE_API.h" +#include <bits/stdint-intn.h> +#include <log4cxx/helpers/objectptr.h> +#include <log4cxx/logger.h> +#include <memory> +#include <ostream> + +#include "application_manager/application.h" +#include "application_manager/application_manager.h" +#include "application_manager/commands/command_impl.h" +#include "application_manager/message.h" +#include "application_manager/smart_object_keys.h" +#include "smart_objects/smart_object.h" +#include "utils/logger.h" + +namespace application_manager { +class HMICapabilities; +namespace rpc_service { +class RPCService; +} // namespace rpc_service +} // namespace application_manager + +namespace policy { +class PolicyHandlerInterface; +} // namespace policy namespace sdl_rpc_plugin { using namespace application_manager; 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 df3bce0154..a71b862094 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 @@ -33,9 +33,30 @@ #include "sdl_rpc_plugin/commands/mobile/on_hmi_status_notification.h" +#include <bits/stdint-intn.h> +#include <log4cxx/helpers/objectptr.h> +#include <log4cxx/logger.h> +#include <memory> + +#include "application_manager/application.h" +#include "application_manager/application_manager.h" +#include "application_manager/commands/command_impl.h" #include "application_manager/message.h" -#include "application_manager/message_helper.h" +#include "application_manager/smart_object_keys.h" #include "interfaces/MOBILE_API.h" +#include "smart_objects/smart_object.h" +#include "utils/logger.h" + +namespace application_manager { +class HMICapabilities; +namespace rpc_service { +class RPCService; +} // namespace rpc_service +} // namespace application_manager + +namespace policy { +class PolicyHandlerInterface; +} // namespace policy namespace sdl_rpc_plugin { using namespace application_manager; 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 28325a40f5..706635d886 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 @@ -32,8 +32,38 @@ */ #include "sdl_rpc_plugin/commands/mobile/on_hmi_status_notification_from_mobile.h" + +#include <bits/stdint-intn.h> +#include <log4cxx/helpers/objectptr.h> +#include <log4cxx/logger.h> + +#include <memory> +#include <ostream> +#include <set> + +#include "application_manager/application.h" +#include "application_manager/application_manager.h" +#include "application_manager/commands/command_impl.h" #include "application_manager/message.h" #include "application_manager/message_helper.h" +#include "application_manager/smart_object_keys.h" +#include "connection_handler/device.h" +#include "interfaces/MOBILE_API.h" +#include "protocol/common.h" +#include "smart_objects/smart_object.h" +#include "utils/data_accessor.h" +#include "utils/logger.h" + +namespace application_manager { +class HMICapabilities; +namespace rpc_service { +class RPCService; +} // namespace rpc_service +} // namespace application_manager + +namespace policy { +class PolicyHandlerInterface; +} // namespace policy namespace sdl_rpc_plugin { using namespace application_manager; 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 8ec8a86554..5b9ec82f71 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 @@ -33,8 +33,31 @@ #include "sdl_rpc_plugin/commands/mobile/on_keyboard_input_notification.h" -#include "application_manager/application_impl.h" +#include <log4cxx/helpers/objectptr.h> +#include <log4cxx/logger.h> + +#include <memory> +#include <set> + +#include "application_manager/application.h" +#include "application_manager/application_manager.h" +#include "application_manager/commands/command_impl.h" +#include "application_manager/smart_object_keys.h" #include "interfaces/MOBILE_API.h" +#include "smart_objects/smart_object.h" +#include "utils/data_accessor.h" +#include "utils/logger.h" + +namespace application_manager { +class HMICapabilities; +namespace rpc_service { +class RPCService; +} // namespace rpc_service +} // namespace application_manager + +namespace policy { +class PolicyHandlerInterface; +} // namespace policy namespace sdl_rpc_plugin { using namespace application_manager; 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 9605fd6074..d1b80f5108 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,6 +33,21 @@ #include "sdl_rpc_plugin/commands/mobile/on_language_change_notification.h" +#include "application_manager/commands/command_impl.h" +#include "utils/logger.h" + +namespace application_manager { +class ApplicationManager; +class HMICapabilities; +namespace rpc_service { +class RPCService; +} // namespace rpc_service +} // namespace application_manager + +namespace policy { +class PolicyHandlerInterface; +} // namespace policy + namespace sdl_rpc_plugin { using namespace application_manager; 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 f64ca34bf2..32676330e3 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 @@ -32,8 +32,20 @@ */ #include "sdl_rpc_plugin/commands/mobile/on_permissions_change_notification.h" -#include "application_manager/message.h" -#include "interfaces/MOBILE_API.h" + +#include "application_manager/commands/command_impl.h" +#include "utils/logger.h" + +namespace application_manager { +class ApplicationManager; +class HMICapabilities; +namespace rpc_service { +class RPCService; +} // namespace rpc_service +} // namespace application_manager +namespace policy { +class PolicyHandlerInterface; +} // namespace policy namespace sdl_rpc_plugin { using namespace application_manager; diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/on_system_capability_updated_notification.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/on_system_capability_updated_notification.cc index 515279c5f9..7db6dee83d 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/on_system_capability_updated_notification.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/on_system_capability_updated_notification.cc @@ -1,11 +1,49 @@ #include "sdl_rpc_plugin/commands/mobile/on_system_capability_updated_notification.h" +#include <log4cxx/helpers/objectptr.h> +#include <log4cxx/logger.h> +#include <stddef.h> +#include <algorithm> +#include <memory> +#include <ostream> +#include <string> + #include "application_manager/app_service_manager.h" +#include "application_manager/application.h" #include "application_manager/application_manager.h" +#include "application_manager/commands/command_impl.h" #include "application_manager/helpers/application_helper.h" +#include "application_manager/hmi_capabilities.h" #include "application_manager/message_helper.h" +#include "application_manager/smart_object_keys.h" +#include "interfaces/MOBILE_API.h" #include "sdl_rpc_plugin/extensions/system_capability_app_extension.h" #include "smart_objects/enum_schema_item.h" +#include "smart_objects/smart_object.h" +#include "utils/logger.h" + +namespace application_manager { +namespace rpc_service { +class RPCService; +} // namespace rpc_service +} // namespace application_manager + +namespace policy { +class PolicyHandlerInterface; + +class PolicyHandlerInterface; +} // namespace policy + +namespace application_manager { +namespace rpc_service { +class RPCService; + +class RPCService; +} // namespace rpc_service +} // namespace application_manager +namespace policy { +class PolicyHandlerInterface; +} // namespace policy namespace sdl_rpc_plugin { using namespace application_manager; 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 a85dec10bb..5ef4f0559b 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 @@ -31,15 +31,43 @@ */ #include "sdl_rpc_plugin/commands/mobile/on_system_request_notification.h" + +#include <log4cxx/helpers/objectptr.h> +#include <log4cxx/logger.h> #include <cstdio> #include <cstring> +#include <memory> +#include <ostream> #include <string> + +#include "application_manager/application.h" #include "application_manager/application_manager.h" +#include "application_manager/commands/command_impl.h" #include "application_manager/policies/policy_handler_interface.h" +#include "application_manager/smart_object_keys.h" #include "interfaces/MOBILE_API.h" #include "policy/policy_table/enums.h" +#include "smart_objects/smart_object.h" #include "utils/file_system.h" #include "utils/helpers.h" +#include "utils/logger.h" + +namespace application_manager { +class HMICapabilities; +namespace rpc_service { +class RPCService; +} // namespace rpc_service + +class HMICapabilities; +namespace rpc_service { +class RPCService; +} // namespace rpc_service + +class HMICapabilities; +namespace rpc_service { +class RPCService; +} // namespace rpc_service +} // namespace application_manager namespace sdl_rpc_plugin { using namespace application_manager; 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 ccbdab15c9..e7d213bbde 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 @@ -33,8 +33,29 @@ #include "sdl_rpc_plugin/commands/mobile/on_tbt_client_state_notification.h" -#include "application_manager/application_impl.h" +#include <bits/stdint-intn.h> +#include <memory> +#include <vector> + +#include "application_manager/application.h" +#include "application_manager/application_manager.h" +#include "application_manager/commands/command_impl.h" +#include "application_manager/message.h" +#include "application_manager/smart_object_keys.h" #include "interfaces/MOBILE_API.h" +#include "smart_objects/smart_object.h" +#include "utils/logger.h" + +namespace application_manager { +class HMICapabilities; +namespace rpc_service { +class RPCService; +} // namespace rpc_service +} // namespace application_manager + +namespace policy { +class PolicyHandlerInterface; +} // namespace policy namespace sdl_rpc_plugin { using namespace application_manager; 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 6ceb381d2e..f03c8bdf8e 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 @@ -33,7 +33,26 @@ #include "sdl_rpc_plugin/commands/mobile/on_touch_event_notification.h" -#include "application_manager/application_impl.h" +#include <memory> +#include <vector> + +#include "application_manager/application.h" +#include "application_manager/application_manager.h" +#include "application_manager/commands/command_impl.h" +#include "application_manager/smart_object_keys.h" +#include "smart_objects/smart_object.h" +#include "utils/logger.h" + +namespace application_manager { +class HMICapabilities; +namespace rpc_service { +class RPCService; +} // namespace rpc_service +} // namespace application_manager + +namespace policy { +class PolicyHandlerInterface; +} // namespace policy namespace sdl_rpc_plugin { using namespace application_manager; 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 e89ede53b9..67386c1673 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 @@ -32,7 +32,29 @@ */ #include "sdl_rpc_plugin/commands/mobile/on_way_point_change_notification.h" + +#include <bits/stdint-uintn.h> + +#include <cstdint> +#include <memory> +#include <set> + #include "application_manager/application_manager.h" +#include "application_manager/commands/command_impl.h" +#include "application_manager/smart_object_keys.h" +#include "smart_objects/smart_object.h" +#include "utils/logger.h" + +namespace application_manager { +class HMICapabilities; +namespace rpc_service { +class RPCService; +} // namespace rpc_service +} // namespace application_manager + +namespace policy { +class PolicyHandlerInterface; +} // namespace policy namespace sdl_rpc_plugin { using namespace application_manager; 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 8f8e4dbf6f..d3736f6ea4 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 @@ -32,11 +32,36 @@ */ #include "sdl_rpc_plugin/commands/mobile/perform_audio_pass_thru_request.h" -#include <cstring> -#include "application_manager/application_impl.h" +#include <bits/stdint-intn.h> +#include <bits/stdint-uintn.h> +#include <log4cxx/helpers/objectptr.h> +#include <log4cxx/logger.h> +#include <cstring> +#include <memory> +#include <vector> + +#include "application_manager/application.h" +#include "application_manager/application_manager.h" +#include "application_manager/commands/command_impl.h" +#include "application_manager/event_engine/event.h" +#include "application_manager/hmi_interfaces.h" #include "application_manager/message_helper.h" +#include "application_manager/smart_object_keys.h" +#include "smart_objects/smart_object.h" #include "utils/helpers.h" +#include "utils/logger.h" + +namespace application_manager { +class HMICapabilities; +namespace rpc_service { +class RPCService; +} // namespace rpc_service +} // namespace application_manager + +namespace policy { +class PolicyHandlerInterface; +} // namespace policy namespace sdl_rpc_plugin { using namespace application_manager; @@ -253,7 +278,6 @@ PerformAudioPassThruRequest::PrepareResponseParameters() { void PerformAudioPassThruRequest::SendSpeakRequest() { LOG4CXX_AUTO_TRACE(logger_); - using namespace hmi_apis; using namespace smart_objects; SmartObject msg_params = smart_objects::SmartObject(SmartType_Map); @@ -267,9 +291,10 @@ void PerformAudioPassThruRequest::SendSpeakRequest() { } // app_id msg_params[strings::app_id] = connection_key(); - msg_params[hmi_request::speak_type] = Common_MethodName::AUDIO_PASS_THRU; + msg_params[hmi_request::speak_type] = + hmi_apis::Common_MethodName::AUDIO_PASS_THRU; StartAwaitForInterface(HmiInterfaces::HMI_INTERFACE_TTS); - SendHMIRequest(FunctionID::TTS_Speak, &msg_params, true); + SendHMIRequest(hmi_apis::FunctionID::TTS_Speak, &msg_params, true); } void PerformAudioPassThruRequest::SendPerformAudioPassThruRequest() { 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 5dae6327eb..e5cd812df4 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 @@ -32,7 +32,19 @@ */ #include "sdl_rpc_plugin/commands/mobile/perform_audio_pass_thru_response.h" + +#include "application_manager/commands/command_impl.h" #include "application_manager/rpc_service.h" +#include "utils/logger.h" + +namespace application_manager { +class ApplicationManager; +class HMICapabilities; +} // namespace application_manager + +namespace policy { +class PolicyHandlerInterface; +} // namespace policy namespace sdl_rpc_plugin { using namespace application_manager; 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 6b2f3cbcc5..af44f763a6 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 @@ -32,19 +32,45 @@ */ #include "sdl_rpc_plugin/commands/mobile/perform_interaction_request.h" + +#include <log4cxx/helpers/objectptr.h> +#include <log4cxx/logger.h> #include <string.h> +#include <cstdint> +#include <iterator> +#include <map> +#include <memory> #include <numeric> -#include <string> - -#include "application_manager/application_impl.h" +#include <ostream> +#include <set> +#include <utility> +#include <vector> + +#include "application_manager/application_manager.h" +#include "application_manager/application_manager_settings.h" +#include "application_manager/commands/command_impl.h" +#include "application_manager/event_engine/event.h" +#include "application_manager/hmi_interfaces.h" #include "application_manager/message_helper.h" - +#include "application_manager/smart_object_keys.h" #include "interfaces/HMI_API.h" #include "interfaces/MOBILE_API.h" +#include "smart_objects/smart_object.h" #include "utils/custom_string.h" -#include "utils/file_system.h" -#include "utils/gen_hash.h" +#include "utils/data_accessor.h" #include "utils/helpers.h" +#include "utils/logger.h" + +namespace application_manager { +class HMICapabilities; +namespace rpc_service { +class RPCService; +} // namespace rpc_service +} // namespace application_manager + +namespace policy { +class PolicyHandlerInterface; +} // namespace policy namespace sdl_rpc_plugin { using namespace application_manager; 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 fa02641c2b..51c03c68bf 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 @@ -32,7 +32,19 @@ */ #include "sdl_rpc_plugin/commands/mobile/perform_interaction_response.h" + +#include "application_manager/commands/command_impl.h" #include "application_manager/rpc_service.h" +#include "utils/logger.h" + +namespace application_manager { +class ApplicationManager; +class HMICapabilities; +} // namespace application_manager + +namespace policy { +class PolicyHandlerInterface; +} // namespace policy namespace sdl_rpc_plugin { using namespace application_manager; 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 41558c08f0..0e8b09151d 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 @@ -32,14 +32,33 @@ */ #include "sdl_rpc_plugin/commands/mobile/put_file_request.h" -#include <algorithm> - -#include "application_manager/application_impl.h" -#include "application_manager/policies/policy_handler.h" -#include "application_manager/rpc_service.h" +#include <log4cxx/helpers/objectptr.h> +#include <log4cxx/logger.h> +#include <stddef.h> #include <boost/crc.hpp> +#include <cstdint> +#include <memory> +#include <ostream> +#include <string> +#include <vector> + +#include "application_manager/application.h" +#include "application_manager/application_manager.h" +#include "application_manager/application_manager_settings.h" +#include "application_manager/commands/command_impl.h" +#include "application_manager/message.h" +#include "application_manager/policies/policy_handler_interface.h" +#include "application_manager/rpc_service.h" +#include "application_manager/smart_object_keys.h" +#include "interfaces/HMI_API.h" +#include "smart_objects/smart_object.h" #include "utils/file_system.h" +#include "utils/logger.h" + +namespace application_manager { +class HMICapabilities; +} // namespace application_manager namespace { /** 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 f9ddbf7717..e73f12eb82 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 @@ -32,8 +32,29 @@ */ #include "sdl_rpc_plugin/commands/mobile/put_file_response.h" -#include "application_manager/application_impl.h" -#include "utils/file_system.h" + +#include <bits/stdint-uintn.h> +#include <log4cxx/helpers/objectptr.h> +#include <log4cxx/logger.h> +#include <memory> + +#include "application_manager/application.h" +#include "application_manager/application_manager.h" +#include "application_manager/commands/command_impl.h" +#include "application_manager/smart_object_keys.h" +#include "interfaces/MOBILE_API.h" +#include "smart_objects/smart_object.h" +#include "utils/logger.h" + +namespace application_manager { +class HMICapabilities; +namespace rpc_service { +class RPCService; +} // namespace rpc_service +} // namespace application_manager +namespace policy { +class PolicyHandlerInterface; +} // namespace policy namespace sdl_rpc_plugin { using namespace application_manager; 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 597df26d0a..2c3c023974 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 @@ -33,24 +33,48 @@ #include "sdl_rpc_plugin/commands/mobile/register_app_interface_request.h" +#include <ctype.h> +#include <log4cxx/helpers/objectptr.h> +#include <log4cxx/logger.h> +#include <pthread.h> #include <string.h> -#include <unistd.h> -#include <algorithm> + +#include <iterator> #include <map> +#include <memory> +#include <ostream> +#include <set> +#include <string> +#include <utility> -#include "application_manager/app_launch/app_launch_ctrl.h" -#include "application_manager/application_impl.h" #include "application_manager/application_manager.h" +#include "application_manager/application_manager_settings.h" +#include "application_manager/commands/command_impl.h" #include "application_manager/helpers/application_helper.h" +#include "application_manager/hmi_capabilities.h" +#include "application_manager/hmi_interfaces.h" +#include "application_manager/message.h" #include "application_manager/message_helper.h" -#include "application_manager/policies/policy_handler.h" #include "application_manager/policies/policy_handler_interface.h" #include "application_manager/resumption/resume_ctrl.h" #include "application_manager/rpc_service.h" -#include "config_profile/profile.h" +#include "application_manager/smart_object_keys.h" +#include "connection_handler/connection_handler.h" #include "interfaces/MOBILE_API.h" #include "interfaces/generated_msg_version.h" +#include "policy/policy_manager.h" +#include "policy/policy_table/types.h" +#include "policy/policy_types.h" +#include "policy/usage_statistics/counter.h" +#include "policy/usage_statistics/statistics_manager.h" +#include "protocol_handler/session_observer.h" +#include "utils/callable.h" +#include "utils/custom_string.h" +#include "utils/data_accessor.h" #include "utils/file_system.h" +#include "utils/helpers.h" +#include "utils/logger.h" +#include "utils/semantic_version.h" namespace { namespace custom_str = utils::custom_string; @@ -1128,7 +1152,7 @@ void RegisterAppInterfaceRequest::FillDeviceInfo( bool RegisterAppInterfaceRequest::IsApplicationWithSameAppIdRegistered() { LOG4CXX_AUTO_TRACE(logger_); - const custom_string::CustomString mobile_app_id( + const custom_str::CustomString mobile_app_id( application_manager_.GetCorrectMobileIDFromMessage(message_)); const ApplicationSet& applications = @@ -1308,13 +1332,13 @@ void RegisterAppInterfaceRequest::CheckResponseVehicleTypeParam( void RegisterAppInterfaceRequest::SendSubscribeCustomButtonNotification() { using namespace smart_objects; - using namespace hmi_apis; SmartObject msg_params = SmartObject(SmartType_Map); msg_params[strings::app_id] = connection_key(); - msg_params[strings::name] = Common_ButtonName::CUSTOM_BUTTON; + msg_params[strings::name] = hmi_apis::Common_ButtonName::CUSTOM_BUTTON; msg_params[strings::is_suscribed] = true; - CreateHMINotification(FunctionID::Buttons_OnButtonSubscription, msg_params); + CreateHMINotification(hmi_apis::FunctionID::Buttons_OnButtonSubscription, + msg_params); } bool RegisterAppInterfaceRequest::IsApplicationSwitched() { 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 b5683c62cb..bf7c915b0b 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 @@ -32,10 +32,23 @@ */ #include "sdl_rpc_plugin/commands/mobile/register_app_interface_response.h" + +#include <bits/stdint-intn.h> +#include <log4cxx/helpers/objectptr.h> +#include <log4cxx/logger.h> +#include <memory> +#include <ostream> + +#include "application_manager/application.h" #include "application_manager/application_manager.h" +#include "application_manager/commands/command_impl.h" #include "application_manager/policies/policy_handler_interface.h" +#include "application_manager/smart_object_keys.h" #include "connection_handler/connection_handler.h" #include "interfaces/MOBILE_API.h" +#include "smart_objects/smart_object.h" +#include "utils/logger.h" +#include "utils/semantic_version.h" namespace sdl_rpc_plugin { using namespace application_manager; 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 39363bbad1..645ba3d8f6 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 @@ -33,11 +33,36 @@ #include "sdl_rpc_plugin/commands/mobile/reset_global_properties_request.h" -#include "application_manager/application_impl.h" +#include <bits/stdint-intn.h> +#include <bits/stdint-uintn.h> +#include <log4cxx/helpers/objectptr.h> +#include <log4cxx/logger.h> +#include <stddef.h> +#include <memory> +#include <vector> + +#include "application_manager/application_manager.h" +#include "application_manager/application_manager_settings.h" +#include "application_manager/commands/command_impl.h" +#include "application_manager/event_engine/event.h" +#include "application_manager/hmi_interfaces.h" #include "application_manager/message_helper.h" - +#include "application_manager/smart_object_keys.h" #include "interfaces/HMI_API.h" #include "interfaces/MOBILE_API.h" +#include "smart_objects/smart_object.h" +#include "utils/logger.h" + +namespace application_manager { +class HMICapabilities; +namespace rpc_service { +class RPCService; +} // namespace rpc_service +} // namespace application_manager + +namespace policy { +class PolicyHandlerInterface; +} // namespace policy namespace sdl_rpc_plugin { using namespace application_manager; 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 07aa23d9c9..426e97c11d 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 @@ -32,7 +32,19 @@ */ #include "sdl_rpc_plugin/commands/mobile/reset_global_properties_response.h" + +#include "application_manager/commands/command_impl.h" #include "application_manager/rpc_service.h" +#include "utils/logger.h" + +namespace application_manager { +class ApplicationManager; +class HMICapabilities; +} // namespace application_manager + +namespace policy { +class PolicyHandlerInterface; +} // namespace policy namespace sdl_rpc_plugin { using namespace application_manager; 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 c1d02c96d3..a541093e7a 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 @@ -32,14 +32,35 @@ */ #include "sdl_rpc_plugin/commands/mobile/scrollable_message_request.h" -#include <string.h> -#include "application_manager/application_impl.h" +#include <bits/stdint-intn.h> +#include <log4cxx/helpers/objectptr.h> +#include <log4cxx/logger.h> +#include <string.h> +#include <iosfwd> +#include <memory> + +#include "application_manager/application.h" +#include "application_manager/application_manager.h" +#include "application_manager/commands/command_impl.h" +#include "application_manager/event_engine/event.h" +#include "application_manager/hmi_interfaces.h" #include "application_manager/message_helper.h" -#include "application_manager/policies/policy_handler.h" +#include "application_manager/smart_object_keys.h" #include "interfaces/HMI_API.h" #include "interfaces/MOBILE_API.h" -#include "utils/helpers.h" +#include "smart_objects/smart_object.h" +#include "utils/logger.h" + +namespace application_manager { +class HMICapabilities; +namespace rpc_service { +class RPCService; +} // namespace rpc_service +} // namespace application_manager +namespace policy { +class PolicyHandlerInterface; +} // namespace policy namespace sdl_rpc_plugin { using namespace application_manager; 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 6236506c00..23305894f2 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 @@ -32,9 +32,36 @@ */ #include "sdl_rpc_plugin/commands/mobile/scrollable_message_response.h" + +#include <memory> + +#include "application_manager/application.h" +#include "application_manager/application_manager.h" +#include "application_manager/commands/command_impl.h" #include "application_manager/rpc_service.h" -#include "interfaces/HMI_API.h" +#include "application_manager/smart_object_keys.h" #include "interfaces/MOBILE_API.h" +#include "smart_objects/smart_object.h" +#include "utils/logger.h" + +namespace application_manager { +class HMICapabilities; +} // namespace application_manager + +namespace policy { +class PolicyHandlerInterface; + +class PolicyHandlerInterface; +} // namespace policy + +namespace application_manager { +class HMICapabilities; + +class HMICapabilities; +} // namespace application_manager +namespace policy { +class PolicyHandlerInterface; +} // namespace policy namespace sdl_rpc_plugin { using namespace application_manager; 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 6e745fe0db..dc2c81fb3e 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 @@ -31,7 +31,34 @@ */ #include "sdl_rpc_plugin/commands/mobile/send_haptic_data_request.h" + +#include <log4cxx/helpers/objectptr.h> +#include <log4cxx/logger.h> +#include <stddef.h> +#include <memory> + +#include "application_manager/application.h" +#include "application_manager/application_manager.h" +#include "application_manager/commands/command_impl.h" +#include "application_manager/event_engine/event.h" +#include "application_manager/smart_object_keys.h" +#include "interfaces/HMI_API.h" #include "interfaces/MOBILE_API.h" +#include "smart_objects/smart_object.h" +#include "utils/custom_string.h" +#include "utils/helpers.h" +#include "utils/logger.h" + +namespace application_manager { +class HMICapabilities; +namespace rpc_service { +class RPCService; +} // namespace rpc_service +} // namespace application_manager + +namespace policy { +class PolicyHandlerInterface; +} // namespace policy namespace sdl_rpc_plugin { using namespace application_manager; 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 79a0516928..e18f625bc2 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 @@ -31,7 +31,19 @@ */ #include "sdl_rpc_plugin/commands/mobile/send_haptic_data_response.h" + +#include "application_manager/commands/command_impl.h" #include "application_manager/rpc_service.h" +#include "utils/logger.h" + +namespace application_manager { +class ApplicationManager; +class HMICapabilities; +} // namespace application_manager + +namespace policy { +class PolicyHandlerInterface; +} // namespace policy namespace sdl_rpc_plugin { using namespace application_manager; 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 1df4d788d2..52b22391a8 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 @@ -31,9 +31,54 @@ POSSIBILITY OF SUCH DAMAGE. */ #include "sdl_rpc_plugin/commands/mobile/send_location_request.h" + +#include <log4cxx/helpers/objectptr.h> +#include <log4cxx/logger.h> +#include <stddef.h> + #include <algorithm> +#include <memory> +#include <ostream> +#include <set> +#include <string> + +#include "application_manager/application.h" +#include "application_manager/application_manager.h" +#include "application_manager/commands/command_impl.h" +#include "application_manager/event_engine/event.h" +#include "application_manager/hmi_capabilities.h" +#include "application_manager/hmi_interfaces.h" #include "application_manager/message_helper.h" +#include "application_manager/smart_object_keys.h" +#include "interfaces/MOBILE_API.h" +#include "policy/policy_types.h" +#include "smart_objects/smart_object.h" #include "utils/custom_string.h" +#include "utils/helpers.h" +#include "utils/logger.h" + +namespace application_manager { +namespace rpc_service { +class RPCService; +} // namespace rpc_service +} // namespace application_manager + +namespace policy { +class PolicyHandlerInterface; + +class PolicyHandlerInterface; +} // namespace policy + +namespace application_manager { +namespace rpc_service { +class RPCService; + +class RPCService; +} // namespace rpc_service +} // namespace application_manager +namespace policy { +class PolicyHandlerInterface; +} // namespace policy namespace sdl_rpc_plugin { using namespace application_manager; 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 934008b816..c3bd95053b 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 @@ -32,9 +32,18 @@ */ #include "sdl_rpc_plugin/commands/mobile/send_location_response.h" -#include "application_manager/application_impl.h" + +#include "application_manager/commands/command_impl.h" #include "application_manager/rpc_service.h" -#include "interfaces/HMI_API.h" +#include "utils/logger.h" + +namespace application_manager { +class ApplicationManager; +class HMICapabilities; +} // namespace application_manager +namespace policy { +class PolicyHandlerInterface; +} // namespace policy namespace sdl_rpc_plugin { using namespace application_manager; 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 b2363e870f..13f481835b 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 @@ -32,14 +32,47 @@ */ #include "sdl_rpc_plugin/commands/mobile/set_app_icon_request.h" -#include <algorithm> -#include "application_manager/application_impl.h" +#include <bits/stdint-intn.h> +#include <bits/types/time_t.h> +#include <log4cxx/helpers/objectptr.h> +#include <log4cxx/logger.h> +#include <cstdint> +#include <ctime> +#include <functional> +#include <map> +#include <memory> +#include <ostream> +#include <string> +#include <utility> +#include <vector> + +#include "application_manager/application.h" +#include "application_manager/application_manager.h" +#include "application_manager/application_manager_settings.h" +#include "application_manager/commands/command_impl.h" +#include "application_manager/event_engine/event.h" +#include "application_manager/hmi_interfaces.h" #include "application_manager/message_helper.h" +#include "application_manager/smart_object_keys.h" #include "interfaces/HMI_API.h" #include "interfaces/MOBILE_API.h" +#include "protocol/common.h" +#include "protocol_handler/protocol_handler.h" +#include "protocol_handler/protocol_handler_settings.h" +#include "smart_objects/smart_object.h" #include "utils/file_system.h" -#include "utils/helpers.h" +#include "utils/logger.h" + +namespace application_manager { +class HMICapabilities; +namespace rpc_service { +class RPCService; +} // namespace rpc_service +} // namespace application_manager +namespace policy { +class PolicyHandlerInterface; +} // namespace policy namespace sdl_rpc_plugin { using namespace application_manager; 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 55255920d0..5a8324c89b 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 @@ -32,7 +32,19 @@ */ #include "sdl_rpc_plugin/commands/mobile/set_app_icon_response.h" + +#include "application_manager/commands/command_impl.h" #include "application_manager/rpc_service.h" +#include "utils/logger.h" + +namespace application_manager { +class ApplicationManager; +class HMICapabilities; +} // namespace application_manager + +namespace policy { +class PolicyHandlerInterface; +} // namespace policy namespace sdl_rpc_plugin { using namespace application_manager; diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/set_cloud_app_properties_request.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/set_cloud_app_properties_request.cc index 5173be56d6..a5934f8ee4 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/set_cloud_app_properties_request.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/set_cloud_app_properties_request.cc @@ -1,5 +1,42 @@ #include "sdl_rpc_plugin/commands/mobile/set_cloud_app_properties_request.h" +#include <log4cxx/helpers/objectptr.h> +#include <log4cxx/logger.h> +#include <memory> + +#include "application_manager/application.h" +#include "application_manager/application_manager.h" +#include "application_manager/commands/command_impl.h" +#include "application_manager/policies/policy_handler_interface.h" +#include "interfaces/MOBILE_API.h" +#include "utils/logger.h" + +namespace application_manager { +class HMICapabilities; +namespace event_engine { +class Event; +} // namespace event_engine +namespace rpc_service { +class RPCService; +} // namespace rpc_service + +class HMICapabilities; +namespace event_engine { +class Event; +} // namespace event_engine +namespace rpc_service { +class RPCService; +} // namespace rpc_service + +class HMICapabilities; +namespace event_engine { +class Event; +} // namespace event_engine +namespace rpc_service { +class RPCService; +} // namespace rpc_service +} // namespace application_manager + namespace sdl_rpc_plugin { using namespace application_manager; @@ -40,4 +77,4 @@ void SetCloudAppPropertiesRequest::on_event( } } // namespace commands -} // namespace sdl_rpc_plugin
\ No newline at end of file +} // namespace sdl_rpc_plugin diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/set_cloud_app_properties_response.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/set_cloud_app_properties_response.cc index 39d2ea7f90..d9388f94f6 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/set_cloud_app_properties_response.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/set_cloud_app_properties_response.cc @@ -1,6 +1,16 @@ #include "sdl_rpc_plugin/commands/mobile/set_cloud_app_properties_response.h" -#include "application_manager/application_manager.h" + +#include "application_manager/commands/command_impl.h" #include "application_manager/rpc_service.h" +#include "utils/logger.h" + +namespace application_manager { +class ApplicationManager; +class HMICapabilities; +} // namespace application_manager +namespace policy { +class PolicyHandlerInterface; +} // namespace policy namespace sdl_rpc_plugin { using namespace application_manager; 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 2a09a72af2..236e5e8745 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 @@ -33,8 +33,48 @@ #include "sdl_rpc_plugin/commands/mobile/set_display_layout_request.h" -#include "application_manager/application_impl.h" +#include <log4cxx/helpers/objectptr.h> +#include <log4cxx/logger.h> +#include <stddef.h> +#include <memory> +#include <ostream> +#include <string> + +#include "application_manager/application.h" +#include "application_manager/application_manager.h" +#include "application_manager/commands/command_impl.h" +#include "application_manager/event_engine/event.h" +#include "application_manager/hmi_capabilities.h" +#include "application_manager/hmi_interfaces.h" #include "application_manager/message_helper.h" +#include "application_manager/smart_object_keys.h" +#include "interfaces/HMI_API.h" +#include "interfaces/MOBILE_API.h" +#include "smart_objects/smart_object.h" +#include "utils/logger.h" + +namespace application_manager { +namespace rpc_service { +class RPCService; +} // namespace rpc_service +} // namespace application_manager + +namespace policy { +class PolicyHandlerInterface; + +class PolicyHandlerInterface; +} // namespace policy + +namespace application_manager { +namespace rpc_service { +class RPCService; + +class RPCService; +} // namespace rpc_service +} // namespace application_manager +namespace policy { +class PolicyHandlerInterface; +} // namespace policy namespace sdl_rpc_plugin { using namespace application_manager; 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 0999b596b5..f085543548 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 @@ -32,8 +32,18 @@ */ #include "sdl_rpc_plugin/commands/mobile/set_display_layout_response.h" -#include "application_manager/application_impl.h" + +#include "application_manager/commands/command_impl.h" #include "application_manager/rpc_service.h" +#include "utils/logger.h" + +namespace application_manager { +class ApplicationManager; +class HMICapabilities; +} // namespace application_manager +namespace policy { +class PolicyHandlerInterface; +} // namespace policy namespace sdl_rpc_plugin { using namespace application_manager; 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 bbfc61d463..1e8bc42b20 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 @@ -31,14 +31,39 @@ */ #include "sdl_rpc_plugin/commands/mobile/set_global_properties_request.h" + +#include <log4cxx/helpers/objectptr.h> +#include <log4cxx/logger.h> #include <string.h> -#include <algorithm> +#include <iterator> +#include <memory> #include <numeric> - +#include <ostream> +#include <string> +#include <vector> + +#include "application_manager/application_manager.h" +#include "application_manager/commands/command_impl.h" +#include "application_manager/event_engine/event.h" +#include "application_manager/help_prompt_manager.h" +#include "application_manager/hmi_interfaces.h" #include "application_manager/message_helper.h" +#include "application_manager/smart_object_keys.h" #include "interfaces/HMI_API.h" #include "interfaces/MOBILE_API.h" -#include "utils/helpers.h" +#include "smart_objects/smart_object.h" +#include "utils/logger.h" + +namespace application_manager { +class HMICapabilities; +namespace rpc_service { +class RPCService; +} // namespace rpc_service +} // namespace application_manager + +namespace policy { +class PolicyHandlerInterface; +} // namespace policy namespace sdl_rpc_plugin { using namespace application_manager; 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 1de2b97d3a..9496ce8cb4 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 @@ -32,7 +32,19 @@ */ #include "sdl_rpc_plugin/commands/mobile/set_global_properties_response.h" + +#include "application_manager/commands/command_impl.h" #include "application_manager/rpc_service.h" +#include "utils/logger.h" + +namespace application_manager { +class ApplicationManager; +class HMICapabilities; +} // namespace application_manager + +namespace policy { +class PolicyHandlerInterface; +} // namespace policy namespace sdl_rpc_plugin { using namespace application_manager; 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 d610090aa4..807c96e5c9 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 @@ -33,10 +33,34 @@ #include "sdl_rpc_plugin/commands/mobile/set_media_clock_timer_request.h" -#include "application_manager/application_impl.h" +#include <log4cxx/helpers/objectptr.h> +#include <log4cxx/logger.h> +#include <stddef.h> +#include <iosfwd> +#include <memory> + +#include "application_manager/application.h" +#include "application_manager/application_manager.h" +#include "application_manager/commands/command_impl.h" +#include "application_manager/event_engine/event.h" +#include "application_manager/hmi_interfaces.h" #include "application_manager/message_helper.h" +#include "application_manager/smart_object_keys.h" #include "interfaces/HMI_API.h" #include "interfaces/MOBILE_API.h" +#include "smart_objects/smart_object.h" +#include "utils/logger.h" + +namespace application_manager { +class HMICapabilities; +namespace rpc_service { +class RPCService; +} // namespace rpc_service +} // namespace application_manager + +namespace policy { +class PolicyHandlerInterface; +} // namespace policy namespace sdl_rpc_plugin { using namespace application_manager; 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 948ff84156..b06e5ddf47 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 @@ -32,7 +32,19 @@ */ #include "sdl_rpc_plugin/commands/mobile/set_media_clock_timer_response.h" + +#include "application_manager/commands/command_impl.h" #include "application_manager/rpc_service.h" +#include "utils/logger.h" + +namespace application_manager { +class ApplicationManager; +class HMICapabilities; +} // namespace application_manager + +namespace policy { +class PolicyHandlerInterface; +} // namespace policy namespace sdl_rpc_plugin { using namespace application_manager; 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 b439c1cb16..af7d3ab1d2 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 @@ -32,14 +32,35 @@ */ #include "sdl_rpc_plugin/commands/mobile/show_constant_tbt_request.h" -#include <cstring> -#include "application_manager/application_impl.h" +#include <bits/stdint-intn.h> +#include <log4cxx/helpers/objectptr.h> +#include <log4cxx/logger.h> +#include <iosfwd> +#include <memory> + +#include "application_manager/application.h" +#include "application_manager/application_manager.h" +#include "application_manager/commands/command_impl.h" +#include "application_manager/event_engine/event.h" +#include "application_manager/hmi_interfaces.h" #include "application_manager/message_helper.h" -#include "application_manager/policies/policy_handler.h" -#include "application_manager/policies/policy_handler_interface.h" +#include "application_manager/smart_object_keys.h" #include "interfaces/HMI_API.h" #include "interfaces/MOBILE_API.h" +#include "smart_objects/smart_object.h" +#include "utils/logger.h" + +namespace application_manager { +class HMICapabilities; +namespace rpc_service { +class RPCService; +} // namespace rpc_service +} // namespace application_manager + +namespace policy { +class PolicyHandlerInterface; +} // namespace policy namespace sdl_rpc_plugin { using namespace application_manager; 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 d027daf77d..1ea5d1c08e 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 @@ -32,8 +32,19 @@ */ #include "sdl_rpc_plugin/commands/mobile/show_constant_tbt_response.h" + +#include "application_manager/commands/command_impl.h" #include "application_manager/rpc_service.h" -#include "interfaces/HMI_API.h" +#include "utils/logger.h" + +namespace application_manager { +class ApplicationManager; +class HMICapabilities; +} // namespace application_manager + +namespace policy { +class PolicyHandlerInterface; +} // namespace policy namespace sdl_rpc_plugin { using namespace 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 2bf1a81261..f33ee301bb 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 @@ -31,13 +31,33 @@ POSSIBILITY OF SUCH DAMAGE. */ #include "sdl_rpc_plugin/commands/mobile/show_request.h" + +#include <log4cxx/helpers/objectptr.h> +#include <log4cxx/logger.h> #include <string.h> +#include <memory> +#include <ostream> #include "application_manager/application.h" +#include "application_manager/application_manager.h" +#include "application_manager/commands/command_impl.h" +#include "application_manager/event_engine/event.h" +#include "application_manager/hmi_interfaces.h" #include "application_manager/message_helper.h" -#include "application_manager/policies/policy_handler.h" -#include "utils/file_system.h" -#include "utils/helpers.h" +#include "application_manager/smart_object_keys.h" +#include "interfaces/HMI_API.h" +#include "smart_objects/smart_object.h" +#include "utils/logger.h" + +namespace application_manager { +class HMICapabilities; +namespace rpc_service { +class RPCService; +} // namespace rpc_service +} // namespace application_manager +namespace policy { +class PolicyHandlerInterface; +} // namespace policy namespace sdl_rpc_plugin { using namespace application_manager; 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 f5667189b7..f4e41143b0 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 @@ -32,9 +32,18 @@ */ #include "sdl_rpc_plugin/commands/mobile/show_response.h" -#include "application_manager/application_impl.h" + +#include "application_manager/commands/command_impl.h" #include "application_manager/rpc_service.h" -#include "interfaces/HMI_API.h" +#include "utils/logger.h" + +namespace application_manager { +class ApplicationManager; +class HMICapabilities; +} // namespace application_manager +namespace policy { +class PolicyHandlerInterface; +} // namespace policy namespace sdl_rpc_plugin { using namespace application_manager; 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 d80e73ccbf..7fd8210138 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 @@ -33,10 +33,37 @@ #include "sdl_rpc_plugin/commands/mobile/slider_request.h" -#include "application_manager/application_impl.h" +#include <log4cxx/helpers/objectptr.h> +#include <log4cxx/logger.h> +#include <stddef.h> +#include <memory> +#include <ostream> +#include <vector> + +#include "application_manager/application.h" +#include "application_manager/application_manager.h" +#include "application_manager/application_manager_settings.h" +#include "application_manager/commands/command_impl.h" +#include "application_manager/event_engine/event.h" +#include "application_manager/hmi_interfaces.h" #include "application_manager/message_helper.h" -#include "config_profile/profile.h" +#include "application_manager/smart_object_keys.h" +#include "interfaces/HMI_API.h" +#include "interfaces/MOBILE_API.h" +#include "smart_objects/smart_object.h" #include "utils/helpers.h" +#include "utils/logger.h" + +namespace application_manager { +class HMICapabilities; +namespace rpc_service { +class RPCService; +} // namespace rpc_service +} // namespace application_manager + +namespace policy { +class PolicyHandlerInterface; +} // namespace policy namespace sdl_rpc_plugin { using namespace application_manager; @@ -124,32 +151,35 @@ void SliderRequest::on_event(const event_engine::Event& event) { LOG4CXX_AUTO_TRACE(logger_); using namespace helpers; using namespace smart_objects; - using namespace hmi_apis; const SmartObject& message = event.smart_object(); const event_engine::Event::EventID event_id = event.id(); - if (event_id == FunctionID::UI_OnResetTimeout) { + if (event_id == hmi_apis::FunctionID::UI_OnResetTimeout) { LOG4CXX_INFO(logger_, "Received UI_OnResetTimeout event"); application_manager_.updateRequestTimeout( connection_key(), correlation_id(), default_timeout()); return; } - if (event_id != FunctionID::UI_Slider) { + if (event_id != hmi_apis::FunctionID::UI_Slider) { LOG4CXX_ERROR(logger_, "Received unknown event" << event.id()); return; } LOG4CXX_DEBUG(logger_, "Received UI_Slider event"); EndAwaitForInterface(HmiInterfaces::HMI_INTERFACE_UI); - const Common_Result::eType response_code = static_cast<Common_Result::eType>( - message[strings::params][hmi_response::code].asInt()); + const hmi_apis::Common_Result::eType response_code = + static_cast<hmi_apis::Common_Result::eType>( + message[strings::params][hmi_response::code].asInt()); SmartObject response_msg_params = message[strings::msg_params]; - const bool is_timeout_aborted = Compare<Common_Result::eType, EQ, ONE>( - response_code, Common_Result::TIMED_OUT, Common_Result::ABORTED); + const bool is_timeout_aborted = + Compare<hmi_apis::Common_Result::eType, EQ, ONE>( + response_code, + hmi_apis::Common_Result::TIMED_OUT, + hmi_apis::Common_Result::ABORTED); if (is_timeout_aborted) { if (message[strings::params][strings::data].keyExists( 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 4ac96a272e..67f6037f97 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 @@ -32,7 +32,19 @@ */ #include "sdl_rpc_plugin/commands/mobile/slider_response.h" + +#include "application_manager/commands/command_impl.h" #include "application_manager/rpc_service.h" +#include "utils/logger.h" + +namespace application_manager { +class ApplicationManager; +class HMICapabilities; +} // namespace application_manager + +namespace policy { +class PolicyHandlerInterface; +} // namespace policy namespace sdl_rpc_plugin { using namespace application_manager; 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 0730a8730f..cb86b8256e 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 @@ -32,11 +32,34 @@ */ #include "sdl_rpc_plugin/commands/mobile/speak_request.h" -#include <string.h> -#include "application_manager/application_impl.h" +#include <log4cxx/helpers/objectptr.h> +#include <log4cxx/logger.h> +#include <memory> +#include <vector> + +#include "application_manager/application.h" +#include "application_manager/application_manager.h" +#include "application_manager/commands/command_impl.h" +#include "application_manager/event_engine/event.h" +#include "application_manager/hmi_interfaces.h" #include "application_manager/message_helper.h" -#include "utils/helpers.h" +#include "application_manager/smart_object_keys.h" +#include "interfaces/HMI_API.h" +#include "interfaces/MOBILE_API.h" +#include "smart_objects/smart_object.h" +#include "utils/logger.h" + +namespace application_manager { +class HMICapabilities; +namespace rpc_service { +class RPCService; +} // namespace rpc_service +} // namespace application_manager + +namespace policy { +class PolicyHandlerInterface; +} // namespace policy namespace sdl_rpc_plugin { using namespace application_manager; 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 69b04977ef..a5483d9e33 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 @@ -32,9 +32,18 @@ */ #include "sdl_rpc_plugin/commands/mobile/speak_response.h" -#include "application_manager/application_impl.h" + +#include "application_manager/commands/command_impl.h" #include "application_manager/rpc_service.h" -#include "interfaces/HMI_API.h" +#include "utils/logger.h" + +namespace application_manager { +class ApplicationManager; +class HMICapabilities; +} // namespace application_manager +namespace policy { +class PolicyHandlerInterface; +} // namespace policy namespace sdl_rpc_plugin { using namespace application_manager; 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 0d3158d841..c35921d1ea 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 @@ -32,8 +32,31 @@ */ #include "sdl_rpc_plugin/commands/mobile/subscribe_button_request.h" + +#include <log4cxx/helpers/objectptr.h> +#include <log4cxx/logger.h> +#include <memory> +#include <ostream> + +#include "application_manager/application_manager.h" +#include "application_manager/commands/command_impl.h" +#include "application_manager/smart_object_keys.h" +#include "interfaces/HMI_API.h" +#include "smart_objects/smart_object.h" +#include "utils/logger.h" #include "utils/semantic_version.h" +namespace application_manager { +class HMICapabilities; +namespace rpc_service { +class RPCService; +} // namespace rpc_service +} // namespace application_manager + +namespace policy { +class PolicyHandlerInterface; +} // namespace policy + namespace sdl_rpc_plugin { using namespace application_manager; @@ -131,15 +154,15 @@ bool SubscribeButtonRequest::IsSubscriptionAllowed( void SubscribeButtonRequest::SendSubscribeButtonNotification() { using namespace smart_objects; - using namespace hmi_apis; // send OnButtonSubscription notification SmartObject msg_params = SmartObject(SmartType_Map); msg_params[strings::app_id] = connection_key(); - msg_params[strings::name] = static_cast<Common_ButtonName::eType>( + msg_params[strings::name] = static_cast<hmi_apis::Common_ButtonName::eType>( (*message_)[strings::msg_params][strings::button_name].asUInt()); msg_params[strings::is_suscribed] = true; - CreateHMINotification(FunctionID::Buttons_OnButtonSubscription, msg_params); + CreateHMINotification(hmi_apis::FunctionID::Buttons_OnButtonSubscription, + msg_params); } } // namespace commands 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 e584f84f4c..0b2a8da3f3 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,6 +33,27 @@ #include "sdl_rpc_plugin/commands/mobile/subscribe_button_response.h" +#include <log4cxx/helpers/objectptr.h> +#include <log4cxx/logger.h> +#include <memory> + +#include "application_manager/commands/command_impl.h" +#include "application_manager/smart_object_keys.h" +#include "smart_objects/smart_object.h" +#include "utils/logger.h" + +namespace application_manager { +class ApplicationManager; +class HMICapabilities; +namespace rpc_service { +class RPCService; +} // namespace rpc_service +} // namespace application_manager + +namespace policy { +class PolicyHandlerInterface; +} // namespace policy + namespace sdl_rpc_plugin { using namespace application_manager; 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 2ee7771833..ab7b29defb 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 @@ -31,8 +31,34 @@ */ #include "sdl_rpc_plugin/commands/mobile/subscribe_way_points_request.h" + +#include <log4cxx/helpers/objectptr.h> +#include <log4cxx/logger.h> +#include <stddef.h> +#include <ostream> + +#include "application_manager/application.h" #include "application_manager/application_manager.h" +#include "application_manager/commands/command_impl.h" +#include "application_manager/event_engine/event.h" +#include "application_manager/hmi_interfaces.h" #include "application_manager/message_helper.h" +#include "application_manager/smart_object_keys.h" +#include "interfaces/HMI_API.h" +#include "interfaces/MOBILE_API.h" +#include "smart_objects/smart_object.h" +#include "utils/logger.h" + +namespace application_manager { +class HMICapabilities; +namespace rpc_service { +class RPCService; +} // namespace rpc_service +} // namespace application_manager + +namespace policy { +class PolicyHandlerInterface; +} // namespace policy namespace sdl_rpc_plugin { using namespace application_manager; 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 45486792d7..1120714db6 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 @@ -31,8 +31,18 @@ */ #include "sdl_rpc_plugin/commands/mobile/subscribe_way_points_response.h" -#include "application_manager/application_manager.h" + +#include "application_manager/commands/command_impl.h" #include "application_manager/rpc_service.h" +#include "utils/logger.h" + +namespace application_manager { +class ApplicationManager; +class HMICapabilities; +} // namespace application_manager +namespace policy { +class PolicyHandlerInterface; +} // namespace policy namespace sdl_rpc_plugin { using namespace application_manager; 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 e70433f29b..819d03ad21 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 @@ -33,19 +33,54 @@ Copyright (c) 2018, Ford Motor Company #include "sdl_rpc_plugin/commands/mobile/system_request.h" +#include <log4cxx/helpers/objectptr.h> +#include <log4cxx/logger.h> #include <stdio.h> -#include <algorithm> -#include <sstream> + +#include <cstdint> +#include <map> +#include <memory> +#include <set> #include <string> +#include <utility> #include <vector> + +#include "application_manager/application.h" +#include "application_manager/application_manager.h" +#include "application_manager/application_manager_settings.h" +#include "application_manager/commands/command_impl.h" +#include "application_manager/event_engine/event.h" +#include "application_manager/hmi_interfaces.h" #include "application_manager/policies/policy_handler_interface.h" +#include "application_manager/smart_object_keys.h" #include "formatters/CFormatterJsonBase.h" +#include "interfaces/HMI_API.h" #include "interfaces/MOBILE_API.h" -#include "json/json.h" +#include "json/reader.h" +#include "json/value.h" #include "policy/policy_table/enums.h" +#include "smart_objects/smart_object.h" #include "utils/custom_string.h" #include "utils/file_system.h" #include "utils/helpers.h" +#include "utils/logger.h" + +namespace application_manager { +class HMICapabilities; +namespace rpc_service { +class RPCService; +} // namespace rpc_service + +class HMICapabilities; +namespace rpc_service { +class RPCService; +} // namespace rpc_service + +class HMICapabilities; +namespace rpc_service { +class RPCService; +} // namespace rpc_service +} // namespace application_manager namespace sdl_rpc_plugin { using namespace application_manager; 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 428901a1c5..1e08ad440e 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 @@ -32,7 +32,19 @@ */ #include "sdl_rpc_plugin/commands/mobile/system_response.h" + +#include "application_manager/commands/command_impl.h" #include "application_manager/rpc_service.h" +#include "utils/logger.h" + +namespace application_manager { +class ApplicationManager; +class HMICapabilities; +} // namespace application_manager + +namespace policy { +class PolicyHandlerInterface; +} // namespace policy namespace sdl_rpc_plugin { using namespace application_manager; 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 3ba0513aeb..b914199368 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 @@ -32,8 +32,17 @@ */ #include "sdl_rpc_plugin/commands/mobile/unregister_app_interface_request.h" + +#include <log4cxx/helpers/objectptr.h> +#include <log4cxx/logger.h> + +#include "application_manager/application.h" +#include "application_manager/application_manager.h" +#include "application_manager/commands/command_impl.h" #include "application_manager/message_helper.h" #include "application_manager/rpc_service.h" +#include "interfaces/MOBILE_API.h" +#include "utils/logger.h" namespace sdl_rpc_plugin { using namespace application_manager; 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 7c90639968..acaa116985 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,6 +33,13 @@ #include "sdl_rpc_plugin/commands/mobile/unregister_app_interface_response.h" +#include <memory> + +#include "application_manager/commands/command_impl.h" +#include "application_manager/smart_object_keys.h" +#include "smart_objects/smart_object.h" +#include "utils/logger.h" + namespace sdl_rpc_plugin { using namespace application_manager; 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 ebd463d4fa..84a6b888a0 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 @@ -33,9 +33,32 @@ #include "sdl_rpc_plugin/commands/mobile/unsubscribe_button_request.h" -#include "application_manager/application_impl.h" +#include <log4cxx/helpers/objectptr.h> +#include <log4cxx/logger.h> +#include <memory> +#include <ostream> + +#include "application_manager/application.h" +#include "application_manager/application_manager.h" +#include "application_manager/commands/command_impl.h" +#include "application_manager/smart_object_keys.h" +#include "interfaces/HMI_API.h" +#include "interfaces/MOBILE_API.h" +#include "smart_objects/smart_object.h" +#include "utils/logger.h" #include "utils/semantic_version.h" +namespace application_manager { +class HMICapabilities; +namespace rpc_service { +class RPCService; +} // namespace rpc_service +} // namespace application_manager + +namespace policy { +class PolicyHandlerInterface; +} // namespace policy + namespace sdl_rpc_plugin { using namespace application_manager; @@ -110,15 +133,15 @@ bool UnsubscribeButtonRequest::Init() { void UnsubscribeButtonRequest::SendUnsubscribeButtonNotification() { using namespace smart_objects; - using namespace hmi_apis; // send OnButtonSubscription notification SmartObject msg_params = SmartObject(SmartType_Map); msg_params[strings::app_id] = connection_key(); - msg_params[strings::name] = static_cast<Common_ButtonName::eType>( + msg_params[strings::name] = static_cast<hmi_apis::Common_ButtonName::eType>( (*message_)[strings::msg_params][strings::button_name].asInt()); msg_params[strings::is_suscribed] = false; - CreateHMINotification(FunctionID::Buttons_OnButtonSubscription, msg_params); + CreateHMINotification(hmi_apis::FunctionID::Buttons_OnButtonSubscription, + msg_params); } } // namespace commands 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 c69d49bca1..991ae87688 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 @@ -32,7 +32,27 @@ */ #include "sdl_rpc_plugin/commands/mobile/unsubscribe_button_response.h" + +#include <log4cxx/helpers/objectptr.h> +#include <log4cxx/logger.h> +#include <memory> + +#include "application_manager/commands/command_impl.h" +#include "application_manager/smart_object_keys.h" #include "smart_objects/smart_object.h" +#include "utils/logger.h" + +namespace application_manager { +class ApplicationManager; +class HMICapabilities; +namespace rpc_service { +class RPCService; +} // namespace rpc_service +} // namespace application_manager + +namespace policy { +class PolicyHandlerInterface; +} // namespace policy namespace sdl_rpc_plugin { using namespace application_manager; 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 17326a99a0..9031847ef5 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 @@ -31,8 +31,37 @@ */ #include "sdl_rpc_plugin/commands/mobile/unsubscribe_way_points_request.h" + +#include <bits/stdint-uintn.h> +#include <log4cxx/helpers/objectptr.h> +#include <log4cxx/logger.h> +#include <stddef.h> +#include <cstdint> +#include <ostream> +#include <set> + +#include "application_manager/application.h" #include "application_manager/application_manager.h" +#include "application_manager/commands/command_impl.h" +#include "application_manager/event_engine/event.h" +#include "application_manager/hmi_interfaces.h" #include "application_manager/message_helper.h" +#include "application_manager/smart_object_keys.h" +#include "interfaces/HMI_API.h" +#include "interfaces/MOBILE_API.h" +#include "smart_objects/smart_object.h" +#include "utils/logger.h" + +namespace application_manager { +class HMICapabilities; +namespace rpc_service { +class RPCService; +} // namespace rpc_service +} // namespace application_manager + +namespace policy { +class PolicyHandlerInterface; +} // namespace policy namespace sdl_rpc_plugin { using namespace application_manager; 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 a7a180fb46..f67466227b 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 @@ -31,8 +31,18 @@ */ #include "sdl_rpc_plugin/commands/mobile/unsubscribe_way_points_response.h" -#include "application_manager/application_manager.h" + +#include "application_manager/commands/command_impl.h" #include "application_manager/rpc_service.h" +#include "utils/logger.h" + +namespace application_manager { +class ApplicationManager; +class HMICapabilities; +} // namespace application_manager +namespace policy { +class PolicyHandlerInterface; +} // namespace policy namespace sdl_rpc_plugin { using namespace application_manager; 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 8c2cce9765..79c017a61c 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 @@ -32,14 +32,38 @@ */ #include "sdl_rpc_plugin/commands/mobile/update_turn_list_request.h" -#include <string> -#include "application_manager/application_impl.h" +#include <bits/stdint-intn.h> +#include <bits/stdint-uintn.h> +#include <log4cxx/helpers/objectptr.h> +#include <log4cxx/logger.h> +#include <stddef.h> +#include <iosfwd> +#include <memory> +#include <vector> + +#include "application_manager/application.h" +#include "application_manager/application_manager.h" +#include "application_manager/commands/command_impl.h" +#include "application_manager/event_engine/event.h" +#include "application_manager/hmi_interfaces.h" #include "application_manager/message_helper.h" -#include "application_manager/policies/policy_handler.h" +#include "application_manager/smart_object_keys.h" #include "interfaces/HMI_API.h" #include "interfaces/MOBILE_API.h" +#include "smart_objects/smart_object.h" #include "utils/custom_string.h" +#include "utils/logger.h" + +namespace application_manager { +class HMICapabilities; +namespace rpc_service { +class RPCService; +} // namespace rpc_service +} // namespace application_manager +namespace policy { +class PolicyHandlerInterface; +} // namespace policy namespace sdl_rpc_plugin { using namespace application_manager; 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 eca9e3703c..ded692ba3e 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 @@ -32,8 +32,19 @@ */ #include "sdl_rpc_plugin/commands/mobile/update_turn_list_response.h" + +#include "application_manager/commands/command_impl.h" #include "application_manager/rpc_service.h" -#include "interfaces/HMI_API.h" +#include "utils/logger.h" + +namespace application_manager { +class ApplicationManager; +class HMICapabilities; +} // namespace application_manager + +namespace policy { +class PolicyHandlerInterface; +} // namespace policy namespace sdl_rpc_plugin { using namespace application_manager; |