diff options
Diffstat (limited to 'src/components/application_manager/src/message_helper/message_helper.cc')
| -rw-r--r-- | src/components/application_manager/src/message_helper/message_helper.cc | 43 |
1 files changed, 17 insertions, 26 deletions
diff --git a/src/components/application_manager/src/message_helper/message_helper.cc b/src/components/application_manager/src/message_helper/message_helper.cc index c5cc11bbe5..ed8b801377 100644 --- a/src/components/application_manager/src/message_helper/message_helper.cc +++ b/src/components/application_manager/src/message_helper/message_helper.cc @@ -107,7 +107,7 @@ bool ValidateSoftButtons(smart_objects::SmartObject& soft_buttons) { struct GroupsAppender : std::unary_function<void, const PermissionsList::value_type&> { - GroupsAppender(smart_objects::SmartObject& groups) + explicit GroupsAppender(smart_objects::SmartObject& groups) : groups_(groups), index_(0) {} void operator()(const PermissionsList::value_type& item) { @@ -135,7 +135,7 @@ struct GroupsAppender struct ExternalConsentStatusAppender : std::unary_function<void, const policy::ExternalConsentStatus::value_type&> { - ExternalConsentStatusAppender(smart_objects::SmartObject& status) + explicit ExternalConsentStatusAppender(smart_objects::SmartObject& status) : status_(status), index_(0) {} void operator()(const policy::ExternalConsentStatus::value_type& item) { @@ -710,23 +710,23 @@ void MessageHelper::SendDeleteSubmenuRequest(smart_objects::SmartObject* cmd, if ((*cmd)[strings::menu_id].asInt() == (*it->second)[strings::menu_params][hmi_request::parent_id].asInt()) { - SmartObject msg_params = SmartObject(smart_objects::SmartType_Map); - msg_params[strings::cmd_id] = (*it->second)[strings::cmd_id].asInt(); - msg_params[strings::app_id] = application->app_id(); - msg_params[strings::grammar_id] = application->get_grammar_id(); - msg_params[strings::type] = hmi_apis::Common_VRCommandType::Command; + SmartObject params = SmartObject(smart_objects::SmartType_Map); + params[strings::cmd_id] = (*it->second)[strings::cmd_id].asInt(); + params[strings::app_id] = application->app_id(); + params[strings::grammar_id] = application->get_grammar_id(); + params[strings::type] = hmi_apis::Common_VRCommandType::Command; - SmartObjectSPtr message = CreateMessageForHMI( + SmartObjectSPtr hmi_message = CreateMessageForHMI( hmi_apis::messageType::request, app_mngr.GetNextHMICorrelationID()); - DCHECK(message); + DCHECK(hmi_message); - SmartObject& object = *message; - object[strings::params][strings::function_id] = + SmartObject& smart_object = *hmi_message; + smart_object[strings::params][strings::function_id] = hmi_apis::FunctionID::VR_DeleteCommand; - object[strings::msg_params] = msg_params; + smart_object[strings::msg_params] = params; - app_mngr.GetRPCService().ManageHMICommand(message); + app_mngr.GetRPCService().ManageHMICommand(hmi_message); } } } @@ -767,9 +767,7 @@ void MessageHelper::SendResetPropertiesRequest(ApplicationSharedPtr application, using namespace smart_objects; { - SmartObject msg_params = SmartObject(smart_objects::SmartType_Map); - - msg_params = *MessageHelper::CreateAppVrHelp(application); + SmartObject msg_params = *MessageHelper::CreateAppVrHelp(application); msg_params[hmi_request::menu_title] = ""; smart_objects::SmartObject keyboard_properties = @@ -1060,7 +1058,7 @@ void MessageHelper::CreateGetVehicleDataRequest( smart_objects::SmartObject(smart_objects::SmartType_Map); for (std::vector<std::string>::const_iterator it = params.begin(); it != params.end(); - it++) { + ++it) { (*request)[strings::msg_params][*it] = true; } app_mngr.GetRPCService().ManageHMICommand(request); @@ -1337,8 +1335,6 @@ MessageHelper::CreateGlobalPropertiesRequestsToHMI( ApplicationConstSharedPtr app, ApplicationManager& app_mngr) { SDL_LOG_AUTO_TRACE(); - uint32_t correlation_id = app_mngr.GetNextHMICorrelationID(); - smart_objects::SmartObjectList requests; if (app.use_count() == 0) { SDL_LOG_ERROR("Invalid application"); @@ -1398,7 +1394,7 @@ MessageHelper::CreateGlobalPropertiesRequestsToHMI( // TTS global properties if (can_send_vr && (app->help_prompt() || app->timeout_prompt())) { - correlation_id = app_mngr.GetNextHMICorrelationID(); + uint32_t correlation_id = app_mngr.GetNextHMICorrelationID(); smart_objects::SmartObjectSPtr tts_global_properties = CreateMessageForHMI(hmi_apis::messageType::request, correlation_id); if (!tts_global_properties) { @@ -1657,8 +1653,6 @@ MessageHelper::CreateAddVRCommandRequestFromChoiceToHMI( msg_params[strings::cmd_id] = (*(it->second))[strings::choice_set][j][strings::choice_id]; msg_params[strings::vr_commands] = - smart_objects::SmartObject(smart_objects::SmartType_Array); - msg_params[strings::vr_commands] = (*(it->second))[strings::choice_set][j][strings::vr_commands]; msg_params[strings::type] = hmi_apis::Common_VRCommandType::Choice; msg_params[strings::grammar_id] = choice_grammar_id; @@ -3460,10 +3454,7 @@ mobile_apis::Result::eType MessageHelper::ProcessSoftButtons( } break; } - default: { - continue; - break; - } + default: { continue; } } soft_buttons[j++] = request_soft_buttons[i]; |