diff options
Diffstat (limited to 'src/components/application_manager/include')
366 files changed, 3029 insertions, 2691 deletions
diff --git a/src/components/application_manager/include/application_manager/application.h b/src/components/application_manager/include/application_manager/application.h index fb48bddb70..959afacc10 100644 --- a/src/components/application_manager/include/application_manager/application.h +++ b/src/components/application_manager/include/application_manager/application.h @@ -338,18 +338,19 @@ class DynamicApplicationData { * * @param Current Interaction layout of the perform interaction */ - virtual void set_perform_interaction_layout(mobile_api::LayoutMode::eType layout) = 0; + virtual void set_perform_interaction_layout( + mobile_api::LayoutMode::eType layout) = 0; - /* - * @brief Retrieve perform interaction layout - */ - virtual mobile_api::LayoutMode::eType perform_interaction_layout() const = 0; - -/* - * @brief Sets the mode for perform interaction: UI/VR/BOTH - * - * @param mode Mode that was selected (MENU; VR; BOTH) + /* + * @brief Retrieve perform interaction layout */ + virtual mobile_api::LayoutMode::eType perform_interaction_layout() const = 0; + + /* + * @brief Sets the mode for perform interaction: UI/VR/BOTH + * + * @param mode Mode that was selected (MENU; VR; BOTH) + */ virtual void set_perform_interaction_mode(int32_t mode) = 0; /* @@ -443,8 +444,7 @@ class Application : public virtual InitialApplicationData, * @brief Stops streaming service for application * @param service_type Type of streaming service */ - virtual void StopStreaming( - protocol_handler::ServiceType service_type) = 0; + virtual void StopStreaming(protocol_handler::ServiceType service_type) = 0; /** * @brief Stops streaming for application whether it is allowed or not HMI @@ -766,12 +766,13 @@ class Application : public virtual InitialApplicationData, */ virtual void LoadPersistentFiles() = 0; - /** - * @brief Get available app space - * @param name of the app folder(make + mobile app id) - * @return free app space. - */ + /** + * @brief Get available app space + * @param name of the app folder(make + mobile app id) + * @return free app space. + */ virtual uint32_t GetAvailableDiskSpace() = 0; + protected: mutable sync_primitives::Lock hmi_states_lock_; diff --git a/src/components/application_manager/include/application_manager/application_data_impl.h b/src/components/application_manager/include/application_manager/application_data_impl.h index b6653bc3ee..465e4e010a 100644 --- a/src/components/application_manager/include/application_manager/application_data_impl.h +++ b/src/components/application_manager/include/application_manager/application_data_impl.h @@ -44,241 +44,244 @@ namespace application_manager { namespace mobile_api = mobile_apis; class InitialApplicationDataImpl : public virtual Application { - public: - InitialApplicationDataImpl(); - ~InitialApplicationDataImpl(); - - const smart_objects::SmartObject* app_types() const; - const smart_objects::SmartObject* vr_synonyms() const; - virtual std::string policy_app_id() const; - const smart_objects::SmartObject* tts_name() const; - const smart_objects::SmartObject* ngn_media_screen_name() const; - const mobile_api::Language::eType& language() const; - const mobile_api::Language::eType& ui_language() const; - void set_app_types(const smart_objects::SmartObject& app_types); - void set_vr_synonyms(const smart_objects::SmartObject& vr_synonyms); - void set_mobile_app_id(const std::string& policy_app_id); - void set_tts_name(const smart_objects::SmartObject& tts_name); - void set_ngn_media_screen_name(const smart_objects::SmartObject& ngn_name); - void set_language(const mobile_api::Language::eType& language); - void set_ui_language(const mobile_api::Language::eType& ui_language); - - void set_perform_interaction_layout( - mobile_api::LayoutMode::eType layout) OVERRIDE; - mobile_api::LayoutMode::eType perform_interaction_layout() const OVERRIDE; - - - protected: - smart_objects::SmartObject* app_types_; - smart_objects::SmartObject* vr_synonyms_; - std::string mobile_app_id_; - smart_objects::SmartObject* tts_name_; - smart_objects::SmartObject* ngn_media_screen_name_; - mobile_api::Language::eType language_; - mobile_api::Language::eType ui_language_; - mobile_apis::LayoutMode::eType perform_interaction_layout_; - private: - DISALLOW_COPY_AND_ASSIGN(InitialApplicationDataImpl); + public: + InitialApplicationDataImpl(); + ~InitialApplicationDataImpl(); + + const smart_objects::SmartObject* app_types() const; + const smart_objects::SmartObject* vr_synonyms() const; + virtual std::string policy_app_id() const; + const smart_objects::SmartObject* tts_name() const; + const smart_objects::SmartObject* ngn_media_screen_name() const; + const mobile_api::Language::eType& language() const; + const mobile_api::Language::eType& ui_language() const; + void set_app_types(const smart_objects::SmartObject& app_types); + void set_vr_synonyms(const smart_objects::SmartObject& vr_synonyms); + void set_mobile_app_id(const std::string& policy_app_id); + void set_tts_name(const smart_objects::SmartObject& tts_name); + void set_ngn_media_screen_name(const smart_objects::SmartObject& ngn_name); + void set_language(const mobile_api::Language::eType& language); + void set_ui_language(const mobile_api::Language::eType& ui_language); + + void set_perform_interaction_layout( + mobile_api::LayoutMode::eType layout) OVERRIDE; + mobile_api::LayoutMode::eType perform_interaction_layout() const OVERRIDE; + + protected: + smart_objects::SmartObject* app_types_; + smart_objects::SmartObject* vr_synonyms_; + std::string mobile_app_id_; + smart_objects::SmartObject* tts_name_; + smart_objects::SmartObject* ngn_media_screen_name_; + mobile_api::Language::eType language_; + mobile_api::Language::eType ui_language_; + mobile_apis::LayoutMode::eType perform_interaction_layout_; + + private: + DISALLOW_COPY_AND_ASSIGN(InitialApplicationDataImpl); }; class DynamicApplicationDataImpl : public virtual Application { - public: - DynamicApplicationDataImpl(); - ~DynamicApplicationDataImpl(); - const smart_objects::SmartObject* help_prompt() const; - const smart_objects::SmartObject* timeout_prompt() const; - const smart_objects::SmartObject* vr_help_title() const; - const smart_objects::SmartObject* vr_help() const; - const mobile_api::TBTState::eType& tbt_state() const; - const smart_objects::SmartObject* show_command() const; - const smart_objects::SmartObject* tbt_show_command() const; - const smart_objects::SmartObject* keyboard_props() const; - const smart_objects::SmartObject* menu_title() const; - const smart_objects::SmartObject* menu_icon() const; - - void load_global_properties(const smart_objects::SmartObject& properties_so); - void set_help_prompt(const smart_objects::SmartObject& help_prompt); - void set_timeout_prompt(const smart_objects::SmartObject& timeout_prompt); - void set_vr_help_title(const smart_objects::SmartObject& vr_help_title); - void reset_vr_help_title(); - void set_vr_help(const smart_objects::SmartObject& vr_help); - void reset_vr_help(); - void set_tbt_state(const mobile_api::TBTState::eType& tbt_state); - void set_show_command(const smart_objects::SmartObject& show_command); - void set_tbt_show_command(const smart_objects::SmartObject& tbt_show); - void set_keyboard_props(const smart_objects::SmartObject& keyboard_props); - void set_menu_title(const smart_objects::SmartObject& menu_title); - void set_menu_icon(const smart_objects::SmartObject& menu_icon); - /* - * @brief Adds a command to the in application menu - */ - void AddCommand(uint32_t cmd_id, - const smart_objects::SmartObject& command); - - /* - * @brief Deletes all commands from the application menu with the specified command id - */ - void RemoveCommand(uint32_t cmd_id); - - /* - * @brief Finds command with the specified command id - */ - smart_objects::SmartObject* FindCommand(uint32_t cmd_id); - - /* - * @brief Adds a menu to the application - */ - void AddSubMenu(uint32_t menu_id, const smart_objects::SmartObject& menu); - - /* - * @brief Deletes menu from the application menu - */ - void RemoveSubMenu(uint32_t menu_id); - - /* - * @brief Finds menu with the specified id - */ - smart_objects::SmartObject* FindSubMenu(uint32_t menu_id) const; - - /* - * @brief Returns true if sub menu with such name already exist - */ - bool IsSubMenuNameAlreadyExist(const std::string& name); - - /* - * @brief Adds a interaction choice set to the application - * - * @param choice_set_id Unique ID used for this interaction choice set - * @param choice_set SmartObject that represent choice set - */ - void AddChoiceSet(uint32_t choice_set_id, - const smart_objects::SmartObject& choice_set); - - /* - * @brief Deletes choice set from the application - * - * @param choice_set_id Unique ID of the interaction choice set - */ - void RemoveChoiceSet(uint32_t choice_set_id); - - /* - * @brief Finds choice set with the specified choice_set_id id - * - * @param choice_set_id Unique ID of the interaction choice set - */ - smart_objects::SmartObject* FindChoiceSet(uint32_t choice_set_id); - - /* - * @brief Adds perform interaction choice set to the application - * - * @param correlation_id Unique ID of the request that added this choice set - * @param choice_set_id Unique ID used for this interaction choice set - * @param choice_set SmartObject that represents choice set - */ - void AddPerformInteractionChoiceSet(uint32_t correlation_id, - uint32_t choice_set_id, const smart_objects::SmartObject& choice_set); - - /* - * @brief Deletes entirely perform interaction choice set map - * @param correlation_id Unique ID of the request that added this choice set - * - */ - void DeletePerformInteractionChoiceSet(uint32_t correlation_id); - - /* - * @brief Retrieves entirely ChoiceSet - VR commands map - * - * @return ChoiceSet map that is currently in use - */ - inline DataAccessor<PerformChoiceSetMap> performinteraction_choice_set_map() const; - - /* - * @brief Retrieve application commands - */ - inline DataAccessor<CommandsMap> commands_map() const; - - /* - * @brief Retrieve application sub menus - */ - inline DataAccessor<SubMenuMap> sub_menu_map() const; - - /* - * @brief Retrieve application choice set map - */ - inline DataAccessor<ChoiceSetMap> choice_set_map() const; - - /* - * @brief Sets perform interaction state - * - * @param active Current state of the perform interaction - */ - void set_perform_interaction_active(uint32_t active); - - /* - * @brief Retrieves perform interaction state - * - * @return TRUE if perform interaction active, otherwise FALSE - */ - inline uint32_t is_perform_interaction_active() const; - - /* - * @brief Sets the mode for perform interaction: UI/VR/BOTH - * - * @param mode Mode that was selected (MENU; VR; BOTH) - */ - void set_perform_interaction_mode(int32_t mode); - - /* - * @brief Retrieve the mode that was PerformInteraction sent in - * - * @return mode of PerformInteraction - */ - inline int32_t perform_interaction_mode() const; - - /* - * @brief Sets reset global properties state - * - * @param active Current state of the reset global properties - */ - void set_reset_global_properties_active(bool active); - - /* - * @brief Retrieves reset global properties state - * - * @return TRUE if perform interaction active, otherwise FALSE - */ - inline bool is_reset_global_properties_active() const; - -protected: - smart_objects::SmartObject* help_prompt_; - smart_objects::SmartObject* timeout_prompt_; - smart_objects::SmartObject* vr_help_title_; - smart_objects::SmartObject* vr_help_; - mobile_api::TBTState::eType tbt_state_; - smart_objects::SmartObject* show_command_; - smart_objects::SmartObject* keyboard_props_; - smart_objects::SmartObject* menu_title_; - smart_objects::SmartObject* menu_icon_; - smart_objects::SmartObject* tbt_show_command_; - - - CommandsMap commands_; - mutable sync_primitives::Lock commands_lock_; - SubMenuMap sub_menu_; - mutable sync_primitives::Lock sub_menu_lock_; - ChoiceSetMap choice_set_map_; - mutable sync_primitives::Lock choice_set_map_lock_; - PerformChoiceSetMap performinteraction_choice_set_map_; - mutable sync_primitives::Lock performinteraction_choice_set_lock_; - uint32_t is_perform_interaction_active_; - bool is_reset_global_properties_active_; - int32_t perform_interaction_mode_; - -private: - void SetGlobalProperties(const smart_objects::SmartObject& param, - void (DynamicApplicationData::*callback)( - const NsSmartDeviceLink::NsSmartObjects::SmartObject&)); - DISALLOW_COPY_AND_ASSIGN(DynamicApplicationDataImpl); + public: + DynamicApplicationDataImpl(); + ~DynamicApplicationDataImpl(); + const smart_objects::SmartObject* help_prompt() const; + const smart_objects::SmartObject* timeout_prompt() const; + const smart_objects::SmartObject* vr_help_title() const; + const smart_objects::SmartObject* vr_help() const; + const mobile_api::TBTState::eType& tbt_state() const; + const smart_objects::SmartObject* show_command() const; + const smart_objects::SmartObject* tbt_show_command() const; + const smart_objects::SmartObject* keyboard_props() const; + const smart_objects::SmartObject* menu_title() const; + const smart_objects::SmartObject* menu_icon() const; + + void load_global_properties(const smart_objects::SmartObject& properties_so); + void set_help_prompt(const smart_objects::SmartObject& help_prompt); + void set_timeout_prompt(const smart_objects::SmartObject& timeout_prompt); + void set_vr_help_title(const smart_objects::SmartObject& vr_help_title); + void reset_vr_help_title(); + void set_vr_help(const smart_objects::SmartObject& vr_help); + void reset_vr_help(); + void set_tbt_state(const mobile_api::TBTState::eType& tbt_state); + void set_show_command(const smart_objects::SmartObject& show_command); + void set_tbt_show_command(const smart_objects::SmartObject& tbt_show); + void set_keyboard_props(const smart_objects::SmartObject& keyboard_props); + void set_menu_title(const smart_objects::SmartObject& menu_title); + void set_menu_icon(const smart_objects::SmartObject& menu_icon); + /* + * @brief Adds a command to the in application menu + */ + void AddCommand(uint32_t cmd_id, const smart_objects::SmartObject& command); + + /* + * @brief Deletes all commands from the application menu with the specified + * command id + */ + void RemoveCommand(uint32_t cmd_id); + + /* + * @brief Finds command with the specified command id + */ + smart_objects::SmartObject* FindCommand(uint32_t cmd_id); + + /* + * @brief Adds a menu to the application + */ + void AddSubMenu(uint32_t menu_id, const smart_objects::SmartObject& menu); + + /* + * @brief Deletes menu from the application menu + */ + void RemoveSubMenu(uint32_t menu_id); + + /* + * @brief Finds menu with the specified id + */ + smart_objects::SmartObject* FindSubMenu(uint32_t menu_id) const; + + /* + * @brief Returns true if sub menu with such name already exist + */ + bool IsSubMenuNameAlreadyExist(const std::string& name); + + /* + * @brief Adds a interaction choice set to the application + * + * @param choice_set_id Unique ID used for this interaction choice set + * @param choice_set SmartObject that represent choice set + */ + void AddChoiceSet(uint32_t choice_set_id, + const smart_objects::SmartObject& choice_set); + + /* + * @brief Deletes choice set from the application + * + * @param choice_set_id Unique ID of the interaction choice set + */ + void RemoveChoiceSet(uint32_t choice_set_id); + + /* + * @brief Finds choice set with the specified choice_set_id id + * + * @param choice_set_id Unique ID of the interaction choice set + */ + smart_objects::SmartObject* FindChoiceSet(uint32_t choice_set_id); + + /* + * @brief Adds perform interaction choice set to the application + * + * @param correlation_id Unique ID of the request that added this choice set + * @param choice_set_id Unique ID used for this interaction choice set + * @param choice_set SmartObject that represents choice set + */ + void AddPerformInteractionChoiceSet( + uint32_t correlation_id, + uint32_t choice_set_id, + const smart_objects::SmartObject& choice_set); + + /* + * @brief Deletes entirely perform interaction choice set map + * @param correlation_id Unique ID of the request that added this choice set + * + */ + void DeletePerformInteractionChoiceSet(uint32_t correlation_id); + + /* + * @brief Retrieves entirely ChoiceSet - VR commands map + * + * @return ChoiceSet map that is currently in use + */ + inline DataAccessor<PerformChoiceSetMap> performinteraction_choice_set_map() + const; + + /* + * @brief Retrieve application commands + */ + inline DataAccessor<CommandsMap> commands_map() const; + + /* + * @brief Retrieve application sub menus + */ + inline DataAccessor<SubMenuMap> sub_menu_map() const; + + /* + * @brief Retrieve application choice set map + */ + inline DataAccessor<ChoiceSetMap> choice_set_map() const; + + /* + * @brief Sets perform interaction state + * + * @param active Current state of the perform interaction + */ + void set_perform_interaction_active(uint32_t active); + + /* + * @brief Retrieves perform interaction state + * + * @return TRUE if perform interaction active, otherwise FALSE + */ + inline uint32_t is_perform_interaction_active() const; + + /* + * @brief Sets the mode for perform interaction: UI/VR/BOTH + * + * @param mode Mode that was selected (MENU; VR; BOTH) + */ + void set_perform_interaction_mode(int32_t mode); + + /* + * @brief Retrieve the mode that was PerformInteraction sent in + * + * @return mode of PerformInteraction + */ + inline int32_t perform_interaction_mode() const; + + /* + * @brief Sets reset global properties state + * + * @param active Current state of the reset global properties + */ + void set_reset_global_properties_active(bool active); + + /* + * @brief Retrieves reset global properties state + * + * @return TRUE if perform interaction active, otherwise FALSE + */ + inline bool is_reset_global_properties_active() const; + + protected: + smart_objects::SmartObject* help_prompt_; + smart_objects::SmartObject* timeout_prompt_; + smart_objects::SmartObject* vr_help_title_; + smart_objects::SmartObject* vr_help_; + mobile_api::TBTState::eType tbt_state_; + smart_objects::SmartObject* show_command_; + smart_objects::SmartObject* keyboard_props_; + smart_objects::SmartObject* menu_title_; + smart_objects::SmartObject* menu_icon_; + smart_objects::SmartObject* tbt_show_command_; + + CommandsMap commands_; + mutable sync_primitives::Lock commands_lock_; + SubMenuMap sub_menu_; + mutable sync_primitives::Lock sub_menu_lock_; + ChoiceSetMap choice_set_map_; + mutable sync_primitives::Lock choice_set_map_lock_; + PerformChoiceSetMap performinteraction_choice_set_map_; + mutable sync_primitives::Lock performinteraction_choice_set_lock_; + uint32_t is_perform_interaction_active_; + bool is_reset_global_properties_active_; + int32_t perform_interaction_mode_; + + private: + void SetGlobalProperties( + const smart_objects::SmartObject& param, + void (DynamicApplicationData::*callback)( + const NsSmartDeviceLink::NsSmartObjects::SmartObject&)); + DISALLOW_COPY_AND_ASSIGN(DynamicApplicationDataImpl); }; DataAccessor<CommandsMap> DynamicApplicationDataImpl::commands_map() const { @@ -295,9 +298,8 @@ DataAccessor<ChoiceSetMap> DynamicApplicationDataImpl::choice_set_map() const { DataAccessor<PerformChoiceSetMap> DynamicApplicationDataImpl::performinteraction_choice_set_map() const { - return DataAccessor<PerformChoiceSetMap>( - performinteraction_choice_set_map_, - performinteraction_choice_set_lock_); + return DataAccessor<PerformChoiceSetMap>(performinteraction_choice_set_map_, + performinteraction_choice_set_lock_); } uint32_t DynamicApplicationDataImpl::is_perform_interaction_active() const { diff --git a/src/components/application_manager/include/application_manager/application_impl.h b/src/components/application_manager/include/application_manager/application_impl.h index 6400b2b3ca..89520de575 100644 --- a/src/components/application_manager/include/application_manager/application_impl.h +++ b/src/components/application_manager/include/application_manager/application_impl.h @@ -106,16 +106,11 @@ class ApplicationImpl : public virtual InitialApplicationDataImpl, bool audio_streaming_allowed() const; void set_audio_streaming_allowed(bool state); - void StartStreaming( - protocol_handler::ServiceType service_type); - void StopStreamingForce( - protocol_handler::ServiceType service_type); - void StopStreaming( - protocol_handler::ServiceType service_type); - void SuspendStreaming( - protocol_handler::ServiceType service_type); - void WakeUpStreaming( - protocol_handler::ServiceType service_type); + void StartStreaming(protocol_handler::ServiceType service_type); + void StopStreamingForce(protocol_handler::ServiceType service_type); + void StopStreaming(protocol_handler::ServiceType service_type); + void SuspendStreaming(protocol_handler::ServiceType service_type); + void WakeUpStreaming(protocol_handler::ServiceType service_type); virtual bool is_voice_communication_supported() const; virtual void set_voice_communication_supported( @@ -193,12 +188,12 @@ class ApplicationImpl : public virtual InitialApplicationDataImpl, #ifdef CUSTOMER_PASA virtual bool flag_sending_hash_change_after_awake() const; virtual void set_flag_sending_hash_change_after_awake(bool flag); -#endif // CUSTOMER_PASA - /** - * @brief Change Hash for current application - * and send notification to mobile - * @return updated_hash - */ +#endif // CUSTOMER_PASA + /** + * @brief Change Hash for current application + * and send notification to mobile + * @return updated_hash + */ virtual void UpdateHash(); UsageStatistics& usage_report(); @@ -299,6 +294,7 @@ class ApplicationImpl : public virtual InitialApplicationDataImpl, * @return free app space. */ uint32_t GetAvailableDiskSpace() OVERRIDE; + protected: /** * @brief Clean up application folder. Persistent files will stay diff --git a/src/components/application_manager/include/application_manager/application_manager.h b/src/components/application_manager/include/application_manager/application_manager.h index 30240b744d..411ecec092 100644 --- a/src/components/application_manager/include/application_manager/application_manager.h +++ b/src/components/application_manager/include/application_manager/application_manager.h @@ -255,7 +255,7 @@ class ApplicationManager { virtual const HMICapabilities& hmi_capabilities() const = 0; virtual void ProcessQueryApp(const smart_objects::SmartObject& sm_object, - const uint32_t connection_key) = 0; + const uint32_t connection_key) = 0; virtual bool is_attenuated_supported() const = 0; @@ -283,182 +283,182 @@ class ApplicationManager { virtual policy::PolicyHandlerInterface& GetPolicyHandler() = 0; virtual uint32_t GetNextHMICorrelationID() = 0; - virtual uint32_t GenerateNewHMIAppID() = 0 ; - - /** - * @brief Ends opened navi services (audio/video) for application - * @param app_id Application id - */ - virtual void EndNaviServices(uint32_t app_id) = 0; - - /* @brief Starts audio passthru process - * - * @return true on success, false if passthru is already in process - */ - virtual bool BeginAudioPassThrough() = 0; - - /* - * @brief Finishes already started audio passthru process - * - * @return true on success, false if passthru is not active - */ - virtual bool EndAudioPassThrough() = 0 ; - - - virtual void ConnectToDevice(const std::string& device_mac) = 0; - - virtual void OnHMIStartedCooperation() = 0 ; - - virtual bool IsHMICooperating() const = 0; - /** - * @brief Notifies all components interested in Vehicle Data update - * i.e. new value of odometer etc and returns list of applications - * subscribed for event. - * @param vehicle_info Enum value of type of vehicle data - * @param new value (for integer values currently) of vehicle data - */ - virtual std::vector<ApplicationSharedPtr> IviInfoUpdated( - VehicleDataType vehicle_info, int value) = 0; - - virtual ApplicationSharedPtr RegisterApplication(const utils::SharedPtr< - smart_objects::SmartObject>& request_for_registration) = 0; - - virtual void SendUpdateAppList() = 0; - - virtual void MarkAppsGreyOut(const connection_handler::DeviceHandle handle, - bool is_greyed_out) = 0; - virtual bool IsAppsQueriedFrom( - const connection_handler::DeviceHandle handle) const = 0; - - virtual bool IsStopping() const = 0; - - virtual void RemoveAppFromTTSGlobalPropertiesList(const uint32_t app_id) = 0; - - virtual mobile_apis::Result::eType SaveBinary(const std::vector<uint8_t>& binary_data, - const std::string& file_path, - const std::string& file_name, - const int64_t offset) = 0; - /* - * @brief Sets SDL access to all mobile apps - * - * @param allowed SDL access to all mobile apps - */ - virtual void SetAllAppsAllowed(const bool allowed) = 0; - - /* - * @brief Sets state for driver distraction - * - * @param state New state to be set - */ - virtual void set_driver_distraction(bool is_distracting) = 0; - - /* - * @brief Starts audio pass thru thread - * - * @param session_key Session key of connection for Mobile side - * @param correlation_id Correlation id for response for Mobile side - * @param max_duration Max duration of audio recording in milliseconds - * @param sampling_rate Value for rate(8, 16, 22, 44 kHz) - * @param bits_per_sample The quality the audio is recorded. - * @param audio_type Type of audio data - */ - virtual void StartAudioPassThruThread(int32_t session_key, - int32_t correlation_id, - int32_t max_duration, - int32_t sampling_rate, - int32_t bits_per_sample, - int32_t audio_type) = 0; - - virtual void StartDevicesDiscovery() = 0; - - virtual void StopAudioPassThru(int32_t application_key) = 0; - - /** - * @brief TerminateRequest forces termination of request - * @param connection_key - application id of request - * @param corr_id correlation id of request - */ - virtual void TerminateRequest(uint32_t connection_key, uint32_t corr_id) = 0; - - /* - * @brief Closes application by id - * - * @param app_id Application id - * @param reason reason of unregistering application - * @param is_resuming describes - is this unregister - * is normal or need to be resumed\ - * @param is_unexpected_disconnect - * Indicates if connection was unexpectedly lost(TM layer, HB) - */ - virtual void UnregisterApplication(const uint32_t& app_id, - mobile_apis::Result::eType reason, - bool is_resuming = false, - bool is_unexpected_disconnect = false) = 0; - - /** - * @ Updates request timeout - * - * @param connection_key Connection key of application - * @param mobile_correlation_id Correlation ID of the mobile request - * @param new_timeout_value New timeout in milliseconds to be set - */ - virtual void updateRequestTimeout(uint32_t connection_key, - uint32_t mobile_correlation_id, - uint32_t new_timeout_value) = 0; - - virtual StateController& state_controller() = 0; - - virtual void SetUnregisterAllApplicationsReason( - mobile_api::AppInterfaceUnregisteredReason::eType reason) = 0; - - /* - * @brief Called on Master_reset or Factory_defaults - * when User chooses to reset HU. - * Resets Policy Table if applicable. - */ - virtual void HeadUnitReset(mobile_api::AppInterfaceUnregisteredReason::eType reason) = 0; - - /** - * @brief Checks HMI level and returns true if streaming is allowed - * @param app_id Application id - * @param service_type Service type to check - * @return True if streaming is allowed, false in other case - */ - virtual bool HMILevelAllowsStreaming( - uint32_t app_id, protocol_handler::ServiceType service_type) const = 0; - - /** - * @brief Checks, if given RPC is allowed at current HMI level for specific - * application in policy table - * @param policy_app_id Application id - * @param hmi_level Current HMI level of application - * @param function_id FunctionID of RPC - * @param params_permissions Permissions for RPC parameters (e.g. - * SubscribeVehicleData) defined in policy table - * @return SUCCESS, if allowed, otherwise result code of check - */ - virtual mobile_apis::Result::eType CheckPolicyPermissions( - const std::string& policy_app_id, - mobile_apis::HMILevel::eType hmi_level, - mobile_apis::FunctionID::eType function_id, - const RPCParams& rpc_params, - CommandParametersPermissions* params_permissions = NULL) = 0; - - - /** - * @brief IsApplicationForbidden allows to distinguish if application is - * not allowed to register, because of spamming. - * - * @param connection_key the connection key ofthe required application - * - * @param policy_app_id application's mobile(policy) identifier. - * - * @return true in case application is allowed to register, false otherwise. - */ - virtual bool IsApplicationForbidden(uint32_t connection_key, - const std::string& policy_app_id) const = 0; - - virtual resumption::ResumeCtrl& resume_controller() = 0 ; + virtual uint32_t GenerateNewHMIAppID() = 0; + + /** + * @brief Ends opened navi services (audio/video) for application + * @param app_id Application id + */ + virtual void EndNaviServices(uint32_t app_id) = 0; + + /* @brief Starts audio passthru process + * + * @return true on success, false if passthru is already in process + */ + virtual bool BeginAudioPassThrough() = 0; + + /* + * @brief Finishes already started audio passthru process + * + * @return true on success, false if passthru is not active + */ + virtual bool EndAudioPassThrough() = 0; + + virtual void ConnectToDevice(const std::string& device_mac) = 0; + + virtual void OnHMIStartedCooperation() = 0; + + virtual bool IsHMICooperating() const = 0; + /** + * @brief Notifies all components interested in Vehicle Data update + * i.e. new value of odometer etc and returns list of applications + * subscribed for event. + * @param vehicle_info Enum value of type of vehicle data + * @param new value (for integer values currently) of vehicle data + */ + virtual std::vector<ApplicationSharedPtr> IviInfoUpdated( + VehicleDataType vehicle_info, int value) = 0; + + virtual ApplicationSharedPtr RegisterApplication(const utils::SharedPtr< + smart_objects::SmartObject>& request_for_registration) = 0; + + virtual void SendUpdateAppList() = 0; + + virtual void MarkAppsGreyOut(const connection_handler::DeviceHandle handle, + bool is_greyed_out) = 0; + virtual bool IsAppsQueriedFrom( + const connection_handler::DeviceHandle handle) const = 0; + + virtual bool IsStopping() const = 0; + + virtual void RemoveAppFromTTSGlobalPropertiesList(const uint32_t app_id) = 0; + + virtual mobile_apis::Result::eType SaveBinary( + const std::vector<uint8_t>& binary_data, + const std::string& file_path, + const std::string& file_name, + const int64_t offset) = 0; + /* + * @brief Sets SDL access to all mobile apps + * + * @param allowed SDL access to all mobile apps + */ + virtual void SetAllAppsAllowed(const bool allowed) = 0; + + /* + * @brief Sets state for driver distraction + * + * @param state New state to be set + */ + virtual void set_driver_distraction(bool is_distracting) = 0; + + /* + * @brief Starts audio pass thru thread + * + * @param session_key Session key of connection for Mobile side + * @param correlation_id Correlation id for response for Mobile side + * @param max_duration Max duration of audio recording in milliseconds + * @param sampling_rate Value for rate(8, 16, 22, 44 kHz) + * @param bits_per_sample The quality the audio is recorded. + * @param audio_type Type of audio data + */ + virtual void StartAudioPassThruThread(int32_t session_key, + int32_t correlation_id, + int32_t max_duration, + int32_t sampling_rate, + int32_t bits_per_sample, + int32_t audio_type) = 0; + + virtual void StartDevicesDiscovery() = 0; + + virtual void StopAudioPassThru(int32_t application_key) = 0; + + /** + * @brief TerminateRequest forces termination of request + * @param connection_key - application id of request + * @param corr_id correlation id of request + */ + virtual void TerminateRequest(uint32_t connection_key, uint32_t corr_id) = 0; + + /* + * @brief Closes application by id + * + * @param app_id Application id + * @param reason reason of unregistering application + * @param is_resuming describes - is this unregister + * is normal or need to be resumed\ + * @param is_unexpected_disconnect + * Indicates if connection was unexpectedly lost(TM layer, HB) + */ + virtual void UnregisterApplication(const uint32_t& app_id, + mobile_apis::Result::eType reason, + bool is_resuming = false, + bool is_unexpected_disconnect = false) = 0; + + /** + * @ Updates request timeout + * + * @param connection_key Connection key of application + * @param mobile_correlation_id Correlation ID of the mobile request + * @param new_timeout_value New timeout in milliseconds to be set + */ + virtual void updateRequestTimeout(uint32_t connection_key, + uint32_t mobile_correlation_id, + uint32_t new_timeout_value) = 0; + + virtual StateController& state_controller() = 0; + + virtual void SetUnregisterAllApplicationsReason( + mobile_api::AppInterfaceUnregisteredReason::eType reason) = 0; + + /* + * @brief Called on Master_reset or Factory_defaults + * when User chooses to reset HU. + * Resets Policy Table if applicable. + */ + virtual void HeadUnitReset( + mobile_api::AppInterfaceUnregisteredReason::eType reason) = 0; + + /** + * @brief Checks HMI level and returns true if streaming is allowed + * @param app_id Application id + * @param service_type Service type to check + * @return True if streaming is allowed, false in other case + */ + virtual bool HMILevelAllowsStreaming( + uint32_t app_id, protocol_handler::ServiceType service_type) const = 0; + + /** + * @brief Checks, if given RPC is allowed at current HMI level for specific + * application in policy table + * @param policy_app_id Application id + * @param hmi_level Current HMI level of application + * @param function_id FunctionID of RPC + * @param params_permissions Permissions for RPC parameters (e.g. + * SubscribeVehicleData) defined in policy table + * @return SUCCESS, if allowed, otherwise result code of check + */ + virtual mobile_apis::Result::eType CheckPolicyPermissions( + const std::string& policy_app_id, + mobile_apis::HMILevel::eType hmi_level, + mobile_apis::FunctionID::eType function_id, + const RPCParams& rpc_params, + CommandParametersPermissions* params_permissions = NULL) = 0; + + /** + * @brief IsApplicationForbidden allows to distinguish if application is + * not allowed to register, because of spamming. + * + * @param connection_key the connection key ofthe required application + * + * @param policy_app_id application's mobile(policy) identifier. + * + * @return true in case application is allowed to register, false otherwise. + */ + virtual bool IsApplicationForbidden( + uint32_t connection_key, const std::string& policy_app_id) const = 0; + + virtual resumption::ResumeCtrl& resume_controller() = 0; /* * @brief Converts connection string transport type representation * to HMI Common_TransportType @@ -467,62 +467,61 @@ class ApplicationManager { * * @return Corresponding HMI TransporType value */ - virtual hmi_apis::Common_TransportType::eType GetDeviceTransportType( + virtual hmi_apis::Common_TransportType::eType GetDeviceTransportType( const std::string& transport_type) = 0; - /** - * @brief method adds application - * to tts_global_properties_app_list_ - * @param app_id contains application which will - * send TTS global properties after timeout - */ - virtual void AddAppToTTSGlobalPropertiesList(const uint32_t app_id) = 0; + /** + * @brief method adds application + * to tts_global_properties_app_list_ + * @param app_id contains application which will + * send TTS global properties after timeout + */ + virtual void AddAppToTTSGlobalPropertiesList(const uint32_t app_id) = 0; - /** - * Generate grammar ID - * - * @return New grammar ID - */ - virtual uint32_t GenerateGrammarID() = 0; - - virtual policy::DeviceConsent GetUserConsentForDevice( - const std::string& device_id) const = 0; - - /** - * @brief Handle sequence for unauthorized application - * @param app_id Application id - */ - virtual void OnAppUnauthorized(const uint32_t& app_id) = 0; - - virtual bool ActivateApplication(ApplicationSharedPtr app) = 0; - - /** - * @brief Callback calls when application starts/stops data streaming - * @param app_id Streaming application id - * @param service_type Streaming service type - * @param state Shows if streaming started or stopped - */ - virtual void OnAppStreaming(uint32_t app_id, - protocol_handler::ServiceType service_type, - bool state) = 0; - - - /** - * @brief CreateRegularState create regular HMI state for application - * @param app_id - * @param hmi_level of returned state - * @param audio_state of returned state - * @param system_context of returned state - * @return new regular HMI state - */ - virtual HmiStatePtr CreateRegularState( - uint32_t app_id, - mobile_apis::HMILevel::eType hmi_level, - mobile_apis::AudioStreamingState::eType audio_state, - mobile_apis::SystemContext::eType system_context) const = 0; - - virtual void SendAudioPassThroughNotification(uint32_t session_key, - std::vector<uint8_t>& binary_data) = 0; + /** + * Generate grammar ID + * + * @return New grammar ID + */ + virtual uint32_t GenerateGrammarID() = 0; + + virtual policy::DeviceConsent GetUserConsentForDevice( + const std::string& device_id) const = 0; + + /** + * @brief Handle sequence for unauthorized application + * @param app_id Application id + */ + virtual void OnAppUnauthorized(const uint32_t& app_id) = 0; + + virtual bool ActivateApplication(ApplicationSharedPtr app) = 0; + + /** + * @brief Callback calls when application starts/stops data streaming + * @param app_id Streaming application id + * @param service_type Streaming service type + * @param state Shows if streaming started or stopped + */ + virtual void OnAppStreaming(uint32_t app_id, + protocol_handler::ServiceType service_type, + bool state) = 0; + + /** + * @brief CreateRegularState create regular HMI state for application + * @param app_id + * @param hmi_level of returned state + * @param audio_state of returned state + * @param system_context of returned state + * @return new regular HMI state + */ + virtual HmiStatePtr CreateRegularState( + uint32_t app_id, + mobile_apis::HMILevel::eType hmi_level, + mobile_apis::AudioStreamingState::eType audio_state, + mobile_apis::SystemContext::eType system_context) const = 0; + + virtual void SendAudioPassThroughNotification( + uint32_t session_key, std::vector<uint8_t>& binary_data) = 0; /** * @brief Checks if application can stream (streaming service is started and @@ -531,19 +530,18 @@ class ApplicationManager { * @param service_type Service type to check * @return True if streaming is allowed, false in other case */ - virtual bool CanAppStream(uint32_t app_id, - protocol_handler::ServiceType service_type) const = 0; - - /** - * @brief ForbidStreaming forbid the stream over the certain application. - * @param app_id the application's id which should stop streaming. - */ - virtual void ForbidStreaming(uint32_t app_id) = 0; + virtual bool CanAppStream( + uint32_t app_id, protocol_handler::ServiceType service_type) const = 0; - virtual const ApplicationManagerSettings& get_settings() const = 0; + /** + * @brief ForbidStreaming forbid the stream over the certain application. + * @param app_id the application's id which should stop streaming. + */ + virtual void ForbidStreaming(uint32_t app_id) = 0; - virtual event_engine::EventDispatcher& event_dispatcher() = 0; + virtual const ApplicationManagerSettings& get_settings() const = 0; + virtual event_engine::EventDispatcher& event_dispatcher() = 0; }; } // namespace application_manager diff --git a/src/components/application_manager/include/application_manager/application_manager_impl.h b/src/components/application_manager/include/application_manager/application_manager_impl.h index 6da96306d1..91b0f3f86f 100644 --- a/src/components/application_manager/include/application_manager/application_manager_impl.h +++ b/src/components/application_manager/include/application_manager/application_manager_impl.h @@ -208,9 +208,10 @@ class ApplicationManagerImpl public impl::ToHmiQueue::Handler, public impl::AudioPassThruQueue::Handler #ifdef TELEMETRY_MONITOR - , public telemetry_monitor::TelemetryObservable<AMTelemetryObserver> + , + public telemetry_monitor::TelemetryObservable<AMTelemetryObserver> #endif // TELEMETRY_MONITOR -{ + { friend class ResumeCtrl; friend class CommandImpl; @@ -669,8 +670,8 @@ class ApplicationManagerImpl * * @param binary_data AudioPassThru data chunk */ - void SendAudioPassThroughNotification(uint32_t session_key, - std::vector<uint8_t>& binary_data) OVERRIDE; + void SendAudioPassThroughNotification( + uint32_t session_key, std::vector<uint8_t>& binary_data) OVERRIDE; std::string GetDeviceName(connection_handler::DeviceHandle handle); @@ -708,7 +709,7 @@ class ApplicationManagerImpl * @param connection_key - application id of request * @param corr_id correlation id of request */ - void TerminateRequest(uint32_t connection_key, uint32_t corr_id)OVERRIDE; + void TerminateRequest(uint32_t connection_key, uint32_t corr_id) OVERRIDE; // Overriden ProtocolObserver method void OnMessageReceived( const ::protocol_handler::RawMessagePtr message) OVERRIDE; @@ -837,7 +838,7 @@ class ApplicationManagerImpl * Getter for resume_controller * @return Resume Controller */ - resumption::ResumeCtrl& resume_controller() OVERRIDE{ + resumption::ResumeCtrl& resume_controller() OVERRIDE { return resume_ctrl_; } @@ -853,7 +854,7 @@ class ApplicationManagerImpl * * @return New HMI application ID */ - uint32_t GenerateNewHMIAppID()OVERRIDE; + uint32_t GenerateNewHMIAppID() OVERRIDE; /** * @brief Parse smartObject and replace mobile app Id by HMI app ID @@ -939,7 +940,7 @@ class ApplicationManagerImpl protocol_handler::ProtocolHandler& protocol_handler() const OVERRIDE; virtual policy::PolicyHandlerInterface& GetPolicyHandler() OVERRIDE { - return policy_handler_; + return policy_handler_; } /** * @brief Checks, if given RPC is allowed at current HMI level for specific @@ -1097,7 +1098,8 @@ class ApplicationManagerImpl * @param handle, Device handle * @return true, if list had been queried already, otherwise - false */ - bool IsAppsQueriedFrom(const connection_handler::DeviceHandle handle) const OVERRIDE; + bool IsAppsQueriedFrom( + const connection_handler::DeviceHandle handle) const OVERRIDE; bool IsStopping() const OVERRIDE { return is_stopping_; @@ -1107,7 +1109,7 @@ class ApplicationManagerImpl const ApplicationManagerSettings& get_settings() const OVERRIDE; virtual event_engine::EventDispatcher& event_dispatcher() OVERRIDE; -private: + private: /** * @brief PullLanguagesInfo allows to pull information about languages. * @@ -1187,8 +1189,11 @@ private: smart_objects::SmartObject hmi_application(smart_objects::SmartType_Map); const protocol_handler::SessionObserver& session_observer = connection_handler().get_session_observer(); - if (MessageHelper::CreateHMIApplicationStruct( - *it, session_observer, GetPolicyHandler(), &hmi_application, app_mngr)) { + if (MessageHelper::CreateHMIApplicationStruct(*it, + session_observer, + GetPolicyHandler(), + &hmi_application, + app_mngr)) { applications[app_count++] = hmi_application; } else { LOG4CXX_DEBUG(logger_, "Can't CreateHMIApplicationStruct "); diff --git a/src/components/application_manager/include/application_manager/commands/command.h b/src/components/application_manager/include/application_manager/commands/command.h index 17c9bcb64b..fb2bc6d78f 100644 --- a/src/components/application_manager/include/application_manager/commands/command.h +++ b/src/components/application_manager/include/application_manager/commands/command.h @@ -108,17 +108,13 @@ class Command { */ virtual bool AllowedToTerminate() = 0; - /** - * @brief SetAllowedToTerminate set up allowed to terminate flag. - * If true, request controller will terminate request on response - */ + /** + * @brief SetAllowedToTerminate set up allowed to terminate flag. + * If true, request controller will terminate request on response + */ virtual void SetAllowedToTerminate(const bool allowed) = 0; - - enum CommandOrigin { - ORIGIN_SDL, - ORIGIN_MOBILE - }; + enum CommandOrigin { ORIGIN_SDL, ORIGIN_MOBILE }; }; typedef smart_objects::SmartObjectSPtr MessageSharedPtr; diff --git a/src/components/application_manager/include/application_manager/commands/command_impl.h b/src/components/application_manager/include/application_manager/commands/command_impl.h index 037de899e4..439b1756ef 100644 --- a/src/components/application_manager/include/application_manager/commands/command_impl.h +++ b/src/components/application_manager/include/application_manager/commands/command_impl.h @@ -63,7 +63,7 @@ class CommandImpl : public Command { * @param message Incoming SmartObject message **/ CommandImpl(const MessageSharedPtr& message, - ApplicationManager& application_manager); + ApplicationManager& application_manager); /** * @brief CommandImpl class destructor @@ -138,7 +138,7 @@ class CommandImpl : public Command { // members static const int32_t hmi_protocol_type_; static const int32_t mobile_protocol_type_; - static const int32_t protocol_version_; + static const int32_t protocol_version_; protected: /** @@ -162,11 +162,10 @@ class CommandImpl : public Command { #ifdef ENABLE_LOG static log4cxx::LoggerPtr logger_; -#endif // ENABLE_LOG +#endif // ENABLE_LOG private: DISALLOW_COPY_AND_ASSIGN(CommandImpl); - }; } // namespace commands diff --git a/src/components/application_manager/include/application_manager/commands/command_notification_from_mobile_impl.h b/src/components/application_manager/include/application_manager/commands/command_notification_from_mobile_impl.h index 242f9f28f4..2f3b809274 100644 --- a/src/components/application_manager/include/application_manager/commands/command_notification_from_mobile_impl.h +++ b/src/components/application_manager/include/application_manager/commands/command_notification_from_mobile_impl.h @@ -48,12 +48,13 @@ namespace commands { class CommandNotificationFromMobileImpl : public CommandImpl { public: CommandNotificationFromMobileImpl(const MessageSharedPtr& message, - ApplicationManager& application_manager); + ApplicationManager& application_manager); virtual ~CommandNotificationFromMobileImpl(); virtual bool Init(); virtual bool CleanUp(); virtual void Run(); void SendNotification(); + private: DISALLOW_COPY_AND_ASSIGN(CommandNotificationFromMobileImpl); }; diff --git a/src/components/application_manager/include/application_manager/commands/command_notification_impl.h b/src/components/application_manager/include/application_manager/commands/command_notification_impl.h index cebb0d3944..25a2a18aca 100644 --- a/src/components/application_manager/include/application_manager/commands/command_notification_impl.h +++ b/src/components/application_manager/include/application_manager/commands/command_notification_impl.h @@ -48,12 +48,13 @@ namespace commands { class CommandNotificationImpl : public CommandImpl { public: CommandNotificationImpl(const MessageSharedPtr& message, - ApplicationManager& application_manager); + ApplicationManager& application_manager); virtual ~CommandNotificationImpl(); virtual bool Init(); virtual bool CleanUp(); virtual void Run(); void SendNotification(); + private: DISALLOW_COPY_AND_ASSIGN(CommandNotificationImpl); }; diff --git a/src/components/application_manager/include/application_manager/commands/command_request_impl.h b/src/components/application_manager/include/application_manager/commands/command_request_impl.h index 1ddbdd9fc4..02623cb4d2 100644 --- a/src/components/application_manager/include/application_manager/commands/command_request_impl.h +++ b/src/components/application_manager/include/application_manager/commands/command_request_impl.h @@ -55,7 +55,7 @@ class CommandRequestImpl : public CommandImpl, enum RequestState { kAwaitingHMIResponse = 0, kTimedOut, kCompleted }; CommandRequestImpl(const MessageSharedPtr& message, - ApplicationManager& application_manager); + ApplicationManager& application_manager); virtual ~CommandRequestImpl(); virtual bool CheckPermissions(); virtual bool Init(); diff --git a/src/components/application_manager/include/application_manager/commands/command_response_impl.h b/src/components/application_manager/include/application_manager/commands/command_response_impl.h index 665fede84a..2b52ea5a58 100644 --- a/src/components/application_manager/include/application_manager/commands/command_response_impl.h +++ b/src/components/application_manager/include/application_manager/commands/command_response_impl.h @@ -49,7 +49,7 @@ namespace commands { class CommandResponseImpl : public CommandImpl { public: CommandResponseImpl(const MessageSharedPtr& message, - ApplicationManager& application_manager); + ApplicationManager& application_manager); virtual ~CommandResponseImpl(); virtual bool Init(); virtual bool CleanUp(); @@ -58,6 +58,7 @@ class CommandResponseImpl : public CommandImpl { const mobile_apis::Result::eType& result_code = mobile_apis::Result::INVALID_ENUM, bool final_message = false); + private: DISALLOW_COPY_AND_ASSIGN(CommandResponseImpl); }; diff --git a/src/components/application_manager/include/application_manager/commands/hmi/activate_app_request.h b/src/components/application_manager/include/application_manager/commands/hmi/activate_app_request.h index d92ad0cac3..090a77b9ed 100644 --- a/src/components/application_manager/include/application_manager/commands/hmi/activate_app_request.h +++ b/src/components/application_manager/include/application_manager/commands/hmi/activate_app_request.h @@ -43,26 +43,27 @@ namespace commands { * @brief ActivateAppRequest command class **/ class ActivateAppRequest : public RequestToHMI { - public: - /** - * @brief ActivateAppRequest class constructor - * - * @param message Incoming SmartObject message - **/ - ActivateAppRequest(const MessageSharedPtr& message, ApplicationManager& application_manager); + public: + /** + * @brief ActivateAppRequest class constructor + * + * @param message Incoming SmartObject message + **/ + ActivateAppRequest(const MessageSharedPtr& message, + ApplicationManager& application_manager); - /** - * @brief ActivateAppRequest class destructor - **/ - virtual ~ActivateAppRequest(); + /** + * @brief ActivateAppRequest class destructor + **/ + virtual ~ActivateAppRequest(); - /** - * @brief Execute command - **/ - virtual void Run(); + /** + * @brief Execute command + **/ + virtual void Run(); - private: - DISALLOW_COPY_AND_ASSIGN(ActivateAppRequest); + private: + DISALLOW_COPY_AND_ASSIGN(ActivateAppRequest); }; } // namespace commands diff --git a/src/components/application_manager/include/application_manager/commands/hmi/activate_app_response.h b/src/components/application_manager/include/application_manager/commands/hmi/activate_app_response.h index 1e008c4525..471de1135e 100644 --- a/src/components/application_manager/include/application_manager/commands/hmi/activate_app_response.h +++ b/src/components/application_manager/include/application_manager/commands/hmi/activate_app_response.h @@ -43,26 +43,27 @@ namespace commands { * @brief ActivateAppResponse command class **/ class ActivateAppResponse : public ResponseFromHMI { - public: - /** - * @brief ActivateAppResponse class constructor - * - * @param message Incoming SmartObject message - **/ - ActivateAppResponse(const MessageSharedPtr& message, ApplicationManager& application_manager); + public: + /** + * @brief ActivateAppResponse class constructor + * + * @param message Incoming SmartObject message + **/ + ActivateAppResponse(const MessageSharedPtr& message, + ApplicationManager& application_manager); - /** - * @brief ActivateAppResponse class destructor - **/ - virtual ~ActivateAppResponse(); + /** + * @brief ActivateAppResponse class destructor + **/ + virtual ~ActivateAppResponse(); - /** - * @brief Execute command - **/ - virtual void Run(); + /** + * @brief Execute command + **/ + virtual void Run(); - private: - DISALLOW_COPY_AND_ASSIGN(ActivateAppResponse); + private: + DISALLOW_COPY_AND_ASSIGN(ActivateAppResponse); }; } // namespace commands diff --git a/src/components/application_manager/include/application_manager/commands/hmi/add_statistics_info_notification.h b/src/components/application_manager/include/application_manager/commands/hmi/add_statistics_info_notification.h index ce7670910a..3e0f81f167 100644 --- a/src/components/application_manager/include/application_manager/commands/hmi/add_statistics_info_notification.h +++ b/src/components/application_manager/include/application_manager/commands/hmi/add_statistics_info_notification.h @@ -49,7 +49,8 @@ class AddStatisticsInfoNotification : public NotificationFromHMI { * * @param message Incoming SmartObject message **/ - AddStatisticsInfoNotification(const MessageSharedPtr& message, ApplicationManager& application_manager); + AddStatisticsInfoNotification(const MessageSharedPtr& message, + ApplicationManager& application_manager); /** * @brief AddStatisticsInfoNotification class destructor diff --git a/src/components/application_manager/include/application_manager/commands/hmi/allow_all_apps_request.h b/src/components/application_manager/include/application_manager/commands/hmi/allow_all_apps_request.h index 8ebf7d203f..c1c5b36e5b 100644 --- a/src/components/application_manager/include/application_manager/commands/hmi/allow_all_apps_request.h +++ b/src/components/application_manager/include/application_manager/commands/hmi/allow_all_apps_request.h @@ -49,7 +49,8 @@ class AllowAllAppsRequest : public RequestToHMI { * * @param message Incoming SmartObject message **/ - AllowAllAppsRequest(const MessageSharedPtr& message, ApplicationManager& application_manager); + AllowAllAppsRequest(const MessageSharedPtr& message, + ApplicationManager& application_manager); /** * @brief AllowAllAppsRequest class destructor diff --git a/src/components/application_manager/include/application_manager/commands/hmi/allow_all_apps_response.h b/src/components/application_manager/include/application_manager/commands/hmi/allow_all_apps_response.h index 36ffb7afd1..711825cfab 100644 --- a/src/components/application_manager/include/application_manager/commands/hmi/allow_all_apps_response.h +++ b/src/components/application_manager/include/application_manager/commands/hmi/allow_all_apps_response.h @@ -49,7 +49,8 @@ class AllowAllAppsResponse : public ResponseFromHMI { * * @param message Incoming SmartObject message **/ - AllowAllAppsResponse(const MessageSharedPtr& message, ApplicationManager& application_manager); + AllowAllAppsResponse(const MessageSharedPtr& message, + ApplicationManager& application_manager); /** * @brief AllowAllAppsResponse class destructor diff --git a/src/components/application_manager/include/application_manager/commands/hmi/allow_app_request.h b/src/components/application_manager/include/application_manager/commands/hmi/allow_app_request.h index 7611272a6d..10424a2661 100644 --- a/src/components/application_manager/include/application_manager/commands/hmi/allow_app_request.h +++ b/src/components/application_manager/include/application_manager/commands/hmi/allow_app_request.h @@ -49,7 +49,8 @@ class AllowAppRequest : public RequestToHMI { * * @param message Incoming SmartObject message **/ - AllowAppRequest(const MessageSharedPtr& message, ApplicationManager& application_manager); + AllowAppRequest(const MessageSharedPtr& message, + ApplicationManager& application_manager); /** * @brief AllowAppRequest class destructor diff --git a/src/components/application_manager/include/application_manager/commands/hmi/allow_app_response.h b/src/components/application_manager/include/application_manager/commands/hmi/allow_app_response.h index 72adc5b4e7..4f2642f550 100644 --- a/src/components/application_manager/include/application_manager/commands/hmi/allow_app_response.h +++ b/src/components/application_manager/include/application_manager/commands/hmi/allow_app_response.h @@ -49,7 +49,8 @@ class AllowAppResponse : public ResponseFromHMI { * * @param message Incoming SmartObject message **/ - AllowAppResponse(const MessageSharedPtr& message, ApplicationManager& application_manager); + AllowAppResponse(const MessageSharedPtr& message, + ApplicationManager& application_manager); /** * @brief AllowAppResponse class destructor diff --git a/src/components/application_manager/include/application_manager/commands/hmi/basic_communication_system_request.h b/src/components/application_manager/include/application_manager/commands/hmi/basic_communication_system_request.h index 81d230796a..d9aaff7797 100644 --- a/src/components/application_manager/include/application_manager/commands/hmi/basic_communication_system_request.h +++ b/src/components/application_manager/include/application_manager/commands/hmi/basic_communication_system_request.h @@ -43,26 +43,27 @@ namespace commands { * @brief BasicCommunicationSystemRequest command class **/ class BasicCommunicationSystemRequest : public RequestToHMI { - public: - /** - * @brief BasicCommunicationSystemRequest class constructor - * - * @param message Incoming SmartObject message - **/ - BasicCommunicationSystemRequest(const MessageSharedPtr& message, ApplicationManager& application_manager); + public: + /** + * @brief BasicCommunicationSystemRequest class constructor + * + * @param message Incoming SmartObject message + **/ + BasicCommunicationSystemRequest(const MessageSharedPtr& message, + ApplicationManager& application_manager); - /** - * @brief BasicCommunicationSystemRequest class destructor - **/ - virtual ~BasicCommunicationSystemRequest(); + /** + * @brief BasicCommunicationSystemRequest class destructor + **/ + virtual ~BasicCommunicationSystemRequest(); - /** - * @brief Execute command - **/ - virtual void Run(); + /** + * @brief Execute command + **/ + virtual void Run(); - private: - DISALLOW_COPY_AND_ASSIGN(BasicCommunicationSystemRequest); + private: + DISALLOW_COPY_AND_ASSIGN(BasicCommunicationSystemRequest); }; } // namespace commands diff --git a/src/components/application_manager/include/application_manager/commands/hmi/basic_communication_system_response.h b/src/components/application_manager/include/application_manager/commands/hmi/basic_communication_system_response.h index d7c4e1572a..b7d4f8f689 100644 --- a/src/components/application_manager/include/application_manager/commands/hmi/basic_communication_system_response.h +++ b/src/components/application_manager/include/application_manager/commands/hmi/basic_communication_system_response.h @@ -43,26 +43,27 @@ namespace commands { * @brief BasicCommunicationSystemResponse command class **/ class BasicCommunicationSystemResponse : public ResponseFromHMI { - public: - /** - * @brief BasicCommunicationSystemResponse class constructor - * - * @param message Incoming SmartObject message - **/ - BasicCommunicationSystemResponse(const MessageSharedPtr& message, ApplicationManager& application_manager); + public: + /** + * @brief BasicCommunicationSystemResponse class constructor + * + * @param message Incoming SmartObject message + **/ + BasicCommunicationSystemResponse(const MessageSharedPtr& message, + ApplicationManager& application_manager); - /** - * @brief BasicCommunicationSystemResponse class destructor - **/ - virtual ~BasicCommunicationSystemResponse(); + /** + * @brief BasicCommunicationSystemResponse class destructor + **/ + virtual ~BasicCommunicationSystemResponse(); - /** - * @brief Execute command - **/ - virtual void Run(); + /** + * @brief Execute command + **/ + virtual void Run(); - private: - DISALLOW_COPY_AND_ASSIGN(BasicCommunicationSystemResponse); + private: + DISALLOW_COPY_AND_ASSIGN(BasicCommunicationSystemResponse); }; } // namespace commands diff --git a/src/components/application_manager/include/application_manager/commands/hmi/button_get_capabilities_request.h b/src/components/application_manager/include/application_manager/commands/hmi/button_get_capabilities_request.h index 40782043bd..45dc690c6c 100644 --- a/src/components/application_manager/include/application_manager/commands/hmi/button_get_capabilities_request.h +++ b/src/components/application_manager/include/application_manager/commands/hmi/button_get_capabilities_request.h @@ -49,7 +49,8 @@ class ButtonGetCapabilitiesRequest : public RequestToHMI { * * @param message Incoming SmartObject message **/ - ButtonGetCapabilitiesRequest(const MessageSharedPtr& message, ApplicationManager& application_manager); + ButtonGetCapabilitiesRequest(const MessageSharedPtr& message, + ApplicationManager& application_manager); /** * @brief ButtonGetCapabilitiesRequest class destructor diff --git a/src/components/application_manager/include/application_manager/commands/hmi/button_get_capabilities_response.h b/src/components/application_manager/include/application_manager/commands/hmi/button_get_capabilities_response.h index 1ad88d61c4..4efa576079 100644 --- a/src/components/application_manager/include/application_manager/commands/hmi/button_get_capabilities_response.h +++ b/src/components/application_manager/include/application_manager/commands/hmi/button_get_capabilities_response.h @@ -49,7 +49,8 @@ class ButtonGetCapabilitiesResponse : public ResponseFromHMI { * * @param message Incoming SmartObject message **/ - ButtonGetCapabilitiesResponse(const MessageSharedPtr& message, ApplicationManager& application_manager); + ButtonGetCapabilitiesResponse(const MessageSharedPtr& message, + ApplicationManager& application_manager); /** * @brief ButtonGetCapabilitiesResponse class destructor diff --git a/src/components/application_manager/include/application_manager/commands/hmi/close_popup_request.h b/src/components/application_manager/include/application_manager/commands/hmi/close_popup_request.h index 70ea502cbd..d7d4d18d97 100644 --- a/src/components/application_manager/include/application_manager/commands/hmi/close_popup_request.h +++ b/src/components/application_manager/include/application_manager/commands/hmi/close_popup_request.h @@ -49,7 +49,8 @@ class ClosePopupRequest : public RequestToHMI { * * @param message Incoming SmartObject message **/ - ClosePopupRequest(const MessageSharedPtr& message, ApplicationManager& application_manager); + ClosePopupRequest(const MessageSharedPtr& message, + ApplicationManager& application_manager); /** * @brief ClosePopupRequest class destructor diff --git a/src/components/application_manager/include/application_manager/commands/hmi/close_popup_response.h b/src/components/application_manager/include/application_manager/commands/hmi/close_popup_response.h index 14d4e6d24e..6dccad7b57 100644 --- a/src/components/application_manager/include/application_manager/commands/hmi/close_popup_response.h +++ b/src/components/application_manager/include/application_manager/commands/hmi/close_popup_response.h @@ -49,7 +49,8 @@ class ClosePopupResponse : public ResponseFromHMI { * * @param message Incoming SmartObject message **/ - ClosePopupResponse(const MessageSharedPtr& message, ApplicationManager& application_manager); + ClosePopupResponse(const MessageSharedPtr& message, + ApplicationManager& application_manager); /** * @brief ClosePopupResponse class destructor diff --git a/src/components/application_manager/include/application_manager/commands/hmi/dial_number_request.h b/src/components/application_manager/include/application_manager/commands/hmi/dial_number_request.h index 34581042ea..2b002c31dd 100644 --- a/src/components/application_manager/include/application_manager/commands/hmi/dial_number_request.h +++ b/src/components/application_manager/include/application_manager/commands/hmi/dial_number_request.h @@ -50,7 +50,8 @@ class DialNumberRequest : public RequestToHMI { * * @param message Incoming SmartObject message **/ - DialNumberRequest(const MessageSharedPtr& message, ApplicationManager& application_manager); + DialNumberRequest(const MessageSharedPtr& message, + ApplicationManager& application_manager); /** * @brief DialNumberRequest class destructor @@ -66,7 +67,7 @@ class DialNumberRequest : public RequestToHMI { DISALLOW_COPY_AND_ASSIGN(DialNumberRequest); }; -} // namespace hmi +} // namespace hmi } // namespace commands diff --git a/src/components/application_manager/include/application_manager/commands/hmi/dial_number_response.h b/src/components/application_manager/include/application_manager/commands/hmi/dial_number_response.h index 0311e85255..1fbef15307 100644 --- a/src/components/application_manager/include/application_manager/commands/hmi/dial_number_response.h +++ b/src/components/application_manager/include/application_manager/commands/hmi/dial_number_response.h @@ -51,7 +51,8 @@ class DialNumberResponse : public ResponseFromHMI { * * @param message Incoming SmartObject message **/ - DialNumberResponse(const MessageSharedPtr& message, ApplicationManager& application_manager); + DialNumberResponse(const MessageSharedPtr& message, + ApplicationManager& application_manager); /** * @brief DialNumberResponse class destructor @@ -67,7 +68,7 @@ class DialNumberResponse : public ResponseFromHMI { DISALLOW_COPY_AND_ASSIGN(DialNumberResponse); }; -} // namespace hmi +} // namespace hmi } // namespace commands diff --git a/src/components/application_manager/include/application_manager/commands/hmi/get_system_info_request.h b/src/components/application_manager/include/application_manager/commands/hmi/get_system_info_request.h index 0d20210c0f..f4e421473c 100644 --- a/src/components/application_manager/include/application_manager/commands/hmi/get_system_info_request.h +++ b/src/components/application_manager/include/application_manager/commands/hmi/get_system_info_request.h @@ -43,26 +43,27 @@ namespace commands { * @brief GetSystemInfoRequest command class **/ class GetSystemInfoRequest : public RequestToHMI { - public: - /** - * @brief GetSystemInfoRequest class constructor - * - * @param message Incoming SmartObject message - **/ - GetSystemInfoRequest(const MessageSharedPtr& message, ApplicationManager& application_manager); + public: + /** + * @brief GetSystemInfoRequest class constructor + * + * @param message Incoming SmartObject message + **/ + GetSystemInfoRequest(const MessageSharedPtr& message, + ApplicationManager& application_manager); - /** - * @brief GetSystemInfoRequest class destructor - **/ - virtual ~GetSystemInfoRequest(); + /** + * @brief GetSystemInfoRequest class destructor + **/ + virtual ~GetSystemInfoRequest(); - /** - * @brief Execute command - **/ - virtual void Run(); + /** + * @brief Execute command + **/ + virtual void Run(); - private: - DISALLOW_COPY_AND_ASSIGN(GetSystemInfoRequest); + private: + DISALLOW_COPY_AND_ASSIGN(GetSystemInfoRequest); }; } // namespace commands diff --git a/src/components/application_manager/include/application_manager/commands/hmi/get_system_info_response.h b/src/components/application_manager/include/application_manager/commands/hmi/get_system_info_response.h index 72de924bcf..766a2869d9 100644 --- a/src/components/application_manager/include/application_manager/commands/hmi/get_system_info_response.h +++ b/src/components/application_manager/include/application_manager/commands/hmi/get_system_info_response.h @@ -50,28 +50,30 @@ struct SystemInfo { * @brief GetSystemInfoResponse command class **/ class GetSystemInfoResponse : public ResponseFromHMI { - public: - /** - * @brief GetSystemInfoResponse class constructor - * - * @param message Incoming SmartObject message - **/ - GetSystemInfoResponse(const MessageSharedPtr& message, ApplicationManager& application_manager); + public: + /** + * @brief GetSystemInfoResponse class constructor + * + * @param message Incoming SmartObject message + **/ + GetSystemInfoResponse(const MessageSharedPtr& message, + ApplicationManager& application_manager); - /** - * @brief GetSystemInfoResponse class destructor - **/ - virtual ~GetSystemInfoResponse(); + /** + * @brief GetSystemInfoResponse class destructor + **/ + virtual ~GetSystemInfoResponse(); - /** - * @brief Execute command - **/ - virtual void Run(); + /** + * @brief Execute command + **/ + virtual void Run(); - private: - const SystemInfo GetSystemInfo(const hmi_apis::Common_Result::eType code) const; + private: + const SystemInfo GetSystemInfo( + const hmi_apis::Common_Result::eType code) const; - DISALLOW_COPY_AND_ASSIGN(GetSystemInfoResponse); + DISALLOW_COPY_AND_ASSIGN(GetSystemInfoResponse); }; } // namespace commands diff --git a/src/components/application_manager/include/application_manager/commands/hmi/get_urls.h b/src/components/application_manager/include/application_manager/commands/hmi/get_urls.h index 1e9445cce7..3346f6672b 100644 --- a/src/components/application_manager/include/application_manager/commands/hmi/get_urls.h +++ b/src/components/application_manager/include/application_manager/commands/hmi/get_urls.h @@ -42,26 +42,27 @@ namespace commands { * @brief GetUrls command class **/ class GetUrls : public RequestFromHMI { - public: - /** - * @brief GetUrls class constructor - * - * @param message Incoming SmartObject message - **/ - GetUrls(const MessageSharedPtr& message, ApplicationManager& application_manager); + public: + /** + * @brief GetUrls class constructor + * + * @param message Incoming SmartObject message + **/ + GetUrls(const MessageSharedPtr& message, + ApplicationManager& application_manager); - /** - * @brief GetUrls class destructor - **/ - virtual ~GetUrls(); + /** + * @brief GetUrls class destructor + **/ + virtual ~GetUrls(); - /** - * @brief Execute command - **/ - virtual void Run(); + /** + * @brief Execute command + **/ + virtual void Run(); - private: - DISALLOW_COPY_AND_ASSIGN(GetUrls); + private: + DISALLOW_COPY_AND_ASSIGN(GetUrls); }; } // namespace commands diff --git a/src/components/application_manager/include/application_manager/commands/hmi/get_urls_response.h b/src/components/application_manager/include/application_manager/commands/hmi/get_urls_response.h index 6486033c68..1ca9ba93db 100644 --- a/src/components/application_manager/include/application_manager/commands/hmi/get_urls_response.h +++ b/src/components/application_manager/include/application_manager/commands/hmi/get_urls_response.h @@ -39,26 +39,27 @@ namespace application_manager { namespace commands { class GetUrlsResponse : public ResponseToHMI { - public: - /** - * @brief GetUrlsResponse class constructor - * - * @param message Incoming SmartObject message - **/ - GetUrlsResponse(const MessageSharedPtr& message, ApplicationManager& application_manager); + public: + /** + * @brief GetUrlsResponse class constructor + * + * @param message Incoming SmartObject message + **/ + GetUrlsResponse(const MessageSharedPtr& message, + ApplicationManager& application_manager); - /** - * @brief GetUrlsResponse class destructor - **/ - virtual ~GetUrlsResponse(); + /** + * @brief GetUrlsResponse class destructor + **/ + virtual ~GetUrlsResponse(); - /** - * @brief Execute command - **/ - virtual void Run(); + /** + * @brief Execute command + **/ + virtual void Run(); - private: - DISALLOW_COPY_AND_ASSIGN(GetUrlsResponse); + private: + DISALLOW_COPY_AND_ASSIGN(GetUrlsResponse); }; } // namespace commands diff --git a/src/components/application_manager/include/application_manager/commands/hmi/mixing_audio_supported_request.h b/src/components/application_manager/include/application_manager/commands/hmi/mixing_audio_supported_request.h index 3c5a060c2a..4989208f7a 100644 --- a/src/components/application_manager/include/application_manager/commands/hmi/mixing_audio_supported_request.h +++ b/src/components/application_manager/include/application_manager/commands/hmi/mixing_audio_supported_request.h @@ -49,7 +49,8 @@ class MixingAudioSupportedRequest : public RequestToHMI { * * @param message Incoming SmartObject message **/ - MixingAudioSupportedRequest(const MessageSharedPtr& message, ApplicationManager& application_manager); + MixingAudioSupportedRequest(const MessageSharedPtr& message, + ApplicationManager& application_manager); /** * @brief MixingAudioSupportedRequest class destructor diff --git a/src/components/application_manager/include/application_manager/commands/hmi/mixing_audio_supported_response.h b/src/components/application_manager/include/application_manager/commands/hmi/mixing_audio_supported_response.h index 0ddfd2a65e..a0cf89f558 100644 --- a/src/components/application_manager/include/application_manager/commands/hmi/mixing_audio_supported_response.h +++ b/src/components/application_manager/include/application_manager/commands/hmi/mixing_audio_supported_response.h @@ -49,7 +49,8 @@ class MixingAudioSupportedResponse : public ResponseFromHMI { * * @param message Incoming SmartObject message **/ - MixingAudioSupportedResponse(const MessageSharedPtr& message, ApplicationManager& application_manager); + MixingAudioSupportedResponse(const MessageSharedPtr& message, + ApplicationManager& application_manager); /** * @brief MixingAudioSupportedResponse class destructor diff --git a/src/components/application_manager/include/application_manager/commands/hmi/navi_alert_maneuver_request.h b/src/components/application_manager/include/application_manager/commands/hmi/navi_alert_maneuver_request.h index c883995eb4..123c0ab0d6 100644 --- a/src/components/application_manager/include/application_manager/commands/hmi/navi_alert_maneuver_request.h +++ b/src/components/application_manager/include/application_manager/commands/hmi/navi_alert_maneuver_request.h @@ -49,7 +49,8 @@ class NaviAlertManeuverRequest : public RequestToHMI { * * @param message Incoming SmartObject message **/ - NaviAlertManeuverRequest(const MessageSharedPtr& message, ApplicationManager& application_manager); + NaviAlertManeuverRequest(const MessageSharedPtr& message, + ApplicationManager& application_manager); /** * @brief NaviAlertManeuverRequest class destructor diff --git a/src/components/application_manager/include/application_manager/commands/hmi/navi_alert_maneuver_response.h b/src/components/application_manager/include/application_manager/commands/hmi/navi_alert_maneuver_response.h index 9d343f2aaa..d4a57e9e2f 100644 --- a/src/components/application_manager/include/application_manager/commands/hmi/navi_alert_maneuver_response.h +++ b/src/components/application_manager/include/application_manager/commands/hmi/navi_alert_maneuver_response.h @@ -49,7 +49,8 @@ class NaviAlertManeuverResponse : public ResponseFromHMI { * * @param message Incoming SmartObject message **/ - NaviAlertManeuverResponse(const MessageSharedPtr& message, ApplicationManager& application_manager); + NaviAlertManeuverResponse(const MessageSharedPtr& message, + ApplicationManager& application_manager); /** * @brief NaviAlertManeuverResponse class destructor diff --git a/src/components/application_manager/include/application_manager/commands/hmi/navi_audio_start_stream_request.h b/src/components/application_manager/include/application_manager/commands/hmi/navi_audio_start_stream_request.h index 44ffea5310..d6f4fd36e2 100644 --- a/src/components/application_manager/include/application_manager/commands/hmi/navi_audio_start_stream_request.h +++ b/src/components/application_manager/include/application_manager/commands/hmi/navi_audio_start_stream_request.h @@ -50,19 +50,19 @@ class AudioStartStreamRequest : public RequestToHMI, * * @param message Incoming SmartObject message **/ - AudioStartStreamRequest(const MessageSharedPtr& message, ApplicationManager& application_manager); + AudioStartStreamRequest(const MessageSharedPtr& message, + ApplicationManager& application_manager); /** * @brief OnNaviStartStreamRequest class destructor **/ virtual ~AudioStartStreamRequest(); - /** - * @brief onTimeOut from requrst Controller - */ + /** + * @brief onTimeOut from requrst Controller + */ virtual void onTimeOut(); - /** * @brief Execute command **/ @@ -73,13 +73,13 @@ class AudioStartStreamRequest : public RequestToHMI, **/ virtual void on_event(const event_engine::Event& event); - /** - * @brief RetryStartSession resend HMI startSession request if needed. - * If limit expired, set audio_stream_retry_number counter to 0 - */ + /** + * @brief RetryStartSession resend HMI startSession request if needed. + * If limit expired, set audio_stream_retry_number counter to 0 + */ void RetryStartSession(); - private: + private: uint32_t retry_number_; DISALLOW_COPY_AND_ASSIGN(AudioStartStreamRequest); }; diff --git a/src/components/application_manager/include/application_manager/commands/hmi/navi_audio_start_stream_response.h b/src/components/application_manager/include/application_manager/commands/hmi/navi_audio_start_stream_response.h index aa87da1329..485b510bf2 100644 --- a/src/components/application_manager/include/application_manager/commands/hmi/navi_audio_start_stream_response.h +++ b/src/components/application_manager/include/application_manager/commands/hmi/navi_audio_start_stream_response.h @@ -48,7 +48,8 @@ class AudioStartStreamResponse : public ResponseFromHMI { * * @param message Incoming SmartObject message **/ - AudioStartStreamResponse(const MessageSharedPtr& message, ApplicationManager& application_manager); + AudioStartStreamResponse(const MessageSharedPtr& message, + ApplicationManager& application_manager); /** * @brief AudioStartStreamResponse class destructor diff --git a/src/components/application_manager/include/application_manager/commands/hmi/navi_audio_stop_stream_request.h b/src/components/application_manager/include/application_manager/commands/hmi/navi_audio_stop_stream_request.h index f3d2b4bb89..3a21e3e827 100644 --- a/src/components/application_manager/include/application_manager/commands/hmi/navi_audio_stop_stream_request.h +++ b/src/components/application_manager/include/application_manager/commands/hmi/navi_audio_stop_stream_request.h @@ -48,7 +48,8 @@ class AudioStopStreamRequest : public RequestToHMI { * * @param message Incoming SmartObject message **/ - AudioStopStreamRequest(const MessageSharedPtr& message, ApplicationManager& application_manager); + AudioStopStreamRequest(const MessageSharedPtr& message, + ApplicationManager& application_manager); /** * @brief NaviStopStreamRequest class destructor diff --git a/src/components/application_manager/include/application_manager/commands/hmi/navi_audio_stop_stream_response.h b/src/components/application_manager/include/application_manager/commands/hmi/navi_audio_stop_stream_response.h index 69e1c7cd5e..ce32d5b627 100644 --- a/src/components/application_manager/include/application_manager/commands/hmi/navi_audio_stop_stream_response.h +++ b/src/components/application_manager/include/application_manager/commands/hmi/navi_audio_stop_stream_response.h @@ -48,7 +48,8 @@ class AudioStopStreamResponse : public ResponseFromHMI { * * @param message Incoming SmartObject message **/ - AudioStopStreamResponse(const MessageSharedPtr& message, ApplicationManager& application_manager); + AudioStopStreamResponse(const MessageSharedPtr& message, + ApplicationManager& application_manager); /** * @brief OnNaviStopStreamResponse class destructor diff --git a/src/components/application_manager/include/application_manager/commands/hmi/navi_get_way_points_request.h b/src/components/application_manager/include/application_manager/commands/hmi/navi_get_way_points_request.h index 57c24aeff7..33c5dfe2db 100644 --- a/src/components/application_manager/include/application_manager/commands/hmi/navi_get_way_points_request.h +++ b/src/components/application_manager/include/application_manager/commands/hmi/navi_get_way_points_request.h @@ -42,31 +42,30 @@ namespace commands { /** * @brief NaviGetWayPointsRequest command class **/ -class NaviGetWayPointsRequest - : public RequestToHMI { -public: - /** - * @brief NaviGetWayPointsRequest class constructor - * - * @param message Incoming SmartObject message - **/ - NaviGetWayPointsRequest(const MessageSharedPtr& message, - ApplicationManager& application_manager); - /** - * @brief NaviGetWayPointsRequest class destructor - **/ - virtual ~NaviGetWayPointsRequest(); - /** - * @brief Execute command - **/ - virtual void Run() OVERRIDE; +class NaviGetWayPointsRequest : public RequestToHMI { + public: + /** + * @brief NaviGetWayPointsRequest class constructor + * + * @param message Incoming SmartObject message + **/ + NaviGetWayPointsRequest(const MessageSharedPtr& message, + ApplicationManager& application_manager); + /** + * @brief NaviGetWayPointsRequest class destructor + **/ + virtual ~NaviGetWayPointsRequest(); + /** + * @brief Execute command + **/ + virtual void Run() OVERRIDE; -private: + private: DISALLOW_COPY_AND_ASSIGN(NaviGetWayPointsRequest); }; -} // namespace commands +} // namespace commands -} // namespace application_manager +} // namespace application_manager -#endif // SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_HMI_NAVI_GET_WAY_POINTS_REQUEST_H_ +#endif // SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_HMI_NAVI_GET_WAY_POINTS_REQUEST_H_ diff --git a/src/components/application_manager/include/application_manager/commands/hmi/navi_get_way_points_response.h b/src/components/application_manager/include/application_manager/commands/hmi/navi_get_way_points_response.h index 4a9b848adc..633d927715 100644 --- a/src/components/application_manager/include/application_manager/commands/hmi/navi_get_way_points_response.h +++ b/src/components/application_manager/include/application_manager/commands/hmi/navi_get_way_points_response.h @@ -42,32 +42,32 @@ namespace commands { /** * @brief NaviGetWaypoints command class **/ -class NaviGetWayPointsResponse - : public ResponseFromHMI { +class NaviGetWayPointsResponse : public ResponseFromHMI { public: - /** - * @brief NaviGetWaypoints class constructor - * - * @param message Incoming SmartObject message - **/ - NaviGetWayPointsResponse(const MessageSharedPtr& message, - ApplicationManager& application_manager); + /** + * @brief NaviGetWaypoints class constructor + * + * @param message Incoming SmartObject message + **/ + NaviGetWayPointsResponse(const MessageSharedPtr& message, + ApplicationManager& application_manager); - /** - * @brief NaviGetWaypoints class destructor - **/ - virtual ~NaviGetWayPointsResponse(); + /** + * @brief NaviGetWaypoints class destructor + **/ + virtual ~NaviGetWayPointsResponse(); + + /** + * @brief Execute command + **/ + virtual void Run() OVERRIDE; - /** - * @brief Execute command - **/ - virtual void Run() OVERRIDE; private: DISALLOW_COPY_AND_ASSIGN(NaviGetWayPointsResponse); }; -} // namespace commands +} // namespace commands -} // namespace application_manager +} // namespace application_manager -#endif // SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_HMI_NAVI_GET_WAY_POINTS_RESPONSE_H_ +#endif // SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_HMI_NAVI_GET_WAY_POINTS_RESPONSE_H_ diff --git a/src/components/application_manager/include/application_manager/commands/hmi/navi_is_ready_request.h b/src/components/application_manager/include/application_manager/commands/hmi/navi_is_ready_request.h index bfdb08c421..9f1adaeee0 100644 --- a/src/components/application_manager/include/application_manager/commands/hmi/navi_is_ready_request.h +++ b/src/components/application_manager/include/application_manager/commands/hmi/navi_is_ready_request.h @@ -49,7 +49,8 @@ class NaviIsReadyRequest : public RequestToHMI { * * @param message Incoming SmartObject message **/ - NaviIsReadyRequest(const MessageSharedPtr& message, ApplicationManager& application_manager); + NaviIsReadyRequest(const MessageSharedPtr& message, + ApplicationManager& application_manager); /** * @brief NaviIsReadyRequest class destructor diff --git a/src/components/application_manager/include/application_manager/commands/hmi/navi_is_ready_response.h b/src/components/application_manager/include/application_manager/commands/hmi/navi_is_ready_response.h index f962f51925..72c001b863 100644 --- a/src/components/application_manager/include/application_manager/commands/hmi/navi_is_ready_response.h +++ b/src/components/application_manager/include/application_manager/commands/hmi/navi_is_ready_response.h @@ -49,7 +49,8 @@ class NaviIsReadyResponse : public ResponseFromHMI { * * @param message Incoming SmartObject message **/ - NaviIsReadyResponse(const MessageSharedPtr& message, ApplicationManager& application_manager); + NaviIsReadyResponse(const MessageSharedPtr& message, + ApplicationManager& application_manager); /** * @brief NaviIsReadyResponse class destructor diff --git a/src/components/application_manager/include/application_manager/commands/hmi/navi_send_location_request.h b/src/components/application_manager/include/application_manager/commands/hmi/navi_send_location_request.h index af592c3ba4..56a9594c0b 100644 --- a/src/components/application_manager/include/application_manager/commands/hmi/navi_send_location_request.h +++ b/src/components/application_manager/include/application_manager/commands/hmi/navi_send_location_request.h @@ -49,7 +49,8 @@ class NaviSendLocationRequest : public RequestToHMI { * * @param message Incoming SmartObject message */ - NaviSendLocationRequest(const MessageSharedPtr& message, ApplicationManager& application_manager); + NaviSendLocationRequest(const MessageSharedPtr& message, + ApplicationManager& application_manager); /** * @brief NaviSendLocationRequest class destructor diff --git a/src/components/application_manager/include/application_manager/commands/hmi/navi_send_location_response.h b/src/components/application_manager/include/application_manager/commands/hmi/navi_send_location_response.h index 92961f3311..ec3392642a 100644 --- a/src/components/application_manager/include/application_manager/commands/hmi/navi_send_location_response.h +++ b/src/components/application_manager/include/application_manager/commands/hmi/navi_send_location_response.h @@ -49,7 +49,8 @@ class NaviSendLocationResponse : public ResponseFromHMI { * * @param message Incoming SmartObject message */ - NaviSendLocationResponse(const MessageSharedPtr& message, ApplicationManager& application_manager); + NaviSendLocationResponse(const MessageSharedPtr& message, + ApplicationManager& application_manager); /** * @brief NaviSendLocationResponse class destructor diff --git a/src/components/application_manager/include/application_manager/commands/hmi/navi_show_constant_tbt_request.h b/src/components/application_manager/include/application_manager/commands/hmi/navi_show_constant_tbt_request.h index c5d23698c7..4cb8ddd7f7 100644 --- a/src/components/application_manager/include/application_manager/commands/hmi/navi_show_constant_tbt_request.h +++ b/src/components/application_manager/include/application_manager/commands/hmi/navi_show_constant_tbt_request.h @@ -49,7 +49,8 @@ class NaviShowConstantTBTRequest : public RequestToHMI { * * @param message Incoming SmartObject message **/ - NaviShowConstantTBTRequest(const MessageSharedPtr& message, ApplicationManager& application_manager); + NaviShowConstantTBTRequest(const MessageSharedPtr& message, + ApplicationManager& application_manager); /** * @brief NaviShowConstantTBTRequest class destructor diff --git a/src/components/application_manager/include/application_manager/commands/hmi/navi_show_constant_tbt_response.h b/src/components/application_manager/include/application_manager/commands/hmi/navi_show_constant_tbt_response.h index 35627ecc60..d9e7b1d234 100644 --- a/src/components/application_manager/include/application_manager/commands/hmi/navi_show_constant_tbt_response.h +++ b/src/components/application_manager/include/application_manager/commands/hmi/navi_show_constant_tbt_response.h @@ -49,7 +49,8 @@ class NaviShowConstantTBTResponse : public ResponseFromHMI { * * @param message Incoming SmartObject message **/ - NaviShowConstantTBTResponse(const MessageSharedPtr& message, ApplicationManager& application_manager); + NaviShowConstantTBTResponse(const MessageSharedPtr& message, + ApplicationManager& application_manager); /** * @brief NaviShowConstantTBTResponse class destructor diff --git a/src/components/application_manager/include/application_manager/commands/hmi/navi_start_stream_request.h b/src/components/application_manager/include/application_manager/commands/hmi/navi_start_stream_request.h index 813671b55c..6fcb3f3267 100644 --- a/src/components/application_manager/include/application_manager/commands/hmi/navi_start_stream_request.h +++ b/src/components/application_manager/include/application_manager/commands/hmi/navi_start_stream_request.h @@ -44,44 +44,44 @@ namespace commands { **/ class NaviStartStreamRequest : public RequestToHMI, public event_engine::EventObserver { - public: - /** - * @brief NaviStartStreamRequest class constructor - * - * @param message Incoming SmartObject message - **/ - NaviStartStreamRequest(const MessageSharedPtr& message, ApplicationManager& application_manager); - - /** - * @brief OnNaviStartStreamRequest class destructor - **/ - virtual ~NaviStartStreamRequest(); - - /** - * @brief Execute command - **/ - virtual void Run(); + public: + /** + * @brief NaviStartStreamRequest class constructor + * + * @param message Incoming SmartObject message + **/ + NaviStartStreamRequest(const MessageSharedPtr& message, + ApplicationManager& application_manager); - /** - * @brief On event callback - **/ - virtual void on_event(const event_engine::Event& event); + /** + * @brief OnNaviStartStreamRequest class destructor + **/ + virtual ~NaviStartStreamRequest(); - /** - * @brief onTimeOut from requrst Controller - */ - virtual void onTimeOut(); + /** + * @brief Execute command + **/ + virtual void Run(); + /** + * @brief On event callback + **/ + virtual void on_event(const event_engine::Event& event); - /** - * @brief RetryStartSession resend HMI startSession request if needed. - * If limit expired, set video_stream_retry_number counter to 0 + /** + * @brief onTimeOut from requrst Controller */ - void RetryStartSession(); + virtual void onTimeOut(); + + /** + * @brief RetryStartSession resend HMI startSession request if needed. + * If limit expired, set video_stream_retry_number counter to 0 + */ + void RetryStartSession(); - private: - uint32_t retry_number_; - DISALLOW_COPY_AND_ASSIGN(NaviStartStreamRequest); + private: + uint32_t retry_number_; + DISALLOW_COPY_AND_ASSIGN(NaviStartStreamRequest); }; } // namespace commands diff --git a/src/components/application_manager/include/application_manager/commands/hmi/navi_start_stream_response.h b/src/components/application_manager/include/application_manager/commands/hmi/navi_start_stream_response.h index ac8179a6cc..3e18767194 100644 --- a/src/components/application_manager/include/application_manager/commands/hmi/navi_start_stream_response.h +++ b/src/components/application_manager/include/application_manager/commands/hmi/navi_start_stream_response.h @@ -48,7 +48,8 @@ class NaviStartStreamResponse : public ResponseFromHMI { * * @param message Incoming SmartObject message **/ - NaviStartStreamResponse(const MessageSharedPtr& message, ApplicationManager& application_manager); + NaviStartStreamResponse(const MessageSharedPtr& message, + ApplicationManager& application_manager); /** * @brief NaviStartStreamResponse class destructor diff --git a/src/components/application_manager/include/application_manager/commands/hmi/navi_stop_stream_request.h b/src/components/application_manager/include/application_manager/commands/hmi/navi_stop_stream_request.h index bb4ea5fc52..d6952d0305 100644 --- a/src/components/application_manager/include/application_manager/commands/hmi/navi_stop_stream_request.h +++ b/src/components/application_manager/include/application_manager/commands/hmi/navi_stop_stream_request.h @@ -48,7 +48,8 @@ class NaviStopStreamRequest : public RequestToHMI { * * @param message Incoming SmartObject message **/ - NaviStopStreamRequest(const MessageSharedPtr& message, ApplicationManager& application_manager); + NaviStopStreamRequest(const MessageSharedPtr& message, + ApplicationManager& application_manager); /** * @brief NaviStopStreamRequest class destructor diff --git a/src/components/application_manager/include/application_manager/commands/hmi/navi_stop_stream_response.h b/src/components/application_manager/include/application_manager/commands/hmi/navi_stop_stream_response.h index 8cadc19ef9..b3107b5e61 100644 --- a/src/components/application_manager/include/application_manager/commands/hmi/navi_stop_stream_response.h +++ b/src/components/application_manager/include/application_manager/commands/hmi/navi_stop_stream_response.h @@ -48,7 +48,8 @@ class NaviStopStreamResponse : public ResponseFromHMI { * * @param message Incoming SmartObject message **/ - NaviStopStreamResponse(const MessageSharedPtr& message, ApplicationManager& application_manager); + NaviStopStreamResponse(const MessageSharedPtr& message, + ApplicationManager& application_manager); /** * @brief OnNaviStopStreamResponse class destructor diff --git a/src/components/application_manager/include/application_manager/commands/hmi/navi_subscribe_way_points_request.h b/src/components/application_manager/include/application_manager/commands/hmi/navi_subscribe_way_points_request.h index 57bddf9c9d..33a2077918 100644 --- a/src/components/application_manager/include/application_manager/commands/hmi/navi_subscribe_way_points_request.h +++ b/src/components/application_manager/include/application_manager/commands/hmi/navi_subscribe_way_points_request.h @@ -42,31 +42,30 @@ namespace commands { /** * @brief NaviSubscribeWayPointsRequest command class **/ -class NaviSubscribeWayPointsRequest - : public RequestToHMI { -public: - /** - * @brief NaviSubscribeWayPointsRequest class constructor - * - * @param message Incoming SmartObject message - **/ - NaviSubscribeWayPointsRequest(const MessageSharedPtr& messag, - ApplicationManager& application_manager); - /** - * @brief NaviSubscribeWayPointsRequest class destructor - **/ - virtual ~NaviSubscribeWayPointsRequest(); - /** - * @brief Execute command - **/ - virtual void Run() OVERRIDE; +class NaviSubscribeWayPointsRequest : public RequestToHMI { + public: + /** + * @brief NaviSubscribeWayPointsRequest class constructor + * + * @param message Incoming SmartObject message + **/ + NaviSubscribeWayPointsRequest(const MessageSharedPtr& messag, + ApplicationManager& application_manager); + /** + * @brief NaviSubscribeWayPointsRequest class destructor + **/ + virtual ~NaviSubscribeWayPointsRequest(); + /** + * @brief Execute command + **/ + virtual void Run() OVERRIDE; -private: + private: DISALLOW_COPY_AND_ASSIGN(NaviSubscribeWayPointsRequest); }; -} // namespace commands +} // namespace commands -} // namespace application_manager +} // namespace application_manager -#endif // SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_HMI_NAVI_SUBSCRIBE_WAY_POINTS_REQUEST_H_ +#endif // SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_HMI_NAVI_SUBSCRIBE_WAY_POINTS_REQUEST_H_ diff --git a/src/components/application_manager/include/application_manager/commands/hmi/navi_subscribe_way_points_response.h b/src/components/application_manager/include/application_manager/commands/hmi/navi_subscribe_way_points_response.h index a60e9ce094..eff2b281f2 100644 --- a/src/components/application_manager/include/application_manager/commands/hmi/navi_subscribe_way_points_response.h +++ b/src/components/application_manager/include/application_manager/commands/hmi/navi_subscribe_way_points_response.h @@ -42,32 +42,32 @@ namespace commands { /** * @brief NaviSubscribeWaypoints command class **/ -class NaviSubscribeWayPointsResponse - : public ResponseFromHMI { +class NaviSubscribeWayPointsResponse : public ResponseFromHMI { public: - /** - * @brief NaviSubscribeWaypoints class constructor - * - * @param message Incoming SmartObject message - **/ - NaviSubscribeWayPointsResponse(const MessageSharedPtr& message, - ApplicationManager& application_manager); + /** + * @brief NaviSubscribeWaypoints class constructor + * + * @param message Incoming SmartObject message + **/ + NaviSubscribeWayPointsResponse(const MessageSharedPtr& message, + ApplicationManager& application_manager); - /** - * @brief NaviSubscribeWaypoints class destructor - **/ - virtual ~NaviSubscribeWayPointsResponse(); + /** + * @brief NaviSubscribeWaypoints class destructor + **/ + virtual ~NaviSubscribeWayPointsResponse(); + + /** + * @brief Execute command + **/ + virtual void Run() OVERRIDE; - /** - * @brief Execute command - **/ - virtual void Run() OVERRIDE; private: DISALLOW_COPY_AND_ASSIGN(NaviSubscribeWayPointsResponse); }; -} // namespace commands +} // namespace commands -} // namespace application_manager +} // namespace application_manager -#endif // SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_HMI_NAVI_SUBSCRIBE_WAY_POINTS_RESPONSE_H_ +#endif // SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_HMI_NAVI_SUBSCRIBE_WAY_POINTS_RESPONSE_H_ diff --git a/src/components/application_manager/include/application_manager/commands/hmi/navi_unsubscribe_way_points_request.h b/src/components/application_manager/include/application_manager/commands/hmi/navi_unsubscribe_way_points_request.h index 6566a2a841..607bb1ef26 100644 --- a/src/components/application_manager/include/application_manager/commands/hmi/navi_unsubscribe_way_points_request.h +++ b/src/components/application_manager/include/application_manager/commands/hmi/navi_unsubscribe_way_points_request.h @@ -42,31 +42,30 @@ namespace commands { /** * @brief NaviSubscribeWayPointsRequest command class **/ -class NaviUnSubscribeWayPointsRequest - : public RequestToHMI { -public: - /** - * @brief NaviUnSubscribeWayPointsRequest class constructor - * - * @param message Incoming SmartObject message - **/ - NaviUnSubscribeWayPointsRequest(const MessageSharedPtr& message, - ApplicationManager& application_manager); - /** - * @brief NaviUnSubscribeWayPointsRequest class destructor - **/ - virtual ~NaviUnSubscribeWayPointsRequest(); - /** - * @brief Execute command - **/ - virtual void Run() OVERRIDE; +class NaviUnSubscribeWayPointsRequest : public RequestToHMI { + public: + /** + * @brief NaviUnSubscribeWayPointsRequest class constructor + * + * @param message Incoming SmartObject message + **/ + NaviUnSubscribeWayPointsRequest(const MessageSharedPtr& message, + ApplicationManager& application_manager); + /** + * @brief NaviUnSubscribeWayPointsRequest class destructor + **/ + virtual ~NaviUnSubscribeWayPointsRequest(); + /** + * @brief Execute command + **/ + virtual void Run() OVERRIDE; -private: + private: DISALLOW_COPY_AND_ASSIGN(NaviUnSubscribeWayPointsRequest); }; -} // namespace commands +} // namespace commands -} // namespace application_manager +} // namespace application_manager -#endif // SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_HMI_NAVI_UNSUBSCRIBE_WAY_POINTS_REQUEST_H_ +#endif // SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_HMI_NAVI_UNSUBSCRIBE_WAY_POINTS_REQUEST_H_ diff --git a/src/components/application_manager/include/application_manager/commands/hmi/navi_unsubscribe_way_points_response.h b/src/components/application_manager/include/application_manager/commands/hmi/navi_unsubscribe_way_points_response.h index 62d7900646..936814f2fe 100644 --- a/src/components/application_manager/include/application_manager/commands/hmi/navi_unsubscribe_way_points_response.h +++ b/src/components/application_manager/include/application_manager/commands/hmi/navi_unsubscribe_way_points_response.h @@ -42,31 +42,31 @@ namespace commands { /** * @brief NaviUnSubscribeWaypoints command class **/ -class NaviUnsubscribeWayPointsResponse - : public ResponseFromHMI { +class NaviUnsubscribeWayPointsResponse : public ResponseFromHMI { public: - /** - * @brief NaviUnSubscribeWaypoints class constructor - * - * @param message Incoming SmartObject message - **/ - NaviUnsubscribeWayPointsResponse(const MessageSharedPtr& message, - ApplicationManager& application_manager); + /** + * @brief NaviUnSubscribeWaypoints class constructor + * + * @param message Incoming SmartObject message + **/ + NaviUnsubscribeWayPointsResponse(const MessageSharedPtr& message, + ApplicationManager& application_manager); - /** - * @brief NaviUnSubscribeWaypoints class destructor - **/ - virtual ~NaviUnsubscribeWayPointsResponse(); + /** + * @brief NaviUnSubscribeWaypoints class destructor + **/ + virtual ~NaviUnsubscribeWayPointsResponse(); + + /** + * @brief Execute command + **/ + virtual void Run() OVERRIDE; - /** - * @brief Execute command - **/ - virtual void Run() OVERRIDE; private: DISALLOW_COPY_AND_ASSIGN(NaviUnsubscribeWayPointsResponse); }; -} // namespace commands +} // namespace commands -} // namespace application_manager -#endif // SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_HMI_NAVI_UNSUBSCRIBE_WAY_POINTS_RESPONSE_H_ +} // namespace application_manager +#endif // SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_HMI_NAVI_UNSUBSCRIBE_WAY_POINTS_RESPONSE_H_ diff --git a/src/components/application_manager/include/application_manager/commands/hmi/navi_update_turn_list_request.h b/src/components/application_manager/include/application_manager/commands/hmi/navi_update_turn_list_request.h index 089ae024f2..830e9358ec 100644 --- a/src/components/application_manager/include/application_manager/commands/hmi/navi_update_turn_list_request.h +++ b/src/components/application_manager/include/application_manager/commands/hmi/navi_update_turn_list_request.h @@ -49,7 +49,8 @@ class NaviUpdateTurnListRequest : public RequestToHMI { * * @param message Incoming SmartObject message **/ - NaviUpdateTurnListRequest(const MessageSharedPtr& message, ApplicationManager& application_manager); + NaviUpdateTurnListRequest(const MessageSharedPtr& message, + ApplicationManager& application_manager); /** * @brief NaviUpdateTurnListRequest class destructor diff --git a/src/components/application_manager/include/application_manager/commands/hmi/navi_update_turn_list_response.h b/src/components/application_manager/include/application_manager/commands/hmi/navi_update_turn_list_response.h index 6ce5219206..93c714b4f4 100644 --- a/src/components/application_manager/include/application_manager/commands/hmi/navi_update_turn_list_response.h +++ b/src/components/application_manager/include/application_manager/commands/hmi/navi_update_turn_list_response.h @@ -49,7 +49,8 @@ class NaviUpdateTurnListResponse : public ResponseFromHMI { * * @param message Incoming SmartObject message **/ - NaviUpdateTurnListResponse(const MessageSharedPtr& message, ApplicationManager& application_manager); + NaviUpdateTurnListResponse(const MessageSharedPtr& message, + ApplicationManager& application_manager); /** * @brief NaviUpdateTurnListResponse class destructor diff --git a/src/components/application_manager/include/application_manager/commands/hmi/notification_from_hmi.h b/src/components/application_manager/include/application_manager/commands/hmi/notification_from_hmi.h index 10d88b216d..c74108ccf0 100644 --- a/src/components/application_manager/include/application_manager/commands/hmi/notification_from_hmi.h +++ b/src/components/application_manager/include/application_manager/commands/hmi/notification_from_hmi.h @@ -51,14 +51,15 @@ namespace smart_objects = NsSmartDeviceLink::NsSmartObjects; class NotificationFromHMI : public CommandImpl { public: NotificationFromHMI(const MessageSharedPtr& message, - ApplicationManager& application_manager); + ApplicationManager& application_manager); virtual ~NotificationFromHMI(); virtual bool Init(); virtual bool CleanUp(); virtual void Run(); void SendNotificationToMobile(const MessageSharedPtr& message); void CreateHMIRequest(const hmi_apis::FunctionID::eType& function_id, - const smart_objects::SmartObject& msg_params) const; + const smart_objects::SmartObject& msg_params) const; + private: DISALLOW_COPY_AND_ASSIGN(NotificationFromHMI); }; diff --git a/src/components/application_manager/include/application_manager/commands/hmi/notification_to_hmi.h b/src/components/application_manager/include/application_manager/commands/hmi/notification_to_hmi.h index d382cfcc83..dd2db8804a 100644 --- a/src/components/application_manager/include/application_manager/commands/hmi/notification_to_hmi.h +++ b/src/components/application_manager/include/application_manager/commands/hmi/notification_to_hmi.h @@ -42,12 +42,13 @@ namespace commands { class NotificationToHMI : public CommandImpl { public: NotificationToHMI(const MessageSharedPtr& message, - ApplicationManager& application_manager); + ApplicationManager& application_manager); virtual ~NotificationToHMI(); virtual bool Init(); virtual bool CleanUp(); virtual void Run(); void SendNotification(); + private: DISALLOW_COPY_AND_ASSIGN(NotificationToHMI); }; diff --git a/src/components/application_manager/include/application_manager/commands/hmi/on_allow_sdl_functionality_notification.h b/src/components/application_manager/include/application_manager/commands/hmi/on_allow_sdl_functionality_notification.h index acfc2f2bbf..ee7d22b859 100644 --- a/src/components/application_manager/include/application_manager/commands/hmi/on_allow_sdl_functionality_notification.h +++ b/src/components/application_manager/include/application_manager/commands/hmi/on_allow_sdl_functionality_notification.h @@ -43,26 +43,27 @@ namespace commands { * @brief OnAllowSDLFunctionalityNotification command class **/ class OnAllowSDLFunctionalityNotification : public NotificationFromHMI { - public: - /** - * @brief OnAllowSDLFunctionalityNotification class constructor - * - * @param message Incoming SmartObject message - **/ - OnAllowSDLFunctionalityNotification(const MessageSharedPtr& message, ApplicationManager& application_manager); + public: + /** + * @brief OnAllowSDLFunctionalityNotification class constructor + * + * @param message Incoming SmartObject message + **/ + OnAllowSDLFunctionalityNotification(const MessageSharedPtr& message, + ApplicationManager& application_manager); - /** - * @brief OnAllowSDLFunctionalityNotification class destructor - **/ - virtual ~OnAllowSDLFunctionalityNotification(); + /** + * @brief OnAllowSDLFunctionalityNotification class destructor + **/ + virtual ~OnAllowSDLFunctionalityNotification(); - /** - * @brief Execute command - **/ - virtual void Run(); + /** + * @brief Execute command + **/ + virtual void Run(); - private: - DISALLOW_COPY_AND_ASSIGN(OnAllowSDLFunctionalityNotification); + private: + DISALLOW_COPY_AND_ASSIGN(OnAllowSDLFunctionalityNotification); }; } // namespace commands diff --git a/src/components/application_manager/include/application_manager/commands/hmi/on_app_activated_notification.h b/src/components/application_manager/include/application_manager/commands/hmi/on_app_activated_notification.h index 44b26e9abb..a1de12b4d6 100644 --- a/src/components/application_manager/include/application_manager/commands/hmi/on_app_activated_notification.h +++ b/src/components/application_manager/include/application_manager/commands/hmi/on_app_activated_notification.h @@ -43,26 +43,27 @@ namespace commands { * @brief OnAppActivatedNotification command class **/ class OnAppActivatedNotification : public NotificationFromHMI { - public: - /** - * @brief OnAppActivatedNotification class constructor - * - * @param message Incoming SmartObject message - **/ - OnAppActivatedNotification(const MessageSharedPtr& message, ApplicationManager& application_manager); + public: + /** + * @brief OnAppActivatedNotification class constructor + * + * @param message Incoming SmartObject message + **/ + OnAppActivatedNotification(const MessageSharedPtr& message, + ApplicationManager& application_manager); - /** - * @brief OnAppActivatedNotification class destructor - **/ - virtual ~OnAppActivatedNotification(); + /** + * @brief OnAppActivatedNotification class destructor + **/ + virtual ~OnAppActivatedNotification(); - /** - * @brief Execute command - **/ - virtual void Run(); + /** + * @brief Execute command + **/ + virtual void Run(); - private: - DISALLOW_COPY_AND_ASSIGN(OnAppActivatedNotification); + private: + DISALLOW_COPY_AND_ASSIGN(OnAppActivatedNotification); }; } // namespace commands diff --git a/src/components/application_manager/include/application_manager/commands/hmi/on_app_deactivated_notification.h b/src/components/application_manager/include/application_manager/commands/hmi/on_app_deactivated_notification.h index a7e8150e7d..687d492a01 100644 --- a/src/components/application_manager/include/application_manager/commands/hmi/on_app_deactivated_notification.h +++ b/src/components/application_manager/include/application_manager/commands/hmi/on_app_deactivated_notification.h @@ -49,7 +49,8 @@ class OnAppDeactivatedNotification : public NotificationFromHMI { * * @param message Incoming SmartObject message **/ - OnAppDeactivatedNotification(const MessageSharedPtr& message, ApplicationManager& application_manager); + OnAppDeactivatedNotification(const MessageSharedPtr& message, + ApplicationManager& application_manager); /** * @brief OnAppDeactivatedNotification class destructor diff --git a/src/components/application_manager/include/application_manager/commands/hmi/on_app_permission_changed_notification.h b/src/components/application_manager/include/application_manager/commands/hmi/on_app_permission_changed_notification.h index 3598b35850..bdaf6d1119 100644 --- a/src/components/application_manager/include/application_manager/commands/hmi/on_app_permission_changed_notification.h +++ b/src/components/application_manager/include/application_manager/commands/hmi/on_app_permission_changed_notification.h @@ -43,26 +43,27 @@ namespace commands { * @brief OnAppPermissionChangedNotification command class **/ class OnAppPermissionChangedNotification : public NotificationToHMI { - public: - /** - * @brief OnAppPermissionChangedNotification class constructor - * - * @param message Incoming SmartObject message - **/ - OnAppPermissionChangedNotification(const MessageSharedPtr& message, ApplicationManager& application_manager); + public: + /** + * @brief OnAppPermissionChangedNotification class constructor + * + * @param message Incoming SmartObject message + **/ + OnAppPermissionChangedNotification(const MessageSharedPtr& message, + ApplicationManager& application_manager); - /** - * @brief OnAppPermissionChangedNotification class destructor - **/ - virtual ~OnAppPermissionChangedNotification(); + /** + * @brief OnAppPermissionChangedNotification class destructor + **/ + virtual ~OnAppPermissionChangedNotification(); - /** - * @brief Execute command - **/ - virtual void Run(); + /** + * @brief Execute command + **/ + virtual void Run(); - private: - DISALLOW_COPY_AND_ASSIGN(OnAppPermissionChangedNotification); + private: + DISALLOW_COPY_AND_ASSIGN(OnAppPermissionChangedNotification); }; } // namespace commands diff --git a/src/components/application_manager/include/application_manager/commands/hmi/on_app_permission_consent_notification.h b/src/components/application_manager/include/application_manager/commands/hmi/on_app_permission_consent_notification.h index a30b2c9a0d..5cafe0c1b5 100644 --- a/src/components/application_manager/include/application_manager/commands/hmi/on_app_permission_consent_notification.h +++ b/src/components/application_manager/include/application_manager/commands/hmi/on_app_permission_consent_notification.h @@ -43,26 +43,27 @@ namespace commands { * @brief OnAppPermissionConsentNotification command class **/ class OnAppPermissionConsentNotification : public NotificationFromHMI { - public: - /** - * @brief OnAppPermissionConsentNotification class constructor - * - * @param message Incoming SmartObject message - **/ - OnAppPermissionConsentNotification(const MessageSharedPtr& message, ApplicationManager& application_manager); + public: + /** + * @brief OnAppPermissionConsentNotification class constructor + * + * @param message Incoming SmartObject message + **/ + OnAppPermissionConsentNotification(const MessageSharedPtr& message, + ApplicationManager& application_manager); - /** - * @brief OnAppPermissionConsentNotification class destructor - **/ - virtual ~OnAppPermissionConsentNotification(); + /** + * @brief OnAppPermissionConsentNotification class destructor + **/ + virtual ~OnAppPermissionConsentNotification(); - /** - * @brief Execute command - **/ - virtual void Run(); + /** + * @brief Execute command + **/ + virtual void Run(); - private: - DISALLOW_COPY_AND_ASSIGN(OnAppPermissionConsentNotification); + private: + DISALLOW_COPY_AND_ASSIGN(OnAppPermissionConsentNotification); }; } // namespace commands diff --git a/src/components/application_manager/include/application_manager/commands/hmi/on_app_registered_notification.h b/src/components/application_manager/include/application_manager/commands/hmi/on_app_registered_notification.h index edfdc208b9..58e92a977a 100644 --- a/src/components/application_manager/include/application_manager/commands/hmi/on_app_registered_notification.h +++ b/src/components/application_manager/include/application_manager/commands/hmi/on_app_registered_notification.h @@ -49,7 +49,8 @@ class OnAppRegisteredNotification : public NotificationToHMI { * * @param message Incoming SmartObject message **/ - OnAppRegisteredNotification(const MessageSharedPtr& message, ApplicationManager& application_manager); + OnAppRegisteredNotification(const MessageSharedPtr& message, + ApplicationManager& application_manager); /** * @brief OnAppRegisteredNotification class destructor diff --git a/src/components/application_manager/include/application_manager/commands/hmi/on_app_unregistered_notification.h b/src/components/application_manager/include/application_manager/commands/hmi/on_app_unregistered_notification.h index a8c87e84fa..980e558d6f 100644 --- a/src/components/application_manager/include/application_manager/commands/hmi/on_app_unregistered_notification.h +++ b/src/components/application_manager/include/application_manager/commands/hmi/on_app_unregistered_notification.h @@ -49,7 +49,8 @@ class OnAppUnregisteredNotification : public NotificationToHMI { * * @param message Incoming SmartObject message **/ - OnAppUnregisteredNotification(const MessageSharedPtr& message, ApplicationManager& application_manager); + OnAppUnregisteredNotification(const MessageSharedPtr& message, + ApplicationManager& application_manager); /** * @brief OnAppUnregisteredNotification class destructor diff --git a/src/components/application_manager/include/application_manager/commands/hmi/on_audio_data_streaming_notification.h b/src/components/application_manager/include/application_manager/commands/hmi/on_audio_data_streaming_notification.h index 6aa33a032a..121367ed90 100644 --- a/src/components/application_manager/include/application_manager/commands/hmi/on_audio_data_streaming_notification.h +++ b/src/components/application_manager/include/application_manager/commands/hmi/on_audio_data_streaming_notification.h @@ -43,26 +43,27 @@ namespace commands { * @brief OnAudioDataStreamingNotification command class **/ class OnAudioDataStreamingNotification : public NotificationToHMI { - public: - /** - * @brief OnAudioDataStreamingNotification class constructor - * - * @param message Incoming SmartObject message - **/ - OnAudioDataStreamingNotification(const MessageSharedPtr& message, ApplicationManager& application_manager); + public: + /** + * @brief OnAudioDataStreamingNotification class constructor + * + * @param message Incoming SmartObject message + **/ + OnAudioDataStreamingNotification(const MessageSharedPtr& message, + ApplicationManager& application_manager); - /** - * @brief OnAudioDataStreamingNotification class destructor - **/ - virtual ~OnAudioDataStreamingNotification(); + /** + * @brief OnAudioDataStreamingNotification class destructor + **/ + virtual ~OnAudioDataStreamingNotification(); - /** - * @brief Execute command - **/ - virtual void Run(); + /** + * @brief Execute command + **/ + virtual void Run(); - private: - DISALLOW_COPY_AND_ASSIGN(OnAudioDataStreamingNotification); + private: + DISALLOW_COPY_AND_ASSIGN(OnAudioDataStreamingNotification); }; } // namespace commands @@ -70,4 +71,3 @@ class OnAudioDataStreamingNotification : public NotificationToHMI { } // namespace application_manager #endif // SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_HMI_ON_AUDIO_DATA_STREAMING_NOTIFICATION_H_ - diff --git a/src/components/application_manager/include/application_manager/commands/hmi/on_button_event_notification.h b/src/components/application_manager/include/application_manager/commands/hmi/on_button_event_notification.h index 92f5ac6449..f294bce2c8 100644 --- a/src/components/application_manager/include/application_manager/commands/hmi/on_button_event_notification.h +++ b/src/components/application_manager/include/application_manager/commands/hmi/on_button_event_notification.h @@ -53,7 +53,8 @@ class OnButtonEventNotification : public NotificationFromHMI { * * @param message Incoming SmartObject message **/ - OnButtonEventNotification(const MessageSharedPtr& message, ApplicationManager& application_manager); + OnButtonEventNotification(const MessageSharedPtr& message, + ApplicationManager& application_manager); /** * @brief Execute command @@ -64,7 +65,7 @@ class OnButtonEventNotification : public NotificationFromHMI { DISALLOW_COPY_AND_ASSIGN(OnButtonEventNotification); }; -} // namespace hmi +} // namespace hmi } // namespace commands diff --git a/src/components/application_manager/include/application_manager/commands/hmi/on_button_press_notification.h b/src/components/application_manager/include/application_manager/commands/hmi/on_button_press_notification.h index c0499d80e2..8936ed8a0f 100644 --- a/src/components/application_manager/include/application_manager/commands/hmi/on_button_press_notification.h +++ b/src/components/application_manager/include/application_manager/commands/hmi/on_button_press_notification.h @@ -53,7 +53,8 @@ class OnButtonPressNotification : public NotificationFromHMI { * * @param message Incoming SmartObject message **/ - OnButtonPressNotification(const MessageSharedPtr& message, ApplicationManager& application_manager); + OnButtonPressNotification(const MessageSharedPtr& message, + ApplicationManager& application_manager); /** * @brief Execute command diff --git a/src/components/application_manager/include/application_manager/commands/hmi/on_button_subscription_notification.h b/src/components/application_manager/include/application_manager/commands/hmi/on_button_subscription_notification.h index 5b2b71f63b..d98ba3a90b 100644 --- a/src/components/application_manager/include/application_manager/commands/hmi/on_button_subscription_notification.h +++ b/src/components/application_manager/include/application_manager/commands/hmi/on_button_subscription_notification.h @@ -51,7 +51,8 @@ class OnButtonSubscriptionNotification : public NotificationToHMI { * * @param message Incoming SmartObject message **/ - OnButtonSubscriptionNotification(const MessageSharedPtr& message, ApplicationManager& application_manager); + OnButtonSubscriptionNotification(const MessageSharedPtr& message, + ApplicationManager& application_manager); /** * @brief OnButtonSubscriptionNotification class destructor diff --git a/src/components/application_manager/include/application_manager/commands/hmi/on_device_chosen_notification.h b/src/components/application_manager/include/application_manager/commands/hmi/on_device_chosen_notification.h index ad478d9938..5345135583 100644 --- a/src/components/application_manager/include/application_manager/commands/hmi/on_device_chosen_notification.h +++ b/src/components/application_manager/include/application_manager/commands/hmi/on_device_chosen_notification.h @@ -49,7 +49,8 @@ class OnDeviceChosenNotification : public NotificationFromHMI { * * @param message Incoming SmartObject message **/ - OnDeviceChosenNotification(const MessageSharedPtr& message, ApplicationManager& application_manager); + OnDeviceChosenNotification(const MessageSharedPtr& message, + ApplicationManager& application_manager); /** * @brief OnDeviceChosenNotification class destructor diff --git a/src/components/application_manager/include/application_manager/commands/hmi/on_device_state_changed_notification.h b/src/components/application_manager/include/application_manager/commands/hmi/on_device_state_changed_notification.h index 2adb19459d..62a87f4599 100644 --- a/src/components/application_manager/include/application_manager/commands/hmi/on_device_state_changed_notification.h +++ b/src/components/application_manager/include/application_manager/commands/hmi/on_device_state_changed_notification.h @@ -43,26 +43,27 @@ namespace commands { * @brief OnDeviceStateChangedNotification command class **/ class OnDeviceStateChangedNotification : public NotificationFromHMI { - public: - /** - * @brief OnDeviceStateChangedNotification class constructor - * - * @param message Incoming SmartObject message - **/ - OnDeviceStateChangedNotification(const MessageSharedPtr& message, ApplicationManager& application_manager); + public: + /** + * @brief OnDeviceStateChangedNotification class constructor + * + * @param message Incoming SmartObject message + **/ + OnDeviceStateChangedNotification(const MessageSharedPtr& message, + ApplicationManager& application_manager); - /** - * @brief OnDeviceStateChangedNotification class destructor - **/ - virtual ~OnDeviceStateChangedNotification(); + /** + * @brief OnDeviceStateChangedNotification class destructor + **/ + virtual ~OnDeviceStateChangedNotification(); - /** - * @brief Execute command - **/ - virtual void Run(); + /** + * @brief Execute command + **/ + virtual void Run(); - private: - DISALLOW_COPY_AND_ASSIGN(OnDeviceStateChangedNotification); + private: + DISALLOW_COPY_AND_ASSIGN(OnDeviceStateChangedNotification); }; } // namespace commands diff --git a/src/components/application_manager/include/application_manager/commands/hmi/on_driver_distraction_notification.h b/src/components/application_manager/include/application_manager/commands/hmi/on_driver_distraction_notification.h index d2b995c7ff..69d1707bf7 100644 --- a/src/components/application_manager/include/application_manager/commands/hmi/on_driver_distraction_notification.h +++ b/src/components/application_manager/include/application_manager/commands/hmi/on_driver_distraction_notification.h @@ -53,7 +53,8 @@ class OnDriverDistractionNotification : public NotificationFromHMI { * * @param message Incoming SmartObject message **/ - OnDriverDistractionNotification(const MessageSharedPtr& message, ApplicationManager& application_manager); + OnDriverDistractionNotification(const MessageSharedPtr& message, + ApplicationManager& application_manager); /** * @brief OnDriverDistractionNotification class destructor diff --git a/src/components/application_manager/include/application_manager/commands/hmi/on_event_changed_notification.h b/src/components/application_manager/include/application_manager/commands/hmi/on_event_changed_notification.h index a6e29012ff..e066332d4c 100644 --- a/src/components/application_manager/include/application_manager/commands/hmi/on_event_changed_notification.h +++ b/src/components/application_manager/include/application_manager/commands/hmi/on_event_changed_notification.h @@ -43,26 +43,27 @@ namespace commands { * @brief OnEventChangedNotification command class **/ class OnEventChangedNotification : public NotificationFromHMI { - public: - /** - * @brief OnEventChangedNotification class constructor - * - * @param message Incoming SmartObject message - **/ - OnEventChangedNotification(const MessageSharedPtr& message, ApplicationManager& application_manager); + public: + /** + * @brief OnEventChangedNotification class constructor + * + * @param message Incoming SmartObject message + **/ + OnEventChangedNotification(const MessageSharedPtr& message, + ApplicationManager& application_manager); - /** - * @brief OnEventChangedNotification class destructor - **/ - virtual ~OnEventChangedNotification(); + /** + * @brief OnEventChangedNotification class destructor + **/ + virtual ~OnEventChangedNotification(); - /** - * @brief Execute command - **/ - virtual void Run(); + /** + * @brief Execute command + **/ + virtual void Run(); - private: - DISALLOW_COPY_AND_ASSIGN(OnEventChangedNotification); + private: + DISALLOW_COPY_AND_ASSIGN(OnEventChangedNotification); }; } // namespace commands diff --git a/src/components/application_manager/include/application_manager/commands/hmi/on_exit_all_applications_notification.h b/src/components/application_manager/include/application_manager/commands/hmi/on_exit_all_applications_notification.h index 41abd30dcf..ad10a58bff 100644 --- a/src/components/application_manager/include/application_manager/commands/hmi/on_exit_all_applications_notification.h +++ b/src/components/application_manager/include/application_manager/commands/hmi/on_exit_all_applications_notification.h @@ -49,7 +49,8 @@ class OnExitAllApplicationsNotification : public NotificationFromHMI { * * @param message Incoming SmartObject message **/ - OnExitAllApplicationsNotification(const MessageSharedPtr& message, ApplicationManager& application_manager); + OnExitAllApplicationsNotification(const MessageSharedPtr& message, + ApplicationManager& application_manager); /** * @brief OnExitAllApplicationsNotification class destructor @@ -62,7 +63,6 @@ class OnExitAllApplicationsNotification : public NotificationFromHMI { virtual void Run(); private: - /** * @brief Notify's HMI that SDL stored all data required for resumption **/ diff --git a/src/components/application_manager/include/application_manager/commands/hmi/on_exit_application_notification.h b/src/components/application_manager/include/application_manager/commands/hmi/on_exit_application_notification.h index 2e8a9bc6d4..275b266b98 100644 --- a/src/components/application_manager/include/application_manager/commands/hmi/on_exit_application_notification.h +++ b/src/components/application_manager/include/application_manager/commands/hmi/on_exit_application_notification.h @@ -49,7 +49,8 @@ class OnExitApplicationNotification : public NotificationFromHMI { * * @param message Incoming SmartObject message **/ - OnExitApplicationNotification(const MessageSharedPtr& message, ApplicationManager& application_manager); + OnExitApplicationNotification(const MessageSharedPtr& message, + ApplicationManager& application_manager); /** * @brief OnExitApplicationNotification class destructor diff --git a/src/components/application_manager/include/application_manager/commands/hmi/on_file_removed_notification.h b/src/components/application_manager/include/application_manager/commands/hmi/on_file_removed_notification.h index 1382760a3c..3f1ac17fc4 100644 --- a/src/components/application_manager/include/application_manager/commands/hmi/on_file_removed_notification.h +++ b/src/components/application_manager/include/application_manager/commands/hmi/on_file_removed_notification.h @@ -49,7 +49,8 @@ class OnFileRemovedNotification : public NotificationToHMI { * * @param message Incoming SmartObject message **/ - OnFileRemovedNotification(const MessageSharedPtr& message, ApplicationManager& application_manager); + OnFileRemovedNotification(const MessageSharedPtr& message, + ApplicationManager& application_manager); /** * @brief OnFileRemovedNotification class destructor diff --git a/src/components/application_manager/include/application_manager/commands/hmi/on_find_applications.h b/src/components/application_manager/include/application_manager/commands/hmi/on_find_applications.h index 6840122746..32db73c2f5 100644 --- a/src/components/application_manager/include/application_manager/commands/hmi/on_find_applications.h +++ b/src/components/application_manager/include/application_manager/commands/hmi/on_find_applications.h @@ -49,7 +49,8 @@ class OnFindApplications : public NotificationFromHMI { * * @param message Incoming SmartObject message **/ - OnFindApplications(const MessageSharedPtr& message, ApplicationManager& application_manager); + OnFindApplications(const MessageSharedPtr& message, + ApplicationManager& application_manager); /** * @brief OnFindApplications class destructor diff --git a/src/components/application_manager/include/application_manager/commands/hmi/on_ignition_cycle_over_notification.h b/src/components/application_manager/include/application_manager/commands/hmi/on_ignition_cycle_over_notification.h index a747238f29..acb1ff31ac 100644 --- a/src/components/application_manager/include/application_manager/commands/hmi/on_ignition_cycle_over_notification.h +++ b/src/components/application_manager/include/application_manager/commands/hmi/on_ignition_cycle_over_notification.h @@ -50,7 +50,8 @@ class OnIgnitionCycleOverNotification : public NotificationFromHMI { * * @param message Incoming SmartObject message **/ - OnIgnitionCycleOverNotification(const MessageSharedPtr& message, ApplicationManager& application_manager); + OnIgnitionCycleOverNotification(const MessageSharedPtr& message, + ApplicationManager& application_manager); /** * @brief OnIgnitionCycleOverNotification class destructor @@ -63,7 +64,6 @@ class OnIgnitionCycleOverNotification : public NotificationFromHMI { virtual void Run(); private: - DISALLOW_COPY_AND_ASSIGN(OnIgnitionCycleOverNotification); }; diff --git a/src/components/application_manager/include/application_manager/commands/hmi/on_navi_tbt_client_state_notification.h b/src/components/application_manager/include/application_manager/commands/hmi/on_navi_tbt_client_state_notification.h index ab7ac2e5eb..0150853546 100644 --- a/src/components/application_manager/include/application_manager/commands/hmi/on_navi_tbt_client_state_notification.h +++ b/src/components/application_manager/include/application_manager/commands/hmi/on_navi_tbt_client_state_notification.h @@ -50,7 +50,8 @@ class OnNaviTBTClientStateNotification : public NotificationFromHMI { * * @param message Incoming SmartObject message **/ - OnNaviTBTClientStateNotification(const MessageSharedPtr& message, ApplicationManager& application_manager); + OnNaviTBTClientStateNotification(const MessageSharedPtr& message, + ApplicationManager& application_manager); /** * @brief OnNaviTBTClientStateNotification class destructor diff --git a/src/components/application_manager/include/application_manager/commands/hmi/on_navi_way_point_change_notification.h b/src/components/application_manager/include/application_manager/commands/hmi/on_navi_way_point_change_notification.h index ecac3e6375..d304685008 100644 --- a/src/components/application_manager/include/application_manager/commands/hmi/on_navi_way_point_change_notification.h +++ b/src/components/application_manager/include/application_manager/commands/hmi/on_navi_way_point_change_notification.h @@ -51,7 +51,7 @@ class OnNaviWayPointChangeNotification : public NotificationFromHMI { * @param message Incoming SmartObject message **/ OnNaviWayPointChangeNotification(const MessageSharedPtr& message, - ApplicationManager& app_man); + ApplicationManager& app_man); /** * @brief OnNaviWayPointChangeNotification class destructor @@ -70,4 +70,4 @@ class OnNaviWayPointChangeNotification : public NotificationFromHMI { } // namespace commands } // namespace application_manager -#endif // SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_HMI_ON_NAVI_WAY_POINT_CHANGE_NOTIFICATION_H_ +#endif // SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_HMI_ON_NAVI_WAY_POINT_CHANGE_NOTIFICATION_H_ diff --git a/src/components/application_manager/include/application_manager/commands/hmi/on_policy_update.h b/src/components/application_manager/include/application_manager/commands/hmi/on_policy_update.h index e85c797f72..d4380048ee 100644 --- a/src/components/application_manager/include/application_manager/commands/hmi/on_policy_update.h +++ b/src/components/application_manager/include/application_manager/commands/hmi/on_policy_update.h @@ -39,26 +39,27 @@ namespace application_manager { namespace commands { class OnPolicyUpdate : public NotificationFromHMI { - public: - /** - * @brief OnPolicyUpdate class constructor - * - * @param message Incoming SmartObject message - **/ - OnPolicyUpdate(const MessageSharedPtr& message, ApplicationManager& application_manager); + public: + /** + * @brief OnPolicyUpdate class constructor + * + * @param message Incoming SmartObject message + **/ + OnPolicyUpdate(const MessageSharedPtr& message, + ApplicationManager& application_manager); - /** - * @brief OnPolicyUpdate class destructor - **/ - virtual ~OnPolicyUpdate(); + /** + * @brief OnPolicyUpdate class destructor + **/ + virtual ~OnPolicyUpdate(); - /** - * @brief Execute command - **/ - virtual void Run(); + /** + * @brief Execute command + **/ + virtual void Run(); - private: - DISALLOW_COPY_AND_ASSIGN(OnPolicyUpdate); + private: + DISALLOW_COPY_AND_ASSIGN(OnPolicyUpdate); }; } // namespace commands } // namespace application_manager diff --git a/src/components/application_manager/include/application_manager/commands/hmi/on_put_file_notification.h b/src/components/application_manager/include/application_manager/commands/hmi/on_put_file_notification.h index 6357086bb7..809623fda0 100644 --- a/src/components/application_manager/include/application_manager/commands/hmi/on_put_file_notification.h +++ b/src/components/application_manager/include/application_manager/commands/hmi/on_put_file_notification.h @@ -50,7 +50,8 @@ class OnPutFileNotification : public NotificationToHMI { * * @param message Incoming SmartObject message **/ - OnPutFileNotification(const MessageSharedPtr& message, ApplicationManager& application_manager); + OnPutFileNotification(const MessageSharedPtr& message, + ApplicationManager& application_manager); /** * @brief OnPutFileNotification class destructor @@ -63,7 +64,6 @@ class OnPutFileNotification : public NotificationToHMI { virtual void Run(); private: - DISALLOW_COPY_AND_ASSIGN(OnPutFileNotification); }; diff --git a/src/components/application_manager/include/application_manager/commands/hmi/on_ready_notification.h b/src/components/application_manager/include/application_manager/commands/hmi/on_ready_notification.h index 3ed938747a..7df1bf5ac0 100644 --- a/src/components/application_manager/include/application_manager/commands/hmi/on_ready_notification.h +++ b/src/components/application_manager/include/application_manager/commands/hmi/on_ready_notification.h @@ -50,7 +50,8 @@ class OnReadyNotification : public NotificationFromHMI { * * @param message Incoming SmartObject message **/ - OnReadyNotification(const MessageSharedPtr& message, ApplicationManager& application_manager); + OnReadyNotification(const MessageSharedPtr& message, + ApplicationManager& application_manager); /** * @brief OnReadyNotification class destructor diff --git a/src/components/application_manager/include/application_manager/commands/hmi/on_received_policy_update.h b/src/components/application_manager/include/application_manager/commands/hmi/on_received_policy_update.h index 603b60290e..0569e818d1 100644 --- a/src/components/application_manager/include/application_manager/commands/hmi/on_received_policy_update.h +++ b/src/components/application_manager/include/application_manager/commands/hmi/on_received_policy_update.h @@ -40,26 +40,27 @@ namespace application_manager { namespace commands { class OnReceivedPolicyUpdate : public NotificationFromHMI { - public: - /** - * @brief OnReceivedPolicyUpdate class constructor - * - * @param message Incoming SmartObject message - **/ - OnReceivedPolicyUpdate(const MessageSharedPtr& message, ApplicationManager& application_manager); - - /** - * @brief OnReceivedPolicyUpdate class destructor + public: + /** + * @brief OnReceivedPolicyUpdate class constructor + * + * @param message Incoming SmartObject message **/ - virtual ~OnReceivedPolicyUpdate(); + OnReceivedPolicyUpdate(const MessageSharedPtr& message, + ApplicationManager& application_manager); - /** - * @brief Execute command - **/ - virtual void Run(); + /** + * @brief OnReceivedPolicyUpdate class destructor + **/ + virtual ~OnReceivedPolicyUpdate(); + + /** + * @brief Execute command + **/ + virtual void Run(); - private: - DISALLOW_COPY_AND_ASSIGN(OnReceivedPolicyUpdate); + private: + DISALLOW_COPY_AND_ASSIGN(OnReceivedPolicyUpdate); }; } // namespace commands diff --git a/src/components/application_manager/include/application_manager/commands/hmi/on_record_start_notification.h b/src/components/application_manager/include/application_manager/commands/hmi/on_record_start_notification.h index 881c254d2e..fbb8a0522a 100644 --- a/src/components/application_manager/include/application_manager/commands/hmi/on_record_start_notification.h +++ b/src/components/application_manager/include/application_manager/commands/hmi/on_record_start_notification.h @@ -49,7 +49,8 @@ class OnRecordStartdNotification : public NotificationToHMI { * * @param message Incoming SmartObject message **/ - OnRecordStartdNotification(const MessageSharedPtr& message, ApplicationManager& application_manager); + OnRecordStartdNotification(const MessageSharedPtr& message, + ApplicationManager& application_manager); /** * @brief OnRecordStartdNotification class destructor diff --git a/src/components/application_manager/include/application_manager/commands/hmi/on_resume_audio_source_notification.h b/src/components/application_manager/include/application_manager/commands/hmi/on_resume_audio_source_notification.h index 8f37b2bfc2..764ee6d180 100644 --- a/src/components/application_manager/include/application_manager/commands/hmi/on_resume_audio_source_notification.h +++ b/src/components/application_manager/include/application_manager/commands/hmi/on_resume_audio_source_notification.h @@ -50,7 +50,8 @@ class OnResumeAudioSourceNotification : public NotificationToHMI { * * @param message Incoming SmartObject message **/ - OnResumeAudioSourceNotification(const MessageSharedPtr& message, ApplicationManager& application_manager); + OnResumeAudioSourceNotification(const MessageSharedPtr& message, + ApplicationManager& application_manager); /** * @brief OnResumeAudioSourceNotification class destructor @@ -63,7 +64,6 @@ class OnResumeAudioSourceNotification : public NotificationToHMI { virtual void Run(); private: - DISALLOW_COPY_AND_ASSIGN(OnResumeAudioSourceNotification); }; diff --git a/src/components/application_manager/include/application_manager/commands/hmi/on_sdl_close_notification.h b/src/components/application_manager/include/application_manager/commands/hmi/on_sdl_close_notification.h index f2547471dd..ef1d289ca7 100644 --- a/src/components/application_manager/include/application_manager/commands/hmi/on_sdl_close_notification.h +++ b/src/components/application_manager/include/application_manager/commands/hmi/on_sdl_close_notification.h @@ -49,7 +49,8 @@ class OnSDLCloseNotification : public NotificationToHMI { * * @param message Incoming SmartObject message **/ - OnSDLCloseNotification(const MessageSharedPtr& message, ApplicationManager& application_manager); + OnSDLCloseNotification(const MessageSharedPtr& message, + ApplicationManager& application_manager); /** * @brief OnSdlCloseNotification class destructor diff --git a/src/components/application_manager/include/application_manager/commands/hmi/on_sdl_consent_needed_notification.h b/src/components/application_manager/include/application_manager/commands/hmi/on_sdl_consent_needed_notification.h index 52f8208d4c..e54daab96f 100644 --- a/src/components/application_manager/include/application_manager/commands/hmi/on_sdl_consent_needed_notification.h +++ b/src/components/application_manager/include/application_manager/commands/hmi/on_sdl_consent_needed_notification.h @@ -43,26 +43,27 @@ namespace commands { * @brief OnSDLConsentNeededNotification command class **/ class OnSDLConsentNeededNotification : public NotificationToHMI { - public: - /** - * @brief OnSDLConsentNeededNotification class constructor - * - * @param message Incoming SmartObject message - **/ - OnSDLConsentNeededNotification(const MessageSharedPtr& message, ApplicationManager& application_manager); + public: + /** + * @brief OnSDLConsentNeededNotification class constructor + * + * @param message Incoming SmartObject message + **/ + OnSDLConsentNeededNotification(const MessageSharedPtr& message, + ApplicationManager& application_manager); - /** - * @brief OnSDLConsentNeededNotification class destructor - **/ - virtual ~OnSDLConsentNeededNotification(); + /** + * @brief OnSDLConsentNeededNotification class destructor + **/ + virtual ~OnSDLConsentNeededNotification(); - /** - * @brief Execute command - **/ - virtual void Run(); + /** + * @brief Execute command + **/ + virtual void Run(); - private: - DISALLOW_COPY_AND_ASSIGN(OnSDLConsentNeededNotification); + private: + DISALLOW_COPY_AND_ASSIGN(OnSDLConsentNeededNotification); }; } // namespace commands diff --git a/src/components/application_manager/include/application_manager/commands/hmi/on_sdl_persistence_complete_notification.h b/src/components/application_manager/include/application_manager/commands/hmi/on_sdl_persistence_complete_notification.h index 28fed71793..6ac04b488b 100644 --- a/src/components/application_manager/include/application_manager/commands/hmi/on_sdl_persistence_complete_notification.h +++ b/src/components/application_manager/include/application_manager/commands/hmi/on_sdl_persistence_complete_notification.h @@ -43,26 +43,27 @@ namespace commands { * @brief OnSDLPersistenceCompleteNotification command class **/ class OnSDLPersistenceCompleteNotification : public NotificationToHMI { - public: - /** - * @brief OnSDLPersistenceCompleteNotification class constructor - * - * @param message Incoming SmartObject message - **/ - OnSDLPersistenceCompleteNotification(const MessageSharedPtr& message, ApplicationManager& application_manager); + public: + /** + * @brief OnSDLPersistenceCompleteNotification class constructor + * + * @param message Incoming SmartObject message + **/ + OnSDLPersistenceCompleteNotification(const MessageSharedPtr& message, + ApplicationManager& application_manager); - /** - * @brief OnSDLPersistenceCompleteNotification class destructor - **/ - virtual ~OnSDLPersistenceCompleteNotification(); + /** + * @brief OnSDLPersistenceCompleteNotification class destructor + **/ + virtual ~OnSDLPersistenceCompleteNotification(); - /** - * @brief Execute command - **/ - virtual void Run(); + /** + * @brief Execute command + **/ + virtual void Run(); - private: - DISALLOW_COPY_AND_ASSIGN(OnSDLPersistenceCompleteNotification); + private: + DISALLOW_COPY_AND_ASSIGN(OnSDLPersistenceCompleteNotification); }; } // namespace commands diff --git a/src/components/application_manager/include/application_manager/commands/hmi/on_start_device_discovery.h b/src/components/application_manager/include/application_manager/commands/hmi/on_start_device_discovery.h index fa405fbb11..dc40c1a614 100644 --- a/src/components/application_manager/include/application_manager/commands/hmi/on_start_device_discovery.h +++ b/src/components/application_manager/include/application_manager/commands/hmi/on_start_device_discovery.h @@ -49,7 +49,8 @@ class OnStartDeviceDiscovery : public NotificationFromHMI { * * @param message Incoming SmartObject message **/ - OnStartDeviceDiscovery(const MessageSharedPtr& message, ApplicationManager& application_manager); + OnStartDeviceDiscovery(const MessageSharedPtr& message, + ApplicationManager& application_manager); /** * @brief OnStartDeviceDiscovery class destructor diff --git a/src/components/application_manager/include/application_manager/commands/hmi/on_status_update_notification.h b/src/components/application_manager/include/application_manager/commands/hmi/on_status_update_notification.h index 02422ef3f5..62ee38c473 100644 --- a/src/components/application_manager/include/application_manager/commands/hmi/on_status_update_notification.h +++ b/src/components/application_manager/include/application_manager/commands/hmi/on_status_update_notification.h @@ -43,26 +43,27 @@ namespace commands { * @brief OnGetStatusUpdateNotification command class **/ class OnStatusUpdateNotification : public NotificationToHMI { - public: - /** - * @brief OnGetStatusUpdateNotification class constructor - * - * @param message Incoming SmartObject message - **/ - OnStatusUpdateNotification(const MessageSharedPtr& message, ApplicationManager& application_manager); + public: + /** + * @brief OnGetStatusUpdateNotification class constructor + * + * @param message Incoming SmartObject message + **/ + OnStatusUpdateNotification(const MessageSharedPtr& message, + ApplicationManager& application_manager); - /** - * @brief OnGetStatusUpdateNotification class destructor - **/ - virtual ~OnStatusUpdateNotification(); + /** + * @brief OnGetStatusUpdateNotification class destructor + **/ + virtual ~OnStatusUpdateNotification(); - /** - * @brief Execute command - **/ - virtual void Run(); + /** + * @brief Execute command + **/ + virtual void Run(); - private: - DISALLOW_COPY_AND_ASSIGN(OnStatusUpdateNotification); + private: + DISALLOW_COPY_AND_ASSIGN(OnStatusUpdateNotification); }; } // namespace commands diff --git a/src/components/application_manager/include/application_manager/commands/hmi/on_system_context_notification.h b/src/components/application_manager/include/application_manager/commands/hmi/on_system_context_notification.h index 9610a31fee..9008a20cc9 100644 --- a/src/components/application_manager/include/application_manager/commands/hmi/on_system_context_notification.h +++ b/src/components/application_manager/include/application_manager/commands/hmi/on_system_context_notification.h @@ -51,7 +51,8 @@ class OnSystemContextNotification : public NotificationFromHMI { * * @param message Incoming SmartObject message **/ - OnSystemContextNotification(const MessageSharedPtr& message, ApplicationManager& application_manager); + OnSystemContextNotification(const MessageSharedPtr& message, + ApplicationManager& application_manager); /** * @brief OnSystemContextNotification class destructor diff --git a/src/components/application_manager/include/application_manager/commands/hmi/on_system_error_notification.h b/src/components/application_manager/include/application_manager/commands/hmi/on_system_error_notification.h index 6c18c920e1..1e65b15c20 100644 --- a/src/components/application_manager/include/application_manager/commands/hmi/on_system_error_notification.h +++ b/src/components/application_manager/include/application_manager/commands/hmi/on_system_error_notification.h @@ -49,7 +49,8 @@ class OnSystemErrorNotification : public NotificationFromHMI { * * @param message Incoming SmartObject message **/ - OnSystemErrorNotification(const MessageSharedPtr& message, ApplicationManager& application_manager); + OnSystemErrorNotification(const MessageSharedPtr& message, + ApplicationManager& application_manager); /** * @brief OnSystemErrorNotification class destructor diff --git a/src/components/application_manager/include/application_manager/commands/hmi/on_system_info_changed_notification.h b/src/components/application_manager/include/application_manager/commands/hmi/on_system_info_changed_notification.h index 66924ab8da..d709a5267c 100644 --- a/src/components/application_manager/include/application_manager/commands/hmi/on_system_info_changed_notification.h +++ b/src/components/application_manager/include/application_manager/commands/hmi/on_system_info_changed_notification.h @@ -43,26 +43,27 @@ namespace commands { * @brief OnSystemInfoChangedNotification command class **/ class OnSystemInfoChangedNotification : public NotificationFromHMI { - public: - /** - * @brief OnSystemInfoChangedNotification class constructor - * - * @param message Incoming SmartObject message - **/ - OnSystemInfoChangedNotification(const MessageSharedPtr& message, ApplicationManager& application_manager); + public: + /** + * @brief OnSystemInfoChangedNotification class constructor + * + * @param message Incoming SmartObject message + **/ + OnSystemInfoChangedNotification(const MessageSharedPtr& message, + ApplicationManager& application_manager); - /** - * @brief OnSystemInfoChangedNotification class destructor - **/ - virtual ~OnSystemInfoChangedNotification(); + /** + * @brief OnSystemInfoChangedNotification class destructor + **/ + virtual ~OnSystemInfoChangedNotification(); - /** - * @brief Execute command - **/ - virtual void Run(); + /** + * @brief Execute command + **/ + virtual void Run(); - private: - DISALLOW_COPY_AND_ASSIGN(OnSystemInfoChangedNotification); + private: + DISALLOW_COPY_AND_ASSIGN(OnSystemInfoChangedNotification); }; } // namespace commands diff --git a/src/components/application_manager/include/application_manager/commands/hmi/on_system_request_notification.h b/src/components/application_manager/include/application_manager/commands/hmi/on_system_request_notification.h index 8ba8eee00a..8e4db24822 100644 --- a/src/components/application_manager/include/application_manager/commands/hmi/on_system_request_notification.h +++ b/src/components/application_manager/include/application_manager/commands/hmi/on_system_request_notification.h @@ -50,7 +50,8 @@ class OnSystemRequestNotification : public NotificationFromHMI { * * @param message Incoming SmartObject message **/ - OnSystemRequestNotification(const MessageSharedPtr& message, ApplicationManager& application_manager); + OnSystemRequestNotification(const MessageSharedPtr& message, + ApplicationManager& application_manager); /** * @brief OnSystemRequestNotification class destructor @@ -63,7 +64,6 @@ class OnSystemRequestNotification : public NotificationFromHMI { virtual void Run(); private: - DISALLOW_COPY_AND_ASSIGN(OnSystemRequestNotification); }; diff --git a/src/components/application_manager/include/application_manager/commands/hmi/on_tts_language_change_notification.h b/src/components/application_manager/include/application_manager/commands/hmi/on_tts_language_change_notification.h index 5bcdc419cf..245dc32386 100644 --- a/src/components/application_manager/include/application_manager/commands/hmi/on_tts_language_change_notification.h +++ b/src/components/application_manager/include/application_manager/commands/hmi/on_tts_language_change_notification.h @@ -49,7 +49,8 @@ class OnTTSLanguageChangeNotification : public NotificationFromHMI { * * @param message Incoming SmartObject message **/ - OnTTSLanguageChangeNotification(const MessageSharedPtr& message, ApplicationManager& application_manager); + OnTTSLanguageChangeNotification(const MessageSharedPtr& message, + ApplicationManager& application_manager); /** * @brief OnTTSLanguageChangeNotification class destructor diff --git a/src/components/application_manager/include/application_manager/commands/hmi/on_tts_reset_timeout_notification.h b/src/components/application_manager/include/application_manager/commands/hmi/on_tts_reset_timeout_notification.h index d1e0b164b1..be84a93215 100644 --- a/src/components/application_manager/include/application_manager/commands/hmi/on_tts_reset_timeout_notification.h +++ b/src/components/application_manager/include/application_manager/commands/hmi/on_tts_reset_timeout_notification.h @@ -51,7 +51,8 @@ class OnTTSResetTimeoutNotification : public NotificationFromHMI { * * @param message Incoming SmartObject message **/ - OnTTSResetTimeoutNotification(const MessageSharedPtr& message, ApplicationManager& application_manager); + OnTTSResetTimeoutNotification(const MessageSharedPtr& message, + ApplicationManager& application_manager); /** * @brief OnTTSResetTimeoutNotification class destructor diff --git a/src/components/application_manager/include/application_manager/commands/hmi/on_tts_started_notification.h b/src/components/application_manager/include/application_manager/commands/hmi/on_tts_started_notification.h index 280371c32f..234d8036eb 100644 --- a/src/components/application_manager/include/application_manager/commands/hmi/on_tts_started_notification.h +++ b/src/components/application_manager/include/application_manager/commands/hmi/on_tts_started_notification.h @@ -49,7 +49,8 @@ class OnTTSStartedNotification : public NotificationFromHMI { * * @param message Incoming SmartObject message **/ - OnTTSStartedNotification(const MessageSharedPtr& message, ApplicationManager& application_manager); + OnTTSStartedNotification(const MessageSharedPtr& message, + ApplicationManager& application_manager); /** * @brief OnTTSStartedNotification class destructor diff --git a/src/components/application_manager/include/application_manager/commands/hmi/on_tts_stopped_notification.h b/src/components/application_manager/include/application_manager/commands/hmi/on_tts_stopped_notification.h index 537dbe22bb..4e058fde64 100644 --- a/src/components/application_manager/include/application_manager/commands/hmi/on_tts_stopped_notification.h +++ b/src/components/application_manager/include/application_manager/commands/hmi/on_tts_stopped_notification.h @@ -49,7 +49,8 @@ class OnTTSStoppedNotification : public NotificationFromHMI { * * @param message Incoming SmartObject OnTTSStartedNotificationmessage **/ - OnTTSStoppedNotification(const MessageSharedPtr& message, ApplicationManager& application_manager); + OnTTSStoppedNotification(const MessageSharedPtr& message, + ApplicationManager& application_manager); /** * @brief OnTTSStoppedNotification class destructor diff --git a/src/components/application_manager/include/application_manager/commands/hmi/on_ui_command_notification.h b/src/components/application_manager/include/application_manager/commands/hmi/on_ui_command_notification.h index b222b8d159..618bc13017 100644 --- a/src/components/application_manager/include/application_manager/commands/hmi/on_ui_command_notification.h +++ b/src/components/application_manager/include/application_manager/commands/hmi/on_ui_command_notification.h @@ -49,7 +49,8 @@ class OnUICommandNotification : public NotificationFromHMI { * * @param message Incoming SmartObject message **/ - OnUICommandNotification(const MessageSharedPtr& message, ApplicationManager& application_manager); + OnUICommandNotification(const MessageSharedPtr& message, + ApplicationManager& application_manager); /** * @brief OnUICommandNotification class destructor diff --git a/src/components/application_manager/include/application_manager/commands/hmi/on_ui_keyboard_input_notification.h b/src/components/application_manager/include/application_manager/commands/hmi/on_ui_keyboard_input_notification.h index f7926198d1..6e881dc94a 100644 --- a/src/components/application_manager/include/application_manager/commands/hmi/on_ui_keyboard_input_notification.h +++ b/src/components/application_manager/include/application_manager/commands/hmi/on_ui_keyboard_input_notification.h @@ -52,7 +52,8 @@ class OnUIKeyBoardInputNotification : public NotificationFromHMI { * * @param message Incoming SmartObject message **/ - OnUIKeyBoardInputNotification(const MessageSharedPtr& message, ApplicationManager& application_manager); + OnUIKeyBoardInputNotification(const MessageSharedPtr& message, + ApplicationManager& application_manager); /** * @brief OnUIKeyBoardInputNotification class destructor diff --git a/src/components/application_manager/include/application_manager/commands/hmi/on_ui_language_change_notification.h b/src/components/application_manager/include/application_manager/commands/hmi/on_ui_language_change_notification.h index a7d12d6303..cc8cd1eb0e 100644 --- a/src/components/application_manager/include/application_manager/commands/hmi/on_ui_language_change_notification.h +++ b/src/components/application_manager/include/application_manager/commands/hmi/on_ui_language_change_notification.h @@ -49,7 +49,8 @@ class OnUILanguageChangeNotification : public NotificationFromHMI { * * @param message Incoming SmartObject message **/ - OnUILanguageChangeNotification(const MessageSharedPtr& message, ApplicationManager& application_manager); + OnUILanguageChangeNotification(const MessageSharedPtr& message, + ApplicationManager& application_manager); /** * @brief OnUILanguageChangeNotification class destructor diff --git a/src/components/application_manager/include/application_manager/commands/hmi/on_ui_reset_timeout_notification.h b/src/components/application_manager/include/application_manager/commands/hmi/on_ui_reset_timeout_notification.h index 5413512660..f5dd173998 100644 --- a/src/components/application_manager/include/application_manager/commands/hmi/on_ui_reset_timeout_notification.h +++ b/src/components/application_manager/include/application_manager/commands/hmi/on_ui_reset_timeout_notification.h @@ -51,7 +51,8 @@ class OnUIResetTimeoutNotification : public NotificationFromHMI { * * @param message Incoming SmartObject message **/ - OnUIResetTimeoutNotification(const MessageSharedPtr& message, ApplicationManager& application_manager); + OnUIResetTimeoutNotification(const MessageSharedPtr& message, + ApplicationManager& application_manager); /** * @brief OnUIResetTimeoutNotification class destructor diff --git a/src/components/application_manager/include/application_manager/commands/hmi/on_ui_touch_event_notification.h b/src/components/application_manager/include/application_manager/commands/hmi/on_ui_touch_event_notification.h index c9e166d974..9e9384fffe 100644 --- a/src/components/application_manager/include/application_manager/commands/hmi/on_ui_touch_event_notification.h +++ b/src/components/application_manager/include/application_manager/commands/hmi/on_ui_touch_event_notification.h @@ -52,7 +52,8 @@ class OnUITouchEventNotification : public NotificationFromHMI { * * @param message Incoming SmartObject message **/ - OnUITouchEventNotification(const MessageSharedPtr& message, ApplicationManager& application_manager); + OnUITouchEventNotification(const MessageSharedPtr& message, + ApplicationManager& application_manager); /** * @brief OnUITouchEventNotification class destructor diff --git a/src/components/application_manager/include/application_manager/commands/hmi/on_update_device_list.h b/src/components/application_manager/include/application_manager/commands/hmi/on_update_device_list.h index 4c5eb00a1d..ee53445606 100644 --- a/src/components/application_manager/include/application_manager/commands/hmi/on_update_device_list.h +++ b/src/components/application_manager/include/application_manager/commands/hmi/on_update_device_list.h @@ -49,7 +49,8 @@ class OnUpdateDeviceList : public NotificationFromHMI { * * @param message Incoming SmartObject message **/ - OnUpdateDeviceList(const MessageSharedPtr& message, ApplicationManager& application_manager); + OnUpdateDeviceList(const MessageSharedPtr& message, + ApplicationManager& application_manager); /** * @brief OnUpdateDeviceList class destructor diff --git a/src/components/application_manager/include/application_manager/commands/hmi/on_vi_acc_pedal_position_notification.h b/src/components/application_manager/include/application_manager/commands/hmi/on_vi_acc_pedal_position_notification.h index f01b09dae6..9c5a8cd955 100644 --- a/src/components/application_manager/include/application_manager/commands/hmi/on_vi_acc_pedal_position_notification.h +++ b/src/components/application_manager/include/application_manager/commands/hmi/on_vi_acc_pedal_position_notification.h @@ -50,7 +50,8 @@ class OnVIAccPedalPositionNotification : public NotificationFromHMI { * * @param message Incoming SmartObject message **/ - OnVIAccPedalPositionNotification(const MessageSharedPtr& message, ApplicationManager& application_manager); + OnVIAccPedalPositionNotification(const MessageSharedPtr& message, + ApplicationManager& application_manager); /** * @brief OnVIAccPedalPositionNotification class destructor diff --git a/src/components/application_manager/include/application_manager/commands/hmi/on_vi_belt_status_notification.h b/src/components/application_manager/include/application_manager/commands/hmi/on_vi_belt_status_notification.h index 03cd64688d..c4f92269bb 100644 --- a/src/components/application_manager/include/application_manager/commands/hmi/on_vi_belt_status_notification.h +++ b/src/components/application_manager/include/application_manager/commands/hmi/on_vi_belt_status_notification.h @@ -50,7 +50,8 @@ class OnVIBeltStatusNotification : public NotificationFromHMI { * * @param message Incoming SmartObject message **/ - OnVIBeltStatusNotification(const MessageSharedPtr& message, ApplicationManager& application_manager); + OnVIBeltStatusNotification(const MessageSharedPtr& message, + ApplicationManager& application_manager); /** * @brief OnVIBeltStatusNotification class destructor diff --git a/src/components/application_manager/include/application_manager/commands/hmi/on_vi_body_information_notification.h b/src/components/application_manager/include/application_manager/commands/hmi/on_vi_body_information_notification.h index 2f1a36325a..9d9854c50b 100644 --- a/src/components/application_manager/include/application_manager/commands/hmi/on_vi_body_information_notification.h +++ b/src/components/application_manager/include/application_manager/commands/hmi/on_vi_body_information_notification.h @@ -50,7 +50,8 @@ class OnVIBodyInformationNotification : public NotificationFromHMI { * * @param message Incoming SmartObject message **/ - OnVIBodyInformationNotification(const MessageSharedPtr& message, ApplicationManager& application_manager); + OnVIBodyInformationNotification(const MessageSharedPtr& message, + ApplicationManager& application_manager); /** * @brief OnVIBodyInformationNotification class destructor diff --git a/src/components/application_manager/include/application_manager/commands/hmi/on_vi_device_status_notification.h b/src/components/application_manager/include/application_manager/commands/hmi/on_vi_device_status_notification.h index 7e0dda0fcd..c31ee1f209 100644 --- a/src/components/application_manager/include/application_manager/commands/hmi/on_vi_device_status_notification.h +++ b/src/components/application_manager/include/application_manager/commands/hmi/on_vi_device_status_notification.h @@ -50,7 +50,8 @@ class OnVIDeviceStatusNotification : public NotificationFromHMI { * * @param message Incoming SmartObject message **/ - OnVIDeviceStatusNotification(const MessageSharedPtr& message, ApplicationManager& application_manager); + OnVIDeviceStatusNotification(const MessageSharedPtr& message, + ApplicationManager& application_manager); /** * @brief OnVIDeviceStatusNotification class destructor diff --git a/src/components/application_manager/include/application_manager/commands/hmi/on_vi_driver_braking_notification.h b/src/components/application_manager/include/application_manager/commands/hmi/on_vi_driver_braking_notification.h index a3e44140fc..108f02b5a4 100644 --- a/src/components/application_manager/include/application_manager/commands/hmi/on_vi_driver_braking_notification.h +++ b/src/components/application_manager/include/application_manager/commands/hmi/on_vi_driver_braking_notification.h @@ -50,7 +50,8 @@ class OnVIDriverBrakingNotification : public NotificationFromHMI { * * @param message Incoming SmartObject message **/ - OnVIDriverBrakingNotification(const MessageSharedPtr& message, ApplicationManager& application_manager); + OnVIDriverBrakingNotification(const MessageSharedPtr& message, + ApplicationManager& application_manager); /** * @brief OnVIDriverBrakingNotification class destructor diff --git a/src/components/application_manager/include/application_manager/commands/hmi/on_vi_engine_torque_notification.h b/src/components/application_manager/include/application_manager/commands/hmi/on_vi_engine_torque_notification.h index c8f26678d9..bbd13963aa 100644 --- a/src/components/application_manager/include/application_manager/commands/hmi/on_vi_engine_torque_notification.h +++ b/src/components/application_manager/include/application_manager/commands/hmi/on_vi_engine_torque_notification.h @@ -50,7 +50,8 @@ class OnVIEngineTorqueNotification : public NotificationFromHMI { * * @param message Incoming SmartObject message **/ - OnVIEngineTorqueNotification(const MessageSharedPtr& message, ApplicationManager& application_manager); + OnVIEngineTorqueNotification(const MessageSharedPtr& message, + ApplicationManager& application_manager); /** * @brief OnVIEngineTorqueNotification class destructor diff --git a/src/components/application_manager/include/application_manager/commands/hmi/on_vi_external_temperature_notification.h b/src/components/application_manager/include/application_manager/commands/hmi/on_vi_external_temperature_notification.h index 5c5adbede7..b996febacf 100644 --- a/src/components/application_manager/include/application_manager/commands/hmi/on_vi_external_temperature_notification.h +++ b/src/components/application_manager/include/application_manager/commands/hmi/on_vi_external_temperature_notification.h @@ -50,7 +50,8 @@ class OnVIExternalTemperatureNotification : public NotificationFromHMI { * * @param message Incoming SmartObject message **/ - OnVIExternalTemperatureNotification(const MessageSharedPtr& message, ApplicationManager& application_manager); + OnVIExternalTemperatureNotification(const MessageSharedPtr& message, + ApplicationManager& application_manager); /** * @brief OnVIExternalTemperatureNotification class destructor diff --git a/src/components/application_manager/include/application_manager/commands/hmi/on_vi_fuel_level_notification.h b/src/components/application_manager/include/application_manager/commands/hmi/on_vi_fuel_level_notification.h index 6bd9153131..9c30b6c32c 100644 --- a/src/components/application_manager/include/application_manager/commands/hmi/on_vi_fuel_level_notification.h +++ b/src/components/application_manager/include/application_manager/commands/hmi/on_vi_fuel_level_notification.h @@ -50,7 +50,8 @@ class OnVIFuelLevelNotification : public NotificationFromHMI { * * @param message Incoming SmartObject message **/ - OnVIFuelLevelNotification(const MessageSharedPtr& message, ApplicationManager& application_manager); + OnVIFuelLevelNotification(const MessageSharedPtr& message, + ApplicationManager& application_manager); /** * @brief OnVIFuelLevelNotification class destructor diff --git a/src/components/application_manager/include/application_manager/commands/hmi/on_vi_fuel_level_state_notification.h b/src/components/application_manager/include/application_manager/commands/hmi/on_vi_fuel_level_state_notification.h index e511e9ed2f..53b6ea209f 100644 --- a/src/components/application_manager/include/application_manager/commands/hmi/on_vi_fuel_level_state_notification.h +++ b/src/components/application_manager/include/application_manager/commands/hmi/on_vi_fuel_level_state_notification.h @@ -50,7 +50,8 @@ class OnVIFuelLevelStateNotification : public NotificationFromHMI { * * @param message Incoming SmartObject message **/ - OnVIFuelLevelStateNotification(const MessageSharedPtr& message, ApplicationManager& application_manager); + OnVIFuelLevelStateNotification(const MessageSharedPtr& message, + ApplicationManager& application_manager); /** * @brief OnVIFuelLevelStateNotification class destructor diff --git a/src/components/application_manager/include/application_manager/commands/hmi/on_vi_gps_data_notification.h b/src/components/application_manager/include/application_manager/commands/hmi/on_vi_gps_data_notification.h index b3c12ca349..579344b538 100644 --- a/src/components/application_manager/include/application_manager/commands/hmi/on_vi_gps_data_notification.h +++ b/src/components/application_manager/include/application_manager/commands/hmi/on_vi_gps_data_notification.h @@ -50,7 +50,8 @@ class OnVIGpsDataNotification : public NotificationFromHMI { * * @param message Incoming SmartObject message **/ - OnVIGpsDataNotification(const MessageSharedPtr& message, ApplicationManager& application_manager); + OnVIGpsDataNotification(const MessageSharedPtr& message, + ApplicationManager& application_manager); /** * @brief OnVIGpsDataNotification class destructor diff --git a/src/components/application_manager/include/application_manager/commands/hmi/on_vi_head_lamp_status_notification.h b/src/components/application_manager/include/application_manager/commands/hmi/on_vi_head_lamp_status_notification.h index 52230a9523..5fd3be85a4 100644 --- a/src/components/application_manager/include/application_manager/commands/hmi/on_vi_head_lamp_status_notification.h +++ b/src/components/application_manager/include/application_manager/commands/hmi/on_vi_head_lamp_status_notification.h @@ -50,7 +50,8 @@ class OnVIHeadLampStatusNotification : public NotificationFromHMI { * * @param message Incoming SmartObject message **/ - OnVIHeadLampStatusNotification(const MessageSharedPtr& message, ApplicationManager& application_manager); + OnVIHeadLampStatusNotification(const MessageSharedPtr& message, + ApplicationManager& application_manager); /** * @brief OnVIHeadLampStatusNotification class destructor diff --git a/src/components/application_manager/include/application_manager/commands/hmi/on_vi_instant_fuel_consumption_notification.h b/src/components/application_manager/include/application_manager/commands/hmi/on_vi_instant_fuel_consumption_notification.h index 6035dfc2c3..ee82b1397f 100644 --- a/src/components/application_manager/include/application_manager/commands/hmi/on_vi_instant_fuel_consumption_notification.h +++ b/src/components/application_manager/include/application_manager/commands/hmi/on_vi_instant_fuel_consumption_notification.h @@ -50,7 +50,8 @@ class OnVIInstantFuelConsumptionNotification : public NotificationFromHMI { * * @param message Incoming SmartObject message **/ - OnVIInstantFuelConsumptionNotification(const MessageSharedPtr& message, ApplicationManager& application_manager); + OnVIInstantFuelConsumptionNotification( + const MessageSharedPtr& message, ApplicationManager& application_manager); /** * @brief OnVIInstantFuelConsumptionNotification class destructor diff --git a/src/components/application_manager/include/application_manager/commands/hmi/on_vi_my_key_notification.h b/src/components/application_manager/include/application_manager/commands/hmi/on_vi_my_key_notification.h index dca83b004c..364e42081c 100644 --- a/src/components/application_manager/include/application_manager/commands/hmi/on_vi_my_key_notification.h +++ b/src/components/application_manager/include/application_manager/commands/hmi/on_vi_my_key_notification.h @@ -50,7 +50,8 @@ class OnVIMyKeyNotification : public NotificationFromHMI { * * @param message Incoming SmartObject message **/ - OnVIMyKeyNotification(const MessageSharedPtr& message, ApplicationManager& application_manager); + OnVIMyKeyNotification(const MessageSharedPtr& message, + ApplicationManager& application_manager); /** * @brief OnVIMyKeyNotification class destructor diff --git a/src/components/application_manager/include/application_manager/commands/hmi/on_vi_odometer_notification.h b/src/components/application_manager/include/application_manager/commands/hmi/on_vi_odometer_notification.h index ff179776de..7d93530f04 100644 --- a/src/components/application_manager/include/application_manager/commands/hmi/on_vi_odometer_notification.h +++ b/src/components/application_manager/include/application_manager/commands/hmi/on_vi_odometer_notification.h @@ -50,7 +50,8 @@ class OnVIOdometerNotification : public NotificationFromHMI { * * @param message Incoming SmartObject message **/ - OnVIOdometerNotification(const MessageSharedPtr& message, ApplicationManager& application_manager); + OnVIOdometerNotification(const MessageSharedPtr& message, + ApplicationManager& application_manager); /** * @brief OnVIOdometerNotification class destructor diff --git a/src/components/application_manager/include/application_manager/commands/hmi/on_vi_prndl_notification.h b/src/components/application_manager/include/application_manager/commands/hmi/on_vi_prndl_notification.h index eff04a6f14..c09220d2a6 100644 --- a/src/components/application_manager/include/application_manager/commands/hmi/on_vi_prndl_notification.h +++ b/src/components/application_manager/include/application_manager/commands/hmi/on_vi_prndl_notification.h @@ -50,7 +50,8 @@ class OnVIPrndlNotification : public NotificationFromHMI { * * @param message Incoming SmartObject message **/ - OnVIPrndlNotification(const MessageSharedPtr& message, ApplicationManager& application_manager); + OnVIPrndlNotification(const MessageSharedPtr& message, + ApplicationManager& application_manager); /** * @brief OnVIPrndlNotification class destructor diff --git a/src/components/application_manager/include/application_manager/commands/hmi/on_vi_rpm_notification.h b/src/components/application_manager/include/application_manager/commands/hmi/on_vi_rpm_notification.h index fae86d91ad..d05e1221df 100644 --- a/src/components/application_manager/include/application_manager/commands/hmi/on_vi_rpm_notification.h +++ b/src/components/application_manager/include/application_manager/commands/hmi/on_vi_rpm_notification.h @@ -50,7 +50,8 @@ class OnVIRpmNotification : public NotificationFromHMI { * * @param message Incoming SmartObject message **/ - OnVIRpmNotification(const MessageSharedPtr& message, ApplicationManager& application_manager); + OnVIRpmNotification(const MessageSharedPtr& message, + ApplicationManager& application_manager); /** * @brief OnVIRpmNotification class destructor diff --git a/src/components/application_manager/include/application_manager/commands/hmi/on_vi_speed_notification.h b/src/components/application_manager/include/application_manager/commands/hmi/on_vi_speed_notification.h index fd01061bce..b1908cde28 100644 --- a/src/components/application_manager/include/application_manager/commands/hmi/on_vi_speed_notification.h +++ b/src/components/application_manager/include/application_manager/commands/hmi/on_vi_speed_notification.h @@ -50,7 +50,8 @@ class OnVISpeedNotification : public NotificationFromHMI { * * @param message Incoming SmartObject message **/ - OnVISpeedNotification(const MessageSharedPtr& message, ApplicationManager& application_manager); + OnVISpeedNotification(const MessageSharedPtr& message, + ApplicationManager& application_manager); /** * @brief OnVISpeedNotification class destructor diff --git a/src/components/application_manager/include/application_manager/commands/hmi/on_vi_steering_wheel_angle_notification.h b/src/components/application_manager/include/application_manager/commands/hmi/on_vi_steering_wheel_angle_notification.h index 5ea75f9467..28f78ac4d5 100644 --- a/src/components/application_manager/include/application_manager/commands/hmi/on_vi_steering_wheel_angle_notification.h +++ b/src/components/application_manager/include/application_manager/commands/hmi/on_vi_steering_wheel_angle_notification.h @@ -50,7 +50,8 @@ class OnVISteeringWheelAngleNotification : public NotificationFromHMI { * * @param message Incoming SmartObject message **/ - OnVISteeringWheelAngleNotification(const MessageSharedPtr& message, ApplicationManager& application_manager); + OnVISteeringWheelAngleNotification(const MessageSharedPtr& message, + ApplicationManager& application_manager); /** * @brief OnVISteeringWheelAngleNotification class destructor diff --git a/src/components/application_manager/include/application_manager/commands/hmi/on_vi_tire_pressure_notification.h b/src/components/application_manager/include/application_manager/commands/hmi/on_vi_tire_pressure_notification.h index f371ed61ba..eef4f0e4a4 100644 --- a/src/components/application_manager/include/application_manager/commands/hmi/on_vi_tire_pressure_notification.h +++ b/src/components/application_manager/include/application_manager/commands/hmi/on_vi_tire_pressure_notification.h @@ -50,7 +50,8 @@ class OnVITirePressureNotification : public NotificationFromHMI { * * @param message Incoming SmartObject message **/ - OnVITirePressureNotification(const MessageSharedPtr& message, ApplicationManager& application_manager); + OnVITirePressureNotification(const MessageSharedPtr& message, + ApplicationManager& application_manager); /** * @brief OnVITirePressureNotification class destructor diff --git a/src/components/application_manager/include/application_manager/commands/hmi/on_vi_vehicle_data_notification.h b/src/components/application_manager/include/application_manager/commands/hmi/on_vi_vehicle_data_notification.h index bf406d346f..2422c47813 100644 --- a/src/components/application_manager/include/application_manager/commands/hmi/on_vi_vehicle_data_notification.h +++ b/src/components/application_manager/include/application_manager/commands/hmi/on_vi_vehicle_data_notification.h @@ -51,7 +51,8 @@ class OnVIVehicleDataNotification : public NotificationFromHMI { * * @param message Incoming SmartObject message **/ - OnVIVehicleDataNotification(const MessageSharedPtr& message, ApplicationManager& application_manager); + OnVIVehicleDataNotification(const MessageSharedPtr& message, + ApplicationManager& application_manager); /** * @brief OnVIVehicleDataNotification class destructor diff --git a/src/components/application_manager/include/application_manager/commands/hmi/on_vi_vin_notification.h b/src/components/application_manager/include/application_manager/commands/hmi/on_vi_vin_notification.h index 9b22f95167..4ea04fbb0d 100644 --- a/src/components/application_manager/include/application_manager/commands/hmi/on_vi_vin_notification.h +++ b/src/components/application_manager/include/application_manager/commands/hmi/on_vi_vin_notification.h @@ -50,7 +50,8 @@ class OnVIVinNotification : public NotificationFromHMI { * * @param message Incoming SmartObject message **/ - OnVIVinNotification(const MessageSharedPtr& message, ApplicationManager& application_manager); + OnVIVinNotification(const MessageSharedPtr& message, + ApplicationManager& application_manager); /** * @brief OnVIVinNotification class destructor diff --git a/src/components/application_manager/include/application_manager/commands/hmi/on_vi_wiper_status_notification.h b/src/components/application_manager/include/application_manager/commands/hmi/on_vi_wiper_status_notification.h index 08e279f6b7..2b57ef1dd3 100644 --- a/src/components/application_manager/include/application_manager/commands/hmi/on_vi_wiper_status_notification.h +++ b/src/components/application_manager/include/application_manager/commands/hmi/on_vi_wiper_status_notification.h @@ -50,7 +50,8 @@ class OnVIWiperStatusNotification : public NotificationFromHMI { * * @param message Incoming SmartObject message **/ - OnVIWiperStatusNotification(const MessageSharedPtr& message, ApplicationManager& application_manager); + OnVIWiperStatusNotification(const MessageSharedPtr& message, + ApplicationManager& application_manager); /** * @brief OnVIWiperStatusNotification class destructor diff --git a/src/components/application_manager/include/application_manager/commands/hmi/on_video_data_streaming_notification.h b/src/components/application_manager/include/application_manager/commands/hmi/on_video_data_streaming_notification.h index b5cf7a7757..02c65df4e9 100644 --- a/src/components/application_manager/include/application_manager/commands/hmi/on_video_data_streaming_notification.h +++ b/src/components/application_manager/include/application_manager/commands/hmi/on_video_data_streaming_notification.h @@ -43,26 +43,27 @@ namespace commands { * @brief OnVideoDataStreamingNotification command class **/ class OnVideoDataStreamingNotification : public NotificationToHMI { - public: - /** - * @brief OnVideoDataStreamingNotification class constructor - * - * @param message Incoming SmartObject message - **/ - OnVideoDataStreamingNotification(const MessageSharedPtr& message, ApplicationManager& application_manager); + public: + /** + * @brief OnVideoDataStreamingNotification class constructor + * + * @param message Incoming SmartObject message + **/ + OnVideoDataStreamingNotification(const MessageSharedPtr& message, + ApplicationManager& application_manager); - /** - * @brief OnVideoDataStreamingNotification class destructor - **/ - virtual ~OnVideoDataStreamingNotification(); + /** + * @brief OnVideoDataStreamingNotification class destructor + **/ + virtual ~OnVideoDataStreamingNotification(); - /** - * @brief Execute command - **/ - virtual void Run(); + /** + * @brief Execute command + **/ + virtual void Run(); - private: - DISALLOW_COPY_AND_ASSIGN(OnVideoDataStreamingNotification); + private: + DISALLOW_COPY_AND_ASSIGN(OnVideoDataStreamingNotification); }; } // namespace commands @@ -70,4 +71,3 @@ class OnVideoDataStreamingNotification : public NotificationToHMI { } // namespace application_manager #endif // SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_HMI_ON_VIDEO_DATA_STREAMING_NOTIFICATION_H_ - diff --git a/src/components/application_manager/include/application_manager/commands/hmi/on_vr_command_notification.h b/src/components/application_manager/include/application_manager/commands/hmi/on_vr_command_notification.h index 709d13a7cc..fa85ba8468 100644 --- a/src/components/application_manager/include/application_manager/commands/hmi/on_vr_command_notification.h +++ b/src/components/application_manager/include/application_manager/commands/hmi/on_vr_command_notification.h @@ -50,7 +50,8 @@ class OnVRCommandNotification : public NotificationFromHMI { * * @param message Incoming SmartObject message **/ - OnVRCommandNotification(const MessageSharedPtr& message, ApplicationManager& application_manager); + OnVRCommandNotification(const MessageSharedPtr& message, + ApplicationManager& application_manager); /** * @brief OnVRCommandNotification class destructor @@ -63,7 +64,6 @@ class OnVRCommandNotification : public NotificationFromHMI { virtual void Run(); private: - DISALLOW_COPY_AND_ASSIGN(OnVRCommandNotification); }; diff --git a/src/components/application_manager/include/application_manager/commands/hmi/on_vr_language_change_notification.h b/src/components/application_manager/include/application_manager/commands/hmi/on_vr_language_change_notification.h index e078a8fa7e..d0f86e5f83 100644 --- a/src/components/application_manager/include/application_manager/commands/hmi/on_vr_language_change_notification.h +++ b/src/components/application_manager/include/application_manager/commands/hmi/on_vr_language_change_notification.h @@ -49,7 +49,8 @@ class OnVRLanguageChangeNotification : public NotificationFromHMI { * * @param message Incoming SmartObject message **/ - OnVRLanguageChangeNotification(const MessageSharedPtr& message, ApplicationManager& application_manager); + OnVRLanguageChangeNotification(const MessageSharedPtr& message, + ApplicationManager& application_manager); /** * @brief OnVRLanguageChangeNotification class destructor diff --git a/src/components/application_manager/include/application_manager/commands/hmi/on_vr_started_notification.h b/src/components/application_manager/include/application_manager/commands/hmi/on_vr_started_notification.h index 6d5fa93e17..f142fcc25c 100644 --- a/src/components/application_manager/include/application_manager/commands/hmi/on_vr_started_notification.h +++ b/src/components/application_manager/include/application_manager/commands/hmi/on_vr_started_notification.h @@ -49,7 +49,8 @@ class OnVRStartedNotification : public NotificationFromHMI { * * @param message Incoming SmartObject message **/ - OnVRStartedNotification(const MessageSharedPtr& message, ApplicationManager& application_manager); + OnVRStartedNotification(const MessageSharedPtr& message, + ApplicationManager& application_manager); /** * @brief OnVRStartedNotification class destructor diff --git a/src/components/application_manager/include/application_manager/commands/hmi/on_vr_stopped_notification.h b/src/components/application_manager/include/application_manager/commands/hmi/on_vr_stopped_notification.h index 956156e964..d1dbcc91cd 100644 --- a/src/components/application_manager/include/application_manager/commands/hmi/on_vr_stopped_notification.h +++ b/src/components/application_manager/include/application_manager/commands/hmi/on_vr_stopped_notification.h @@ -49,7 +49,8 @@ class OnVRStoppedNotification : public NotificationFromHMI { * * @param message Incoming SmartObject message **/ - OnVRStoppedNotification(const MessageSharedPtr& message, ApplicationManager& application_manager); + OnVRStoppedNotification(const MessageSharedPtr& message, + ApplicationManager& application_manager); /** * @brief OnVRStoppedNotification class destructor diff --git a/src/components/application_manager/include/application_manager/commands/hmi/request_from_hmi.h b/src/components/application_manager/include/application_manager/commands/hmi/request_from_hmi.h index bd60941a3e..c435c41c47 100644 --- a/src/components/application_manager/include/application_manager/commands/hmi/request_from_hmi.h +++ b/src/components/application_manager/include/application_manager/commands/hmi/request_from_hmi.h @@ -1,81 +1,82 @@ - /* - Copyright (c) 2014, Ford Motor Company - All rights reserved. - - Redistribution and use in source and binary forms, with or without - modification, are permitted provided that the following conditions are met: - - Redistributions of source code must retain the above copyright notice, this - list of conditions and the following disclaimer. - - Redistributions in binary form must reproduce the above copyright notice, - this list of conditions and the following - disclaimer in the documentation and/or other materials provided with the - distribution. - - Neither the name of the Ford Motor Company nor the names of its contributors - may be used to endorse or promote products derived from this software - without specific prior written permission. - - THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" - AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE - IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE - ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE - LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR - CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF - SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS - INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN - CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) - ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - POSSIBILITY OF SUCH DAMAGE. +/* + Copyright (c) 2014, Ford Motor Company + All rights reserved. + + Redistribution and use in source and binary forms, with or without + modification, are permitted provided that the following conditions are met: + + Redistributions of source code must retain the above copyright notice, this + list of conditions and the following disclaimer. + + Redistributions in binary form must reproduce the above copyright notice, + this list of conditions and the following + disclaimer in the documentation and/or other materials provided with the + distribution. + + Neither the name of the Ford Motor Company nor the names of its contributors + may be used to endorse or promote products derived from this software + without specific prior written permission. + + THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" + AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE + LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR + CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF + SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS + INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN + CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) + ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + POSSIBILITY OF SUCH DAMAGE. + */ + +#ifndef SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_HMI_REQUEST_FROM_HMI_H_ +#define SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_HMI_REQUEST_FROM_HMI_H_ + +#include "application_manager/commands/command_impl.h" +#include "interfaces/HMI_API.h" + +namespace NsSmartDeviceLink { +namespace NsSmartObjects { +class SmartObject; +} +} + +namespace application_manager { + +namespace commands { + +namespace NsSmart = NsSmartDeviceLink::NsSmartObjects; + +class RequestFromHMI : public CommandImpl, public event_engine::EventObserver { + public: + RequestFromHMI(const MessageSharedPtr& message, + ApplicationManager& application_manager); + virtual ~RequestFromHMI(); + virtual bool Init(); + virtual bool CleanUp(); + virtual void Run(); + virtual void on_event(const event_engine::Event& event); + /** + * @brief SendResponse allows to send response to hmi + * @param correlation_id the correlation id for the rfesponse. + * @param function_id the function id for which response will be sent + * @param result_code the result code. */ + void SendResponse(const bool success, + const uint32_t correlation_id, + const hmi_apis::FunctionID::eType function_id, + const hmi_apis::Common_Result::eType result_code); + + void FillCommonParametersOfSO(smart_objects::SmartObject* message, + uint32_t correlation_id, + hmi_apis::FunctionID::eType function_id); + + private: + DISALLOW_COPY_AND_ASSIGN(RequestFromHMI); +}; + +} // namespace commands +} // namespace application_manager - #ifndef SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_HMI_REQUEST_FROM_HMI_H_ - #define SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_HMI_REQUEST_FROM_HMI_H_ - - #include "application_manager/commands/command_impl.h" - #include "interfaces/HMI_API.h" - - namespace NsSmartDeviceLink { - namespace NsSmartObjects { - class SmartObject; - } - } - - namespace application_manager { - - namespace commands { - - namespace NsSmart = NsSmartDeviceLink::NsSmartObjects; - - class RequestFromHMI : public CommandImpl, public event_engine::EventObserver { - public: - RequestFromHMI(const MessageSharedPtr& message, - ApplicationManager& application_manager); - virtual ~RequestFromHMI(); - virtual bool Init(); - virtual bool CleanUp(); - virtual void Run(); - virtual void on_event(const event_engine::Event& event); - /** - * @brief SendResponse allows to send response to hmi - * @param correlation_id the correlation id for the rfesponse. - * @param function_id the function id for which response will be sent - * @param result_code the result code. - */ - void SendResponse(const bool success, - const uint32_t correlation_id, - const hmi_apis::FunctionID::eType function_id, - const hmi_apis::Common_Result::eType result_code); - - void FillCommonParametersOfSO(smart_objects::SmartObject* message, - uint32_t correlation_id, - hmi_apis::FunctionID::eType function_id); - private: - DISALLOW_COPY_AND_ASSIGN(RequestFromHMI); - }; - - } // namespace commands - } // namespace application_manager - - #endif // SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_HMI_REQUEST_FROM_HMI_H_ +#endif // SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_HMI_REQUEST_FROM_HMI_H_ diff --git a/src/components/application_manager/include/application_manager/commands/hmi/request_to_hmi.h b/src/components/application_manager/include/application_manager/commands/hmi/request_to_hmi.h index 55d49cbbd6..e512279e79 100644 --- a/src/components/application_manager/include/application_manager/commands/hmi/request_to_hmi.h +++ b/src/components/application_manager/include/application_manager/commands/hmi/request_to_hmi.h @@ -40,11 +40,10 @@ namespace application_manager { namespace commands { - class RequestToHMI : public CommandImpl { public: RequestToHMI(const MessageSharedPtr& message, - ApplicationManager& application_manager); + ApplicationManager& application_manager); virtual ~RequestToHMI(); virtual bool Init(); virtual bool CleanUp(); diff --git a/src/components/application_manager/include/application_manager/commands/hmi/response_from_hmi.h b/src/components/application_manager/include/application_manager/commands/hmi/response_from_hmi.h index a7d2d3551d..a5d41252f5 100644 --- a/src/components/application_manager/include/application_manager/commands/hmi/response_from_hmi.h +++ b/src/components/application_manager/include/application_manager/commands/hmi/response_from_hmi.h @@ -52,12 +52,13 @@ namespace smart_objects = NsSmartDeviceLink::NsSmartObjects; class ResponseFromHMI : public CommandImpl { public: ResponseFromHMI(const MessageSharedPtr& message, - ApplicationManager& application_manager); + ApplicationManager& application_manager); virtual ~ResponseFromHMI(); virtual bool Init(); virtual bool CleanUp(); virtual void Run(); - void SendResponseToMobile(const MessageSharedPtr& message, ApplicationManager& application_manager); + void SendResponseToMobile(const MessageSharedPtr& message, + ApplicationManager& application_manager); /* * @brief Creates HMI request diff --git a/src/components/application_manager/include/application_manager/commands/hmi/response_to_hmi.h b/src/components/application_manager/include/application_manager/commands/hmi/response_to_hmi.h index 665e6b74e6..f00e57ff3a 100644 --- a/src/components/application_manager/include/application_manager/commands/hmi/response_to_hmi.h +++ b/src/components/application_manager/include/application_manager/commands/hmi/response_to_hmi.h @@ -52,7 +52,7 @@ namespace NsSmart = NsSmartDeviceLink::NsSmartObjects; class ResponseToHMI : public CommandImpl { public: ResponseToHMI(const MessageSharedPtr& message, - ApplicationManager& application_manager); + ApplicationManager& application_manager); virtual ~ResponseToHMI(); virtual bool Init(); virtual bool CleanUp(); diff --git a/src/components/application_manager/include/application_manager/commands/hmi/sdl_activate_app_request.h b/src/components/application_manager/include/application_manager/commands/hmi/sdl_activate_app_request.h index 16f1fa9284..ce86ea2df3 100644 --- a/src/components/application_manager/include/application_manager/commands/hmi/sdl_activate_app_request.h +++ b/src/components/application_manager/include/application_manager/commands/hmi/sdl_activate_app_request.h @@ -40,48 +40,51 @@ namespace application_manager { namespace commands { - typedef std::pair<ApplicationSharedPtr, std::vector<ApplicationSharedPtr> > DevicesApps; +typedef std::pair<ApplicationSharedPtr, std::vector<ApplicationSharedPtr> > + DevicesApps; /** * @brief SDLActivateAppRequest command class **/ class SDLActivateAppRequest : public RequestFromHMI { - public: - /** - * @brief SDLActivateAppRequest class constructor - * - * @param message Incoming SmartObject message - **/ - SDLActivateAppRequest(const MessageSharedPtr& message, ApplicationManager& application_manager); + public: + /** + * @brief SDLActivateAppRequest class constructor + * + * @param message Incoming SmartObject message + **/ + SDLActivateAppRequest(const MessageSharedPtr& message, + ApplicationManager& application_manager); - /** - * @brief SDLActivateAppRequest class destructor - **/ - virtual ~SDLActivateAppRequest(); + /** + * @brief SDLActivateAppRequest class destructor + **/ + virtual ~SDLActivateAppRequest(); - /** - * @brief Execute command - **/ - virtual void Run(); + /** + * @brief Execute command + **/ + virtual void Run(); - /** - * @brief onTimeOut allows to process case when timeout has appeared - * during request execution. - */ - virtual void onTimeOut(); + /** + * @brief onTimeOut allows to process case when timeout has appeared + * during request execution. + */ + virtual void onTimeOut(); - /** - * @brief on_event allows to handle events - * - * @param event event type that current request subscribed on. - */ - virtual void on_event(const event_engine::Event& event); - private: - uint32_t app_id() const; - uint32_t hmi_app_id(const smart_objects::SmartObject& so) const; + /** + * @brief on_event allows to handle events + * + * @param event event type that current request subscribed on. + */ + virtual void on_event(const event_engine::Event& event); - DevicesApps FindAllAppOnParticularDevice( - const connection_handler::DeviceHandle handle); - DISALLOW_COPY_AND_ASSIGN(SDLActivateAppRequest); + private: + uint32_t app_id() const; + uint32_t hmi_app_id(const smart_objects::SmartObject& so) const; + + DevicesApps FindAllAppOnParticularDevice( + const connection_handler::DeviceHandle handle); + DISALLOW_COPY_AND_ASSIGN(SDLActivateAppRequest); }; } // namespace commands diff --git a/src/components/application_manager/include/application_manager/commands/hmi/sdl_activate_app_response.h b/src/components/application_manager/include/application_manager/commands/hmi/sdl_activate_app_response.h index 62c9fc0843..f35a295581 100644 --- a/src/components/application_manager/include/application_manager/commands/hmi/sdl_activate_app_response.h +++ b/src/components/application_manager/include/application_manager/commands/hmi/sdl_activate_app_response.h @@ -43,26 +43,27 @@ namespace commands { * @brief SDLActivateAppResponse command class **/ class SDLActivateAppResponse : public ResponseToHMI { - public: - /** - * @brief SDLActivateAppResponse class constructor - * - * @param message Incoming SmartObject message - **/ - SDLActivateAppResponse(const MessageSharedPtr& message, ApplicationManager& application_manager); + public: + /** + * @brief SDLActivateAppResponse class constructor + * + * @param message Incoming SmartObject message + **/ + SDLActivateAppResponse(const MessageSharedPtr& message, + ApplicationManager& application_manager); - /** - * @brief SDLActivateAppResponse class destructor - **/ - virtual ~SDLActivateAppResponse(); + /** + * @brief SDLActivateAppResponse class destructor + **/ + virtual ~SDLActivateAppResponse(); - /** - * @brief Execute command - **/ - virtual void Run(); + /** + * @brief Execute command + **/ + virtual void Run(); - private: - DISALLOW_COPY_AND_ASSIGN(SDLActivateAppResponse); + private: + DISALLOW_COPY_AND_ASSIGN(SDLActivateAppResponse); }; } // namespace commands diff --git a/src/components/application_manager/include/application_manager/commands/hmi/sdl_get_list_of_permissions_request.h b/src/components/application_manager/include/application_manager/commands/hmi/sdl_get_list_of_permissions_request.h index 9625087d33..4f8d598322 100644 --- a/src/components/application_manager/include/application_manager/commands/hmi/sdl_get_list_of_permissions_request.h +++ b/src/components/application_manager/include/application_manager/commands/hmi/sdl_get_list_of_permissions_request.h @@ -43,26 +43,27 @@ namespace commands { * @brief SDLGetListOfPermissionsRequest command class **/ class SDLGetListOfPermissionsRequest : public RequestFromHMI { - public: - /** - * @brief SDLGetListOfPermissionsRequest class constructor - * - * @param message Incoming SmartObject message - **/ - SDLGetListOfPermissionsRequest(const MessageSharedPtr& message, ApplicationManager& application_manager); + public: + /** + * @brief SDLGetListOfPermissionsRequest class constructor + * + * @param message Incoming SmartObject message + **/ + SDLGetListOfPermissionsRequest(const MessageSharedPtr& message, + ApplicationManager& application_manager); - /** - * @brief SDLGetListOfPermissionsRequest class destructor - **/ - virtual ~SDLGetListOfPermissionsRequest(); + /** + * @brief SDLGetListOfPermissionsRequest class destructor + **/ + virtual ~SDLGetListOfPermissionsRequest(); - /** - * @brief Execute command - **/ - virtual void Run(); + /** + * @brief Execute command + **/ + virtual void Run(); - private: - DISALLOW_COPY_AND_ASSIGN(SDLGetListOfPermissionsRequest); + private: + DISALLOW_COPY_AND_ASSIGN(SDLGetListOfPermissionsRequest); }; } // namespace commands diff --git a/src/components/application_manager/include/application_manager/commands/hmi/sdl_get_list_of_permissions_response.h b/src/components/application_manager/include/application_manager/commands/hmi/sdl_get_list_of_permissions_response.h index 6963bad639..e00e613e70 100644 --- a/src/components/application_manager/include/application_manager/commands/hmi/sdl_get_list_of_permissions_response.h +++ b/src/components/application_manager/include/application_manager/commands/hmi/sdl_get_list_of_permissions_response.h @@ -43,26 +43,27 @@ namespace commands { * @brief SDLGetListOfPermissionsResponse command class **/ class SDLGetListOfPermissionsResponse : public ResponseToHMI { - public: - /** - * @brief SDLGetListOfPermissionsResponse class constructor - * - * @param message Incoming SmartObject message - **/ - SDLGetListOfPermissionsResponse(const MessageSharedPtr& message, ApplicationManager& application_manager); + public: + /** + * @brief SDLGetListOfPermissionsResponse class constructor + * + * @param message Incoming SmartObject message + **/ + SDLGetListOfPermissionsResponse(const MessageSharedPtr& message, + ApplicationManager& application_manager); - /** - * @brief SDLGetListOfPermissionsResponse class destructor - **/ - virtual ~SDLGetListOfPermissionsResponse(); + /** + * @brief SDLGetListOfPermissionsResponse class destructor + **/ + virtual ~SDLGetListOfPermissionsResponse(); - /** - * @brief Execute command - **/ - virtual void Run(); + /** + * @brief Execute command + **/ + virtual void Run(); - private: - DISALLOW_COPY_AND_ASSIGN(SDLGetListOfPermissionsResponse); + private: + DISALLOW_COPY_AND_ASSIGN(SDLGetListOfPermissionsResponse); }; } // namespace commands diff --git a/src/components/application_manager/include/application_manager/commands/hmi/sdl_get_status_update_request.h b/src/components/application_manager/include/application_manager/commands/hmi/sdl_get_status_update_request.h index 6ec05c4cdd..cfc0d55b54 100644 --- a/src/components/application_manager/include/application_manager/commands/hmi/sdl_get_status_update_request.h +++ b/src/components/application_manager/include/application_manager/commands/hmi/sdl_get_status_update_request.h @@ -43,26 +43,27 @@ namespace commands { * @brief SDLGetStatusUpdateRequest command class **/ class SDLGetStatusUpdateRequest : public RequestFromHMI { - public: - /** - * @brief SDLGetStatusUpdateRequest class constructor - * - * @param message Incoming SmartObject message - **/ - SDLGetStatusUpdateRequest(const MessageSharedPtr& message, ApplicationManager& application_manager); + public: + /** + * @brief SDLGetStatusUpdateRequest class constructor + * + * @param message Incoming SmartObject message + **/ + SDLGetStatusUpdateRequest(const MessageSharedPtr& message, + ApplicationManager& application_manager); - /** - * @brief SDLGetStatusUpdateRequest class destructor - **/ - virtual ~SDLGetStatusUpdateRequest(); + /** + * @brief SDLGetStatusUpdateRequest class destructor + **/ + virtual ~SDLGetStatusUpdateRequest(); - /** - * @brief Execute command - **/ - virtual void Run(); + /** + * @brief Execute command + **/ + virtual void Run(); - private: - DISALLOW_COPY_AND_ASSIGN(SDLGetStatusUpdateRequest); + private: + DISALLOW_COPY_AND_ASSIGN(SDLGetStatusUpdateRequest); }; } // namespace commands diff --git a/src/components/application_manager/include/application_manager/commands/hmi/sdl_get_status_update_response.h b/src/components/application_manager/include/application_manager/commands/hmi/sdl_get_status_update_response.h index af5a36fc39..c25008bd90 100644 --- a/src/components/application_manager/include/application_manager/commands/hmi/sdl_get_status_update_response.h +++ b/src/components/application_manager/include/application_manager/commands/hmi/sdl_get_status_update_response.h @@ -43,26 +43,27 @@ namespace commands { * @brief SDLGetStatusUpdateResponse command class **/ class SDLGetStatusUpdateResponse : public ResponseToHMI { - public: - /** - * @brief SDLGetStatusUpdateResponse class constructor - * - * @param message Incoming SmartObject message - **/ - SDLGetStatusUpdateResponse(const MessageSharedPtr& message, ApplicationManager& application_manager); + public: + /** + * @brief SDLGetStatusUpdateResponse class constructor + * + * @param message Incoming SmartObject message + **/ + SDLGetStatusUpdateResponse(const MessageSharedPtr& message, + ApplicationManager& application_manager); - /** - * @brief SDLGetStatusUpdateResponse class destructor - **/ - virtual ~SDLGetStatusUpdateResponse(); + /** + * @brief SDLGetStatusUpdateResponse class destructor + **/ + virtual ~SDLGetStatusUpdateResponse(); - /** - * @brief Execute command - **/ - virtual void Run(); + /** + * @brief Execute command + **/ + virtual void Run(); - private: - DISALLOW_COPY_AND_ASSIGN(SDLGetStatusUpdateResponse); + private: + DISALLOW_COPY_AND_ASSIGN(SDLGetStatusUpdateResponse); }; } // namespace commands diff --git a/src/components/application_manager/include/application_manager/commands/hmi/sdl_get_user_friendly_message_request.h b/src/components/application_manager/include/application_manager/commands/hmi/sdl_get_user_friendly_message_request.h index 103ec562af..7d9fec337c 100644 --- a/src/components/application_manager/include/application_manager/commands/hmi/sdl_get_user_friendly_message_request.h +++ b/src/components/application_manager/include/application_manager/commands/hmi/sdl_get_user_friendly_message_request.h @@ -44,26 +44,27 @@ namespace commands { * @brief SDLGetUserFriendlyMessageRequest command class **/ class SDLGetUserFriendlyMessageRequest : public RequestFromHMI { - public: - /** - * @brief SDLGetUserFriendlyMessageRequest class constructor - * - * @param message Incoming SmartObject message - **/ - SDLGetUserFriendlyMessageRequest(const MessageSharedPtr& message, ApplicationManager& application_manager); + public: + /** + * @brief SDLGetUserFriendlyMessageRequest class constructor + * + * @param message Incoming SmartObject message + **/ + SDLGetUserFriendlyMessageRequest(const MessageSharedPtr& message, + ApplicationManager& application_manager); - /** - * @brief SDLGetUserFriendlyMessageRequest class destructor - **/ - virtual ~SDLGetUserFriendlyMessageRequest(); + /** + * @brief SDLGetUserFriendlyMessageRequest class destructor + **/ + virtual ~SDLGetUserFriendlyMessageRequest(); - /** - * @brief Execute command - **/ - virtual void Run(); + /** + * @brief Execute command + **/ + virtual void Run(); - private: - DISALLOW_COPY_AND_ASSIGN(SDLGetUserFriendlyMessageRequest); + private: + DISALLOW_COPY_AND_ASSIGN(SDLGetUserFriendlyMessageRequest); }; } // namespace commands diff --git a/src/components/application_manager/include/application_manager/commands/hmi/sdl_get_user_friendly_message_response.h b/src/components/application_manager/include/application_manager/commands/hmi/sdl_get_user_friendly_message_response.h index b32a20c5a3..43c440c277 100644 --- a/src/components/application_manager/include/application_manager/commands/hmi/sdl_get_user_friendly_message_response.h +++ b/src/components/application_manager/include/application_manager/commands/hmi/sdl_get_user_friendly_message_response.h @@ -43,26 +43,27 @@ namespace commands { * @brief SDLGetUserFriendlyMessageResponse command class **/ class SDLGetUserFriendlyMessageResponse : public ResponseToHMI { - public: - /** - * @brief SDLGetUserFriendlyMessageResponse class constructor - * - * @param message Incoming SmartObject message - **/ - SDLGetUserFriendlyMessageResponse(const MessageSharedPtr& message, ApplicationManager& application_manager); + public: + /** + * @brief SDLGetUserFriendlyMessageResponse class constructor + * + * @param message Incoming SmartObject message + **/ + SDLGetUserFriendlyMessageResponse(const MessageSharedPtr& message, + ApplicationManager& application_manager); - /** - * @brief SDLGetUserFriendlyMessageResponse class destructor - **/ - virtual ~SDLGetUserFriendlyMessageResponse(); + /** + * @brief SDLGetUserFriendlyMessageResponse class destructor + **/ + virtual ~SDLGetUserFriendlyMessageResponse(); - /** - * @brief Execute command - **/ - virtual void Run(); + /** + * @brief Execute command + **/ + virtual void Run(); - private: - DISALLOW_COPY_AND_ASSIGN(SDLGetUserFriendlyMessageResponse); + private: + DISALLOW_COPY_AND_ASSIGN(SDLGetUserFriendlyMessageResponse); }; } // namespace commands diff --git a/src/components/application_manager/include/application_manager/commands/hmi/sdl_policy_update.h b/src/components/application_manager/include/application_manager/commands/hmi/sdl_policy_update.h index 75cd6888e9..11d0dc41d8 100644 --- a/src/components/application_manager/include/application_manager/commands/hmi/sdl_policy_update.h +++ b/src/components/application_manager/include/application_manager/commands/hmi/sdl_policy_update.h @@ -40,20 +40,22 @@ namespace application_manager { namespace commands { class SDLPolicyUpdate : public RequestToHMI { - public: - /** - * @brief SDLPolicyUpdate class constructor - * - * @param message Incoming SmartObject message - **/ - SDLPolicyUpdate(const MessageSharedPtr& message, ApplicationManager& application_manager); - virtual ~SDLPolicyUpdate(); - /** - * @brief Execute command + public: + /** + * @brief SDLPolicyUpdate class constructor + * + * @param message Incoming SmartObject message **/ - virtual void Run(); - private: - DISALLOW_COPY_AND_ASSIGN(SDLPolicyUpdate); + SDLPolicyUpdate(const MessageSharedPtr& message, + ApplicationManager& application_manager); + virtual ~SDLPolicyUpdate(); + /** + * @brief Execute command + **/ + virtual void Run(); + + private: + DISALLOW_COPY_AND_ASSIGN(SDLPolicyUpdate); }; } // namespace commands diff --git a/src/components/application_manager/include/application_manager/commands/hmi/sdl_policy_update_response.h b/src/components/application_manager/include/application_manager/commands/hmi/sdl_policy_update_response.h index 86b46476b1..53e9e796bf 100644 --- a/src/components/application_manager/include/application_manager/commands/hmi/sdl_policy_update_response.h +++ b/src/components/application_manager/include/application_manager/commands/hmi/sdl_policy_update_response.h @@ -40,26 +40,27 @@ namespace application_manager { namespace commands { class SDLPolicyUpdateResponse : public ResponseFromHMI { - public: - /** - * @brief SDLPolicyUpdateResponse class constructor - * - * @param message Incoming SmartObject message - **/ - SDLPolicyUpdateResponse(const MessageSharedPtr& message, ApplicationManager& application_manager); + public: + /** + * @brief SDLPolicyUpdateResponse class constructor + * + * @param message Incoming SmartObject message + **/ + SDLPolicyUpdateResponse(const MessageSharedPtr& message, + ApplicationManager& application_manager); - /** - * @brief SDLPolicyUpdateResponse class destructor - **/ - virtual ~SDLPolicyUpdateResponse(); + /** + * @brief SDLPolicyUpdateResponse class destructor + **/ + virtual ~SDLPolicyUpdateResponse(); - /** - * @brief Execute command - **/ - virtual void Run(); + /** + * @brief Execute command + **/ + virtual void Run(); - private: - DISALLOW_COPY_AND_ASSIGN(SDLPolicyUpdateResponse); + private: + DISALLOW_COPY_AND_ASSIGN(SDLPolicyUpdateResponse); }; } // namespace commands diff --git a/src/components/application_manager/include/application_manager/commands/hmi/tts_change_registration_request.h b/src/components/application_manager/include/application_manager/commands/hmi/tts_change_registration_request.h index 0558e19b7d..0f36e82b44 100644 --- a/src/components/application_manager/include/application_manager/commands/hmi/tts_change_registration_request.h +++ b/src/components/application_manager/include/application_manager/commands/hmi/tts_change_registration_request.h @@ -49,7 +49,8 @@ class TTSChangeRegistrationRequest : public RequestToHMI { * * @param message Incoming SmartObject message **/ - TTSChangeRegistrationRequest(const MessageSharedPtr& message, ApplicationManager& application_manager); + TTSChangeRegistrationRequest(const MessageSharedPtr& message, + ApplicationManager& application_manager); /** * @brief TTSChangeRegistrationRequest class destructor diff --git a/src/components/application_manager/include/application_manager/commands/hmi/tts_change_registration_response.h b/src/components/application_manager/include/application_manager/commands/hmi/tts_change_registration_response.h index 81d9e7fda2..ca9c114156 100644 --- a/src/components/application_manager/include/application_manager/commands/hmi/tts_change_registration_response.h +++ b/src/components/application_manager/include/application_manager/commands/hmi/tts_change_registration_response.h @@ -49,7 +49,8 @@ class TTSChangeRegistratioResponse : public ResponseFromHMI { * * @param message Incoming SmartObject message **/ - TTSChangeRegistratioResponse(const MessageSharedPtr& message, ApplicationManager& application_manager); + TTSChangeRegistratioResponse(const MessageSharedPtr& message, + ApplicationManager& application_manager); /** * @brief TTSChangeRegistratioResponse class destructor diff --git a/src/components/application_manager/include/application_manager/commands/hmi/tts_get_capabilities_request.h b/src/components/application_manager/include/application_manager/commands/hmi/tts_get_capabilities_request.h index 0d2edf713f..bea41b7371 100644 --- a/src/components/application_manager/include/application_manager/commands/hmi/tts_get_capabilities_request.h +++ b/src/components/application_manager/include/application_manager/commands/hmi/tts_get_capabilities_request.h @@ -49,7 +49,8 @@ class TTSGetCapabilitiesRequest : public RequestToHMI { * * @param message Incoming SmartObject message **/ - TTSGetCapabilitiesRequest(const MessageSharedPtr& message, ApplicationManager& application_manager); + TTSGetCapabilitiesRequest(const MessageSharedPtr& message, + ApplicationManager& application_manager); /** * @brief TTSGetCapabilitiesRequest class destructor diff --git a/src/components/application_manager/include/application_manager/commands/hmi/tts_get_capabilities_response.h b/src/components/application_manager/include/application_manager/commands/hmi/tts_get_capabilities_response.h index 324fbe7cef..a70ee2b33b 100644 --- a/src/components/application_manager/include/application_manager/commands/hmi/tts_get_capabilities_response.h +++ b/src/components/application_manager/include/application_manager/commands/hmi/tts_get_capabilities_response.h @@ -49,7 +49,8 @@ class TTSGetCapabilitiesResponse : public ResponseFromHMI { * * @param message Incoming SmartObject message **/ - TTSGetCapabilitiesResponse(const MessageSharedPtr& message, ApplicationManager& application_manager); + TTSGetCapabilitiesResponse(const MessageSharedPtr& message, + ApplicationManager& application_manager); /** * @brief TTSGetCapabilitiesResponse class destructor diff --git a/src/components/application_manager/include/application_manager/commands/hmi/tts_get_language_request.h b/src/components/application_manager/include/application_manager/commands/hmi/tts_get_language_request.h index 65ac2cd748..627cf3da06 100644 --- a/src/components/application_manager/include/application_manager/commands/hmi/tts_get_language_request.h +++ b/src/components/application_manager/include/application_manager/commands/hmi/tts_get_language_request.h @@ -49,7 +49,8 @@ class TTSGetLanguageRequest : public RequestToHMI { * * @param message Incoming SmartObject message **/ - TTSGetLanguageRequest(const MessageSharedPtr& message, ApplicationManager& application_manager); + TTSGetLanguageRequest(const MessageSharedPtr& message, + ApplicationManager& application_manager); /** * @brief TTSGetLanguageRequest class destructor diff --git a/src/components/application_manager/include/application_manager/commands/hmi/tts_get_language_response.h b/src/components/application_manager/include/application_manager/commands/hmi/tts_get_language_response.h index 1aee42921d..f44492a6ed 100644 --- a/src/components/application_manager/include/application_manager/commands/hmi/tts_get_language_response.h +++ b/src/components/application_manager/include/application_manager/commands/hmi/tts_get_language_response.h @@ -49,7 +49,8 @@ class TTSGetLanguageResponse : public ResponseFromHMI { * * @param message Incoming SmartObject message **/ - TTSGetLanguageResponse(const MessageSharedPtr& message, ApplicationManager& application_manager); + TTSGetLanguageResponse(const MessageSharedPtr& message, + ApplicationManager& application_manager); /** * @brief TTSGetLanguageResponse class destructor diff --git a/src/components/application_manager/include/application_manager/commands/hmi/tts_get_supported_languages_request.h b/src/components/application_manager/include/application_manager/commands/hmi/tts_get_supported_languages_request.h index 2a23b52b87..9500d54eea 100644 --- a/src/components/application_manager/include/application_manager/commands/hmi/tts_get_supported_languages_request.h +++ b/src/components/application_manager/include/application_manager/commands/hmi/tts_get_supported_languages_request.h @@ -49,7 +49,8 @@ class TTSGetSupportedLanguagesRequest : public RequestToHMI { * * @param message Incoming SmartObject message **/ - TTSGetSupportedLanguagesRequest(const MessageSharedPtr& message, ApplicationManager& application_manager); + TTSGetSupportedLanguagesRequest(const MessageSharedPtr& message, + ApplicationManager& application_manager); /** * @brief TTSGetSupportedLanguagesRequest class destructor diff --git a/src/components/application_manager/include/application_manager/commands/hmi/tts_get_supported_languages_response.h b/src/components/application_manager/include/application_manager/commands/hmi/tts_get_supported_languages_response.h index 8ed347c771..1bc569ebb8 100644 --- a/src/components/application_manager/include/application_manager/commands/hmi/tts_get_supported_languages_response.h +++ b/src/components/application_manager/include/application_manager/commands/hmi/tts_get_supported_languages_response.h @@ -49,7 +49,8 @@ class TTSGetSupportedLanguagesResponse : public ResponseFromHMI { * * @param message Incoming SmartObject message **/ - TTSGetSupportedLanguagesResponse(const MessageSharedPtr& message, ApplicationManager& application_manager); + TTSGetSupportedLanguagesResponse(const MessageSharedPtr& message, + ApplicationManager& application_manager); /** * @brief TTSGetSupportedLanguagesResponse class destructor diff --git a/src/components/application_manager/include/application_manager/commands/hmi/tts_is_ready_request.h b/src/components/application_manager/include/application_manager/commands/hmi/tts_is_ready_request.h index fa80170564..81bd8eb27b 100644 --- a/src/components/application_manager/include/application_manager/commands/hmi/tts_is_ready_request.h +++ b/src/components/application_manager/include/application_manager/commands/hmi/tts_is_ready_request.h @@ -49,7 +49,8 @@ class TTSIsReadyRequest : public RequestToHMI { * * @param message Incoming SmartObject message **/ - TTSIsReadyRequest(const MessageSharedPtr& message, ApplicationManager& application_manager); + TTSIsReadyRequest(const MessageSharedPtr& message, + ApplicationManager& application_manager); /** * @brief TTSIsReadyRequest class destructor diff --git a/src/components/application_manager/include/application_manager/commands/hmi/tts_is_ready_response.h b/src/components/application_manager/include/application_manager/commands/hmi/tts_is_ready_response.h index 1bcb46a6df..833d3d0a82 100644 --- a/src/components/application_manager/include/application_manager/commands/hmi/tts_is_ready_response.h +++ b/src/components/application_manager/include/application_manager/commands/hmi/tts_is_ready_response.h @@ -49,7 +49,8 @@ class TTSIsReadyResponse : public ResponseFromHMI { * * @param message Incoming SmartObject message **/ - TTSIsReadyResponse(const MessageSharedPtr& message, ApplicationManager& application_manager); + TTSIsReadyResponse(const MessageSharedPtr& message, + ApplicationManager& application_manager); /** * @brief TTSIsReadyResponse class destructor diff --git a/src/components/application_manager/include/application_manager/commands/hmi/tts_set_global_properties_request.h b/src/components/application_manager/include/application_manager/commands/hmi/tts_set_global_properties_request.h index 36be2ba518..b18e372b3e 100644 --- a/src/components/application_manager/include/application_manager/commands/hmi/tts_set_global_properties_request.h +++ b/src/components/application_manager/include/application_manager/commands/hmi/tts_set_global_properties_request.h @@ -49,7 +49,8 @@ class TTSSetGlobalPropertiesRequest : public RequestToHMI { * * @param message Incoming SmartObject message **/ - TTSSetGlobalPropertiesRequest(const MessageSharedPtr& message, ApplicationManager& application_manager); + TTSSetGlobalPropertiesRequest(const MessageSharedPtr& message, + ApplicationManager& application_manager); /** * @brief TTSSetGlobalPropertiesRequest class destructor diff --git a/src/components/application_manager/include/application_manager/commands/hmi/tts_set_global_properties_response.h b/src/components/application_manager/include/application_manager/commands/hmi/tts_set_global_properties_response.h index 6b9e227131..aa7c85eece 100644 --- a/src/components/application_manager/include/application_manager/commands/hmi/tts_set_global_properties_response.h +++ b/src/components/application_manager/include/application_manager/commands/hmi/tts_set_global_properties_response.h @@ -49,7 +49,8 @@ class TTSSetGlobalPropertiesResponse : public ResponseFromHMI { * * @param message Incoming SmartObject message **/ - TTSSetGlobalPropertiesResponse(const MessageSharedPtr& message, ApplicationManager& application_manager); + TTSSetGlobalPropertiesResponse(const MessageSharedPtr& message, + ApplicationManager& application_manager); /** * @brief TTSSetGlobalPropertiesResponse class destructor diff --git a/src/components/application_manager/include/application_manager/commands/hmi/tts_speak_request.h b/src/components/application_manager/include/application_manager/commands/hmi/tts_speak_request.h index b79fa4eba7..87384beedf 100644 --- a/src/components/application_manager/include/application_manager/commands/hmi/tts_speak_request.h +++ b/src/components/application_manager/include/application_manager/commands/hmi/tts_speak_request.h @@ -42,15 +42,15 @@ namespace commands { /** * @brief TTSSpeakRequest command class **/ -class TTSSpeakRequest - : public RequestToHMI { +class TTSSpeakRequest : public RequestToHMI { public: /** * @brief TTSSpeakRequest class constructor * * @param message Incoming SmartObject message **/ - TTSSpeakRequest(const MessageSharedPtr& message, ApplicationManager& application_manager); + TTSSpeakRequest(const MessageSharedPtr& message, + ApplicationManager& application_manager); /** * @brief TTSSpeakRequest class destructor diff --git a/src/components/application_manager/include/application_manager/commands/hmi/tts_speak_response.h b/src/components/application_manager/include/application_manager/commands/hmi/tts_speak_response.h index bba7fe6814..9f15afb33b 100644 --- a/src/components/application_manager/include/application_manager/commands/hmi/tts_speak_response.h +++ b/src/components/application_manager/include/application_manager/commands/hmi/tts_speak_response.h @@ -42,15 +42,15 @@ namespace commands { /** * @brief TTSSpeakResponse command class **/ -class TTSSpeakResponse - : public ResponseFromHMI { +class TTSSpeakResponse : public ResponseFromHMI { public: /** * @brief TTSSpeakResponse class constructor * * @param message Incoming SmartObject message **/ - TTSSpeakResponse(const MessageSharedPtr& message, ApplicationManager& application_manager); + TTSSpeakResponse(const MessageSharedPtr& message, + ApplicationManager& application_manager); /** * @brief TTSSpeakResponse class destructor diff --git a/src/components/application_manager/include/application_manager/commands/hmi/tts_stop_speaking_request.h b/src/components/application_manager/include/application_manager/commands/hmi/tts_stop_speaking_request.h index f663240cfc..c51daee84d 100644 --- a/src/components/application_manager/include/application_manager/commands/hmi/tts_stop_speaking_request.h +++ b/src/components/application_manager/include/application_manager/commands/hmi/tts_stop_speaking_request.h @@ -49,7 +49,8 @@ class TTSStopSpeakingRequest : public RequestToHMI { * * @param message Incoming SmartObject message **/ - TTSStopSpeakingRequest(const MessageSharedPtr& message, ApplicationManager& application_manager); + TTSStopSpeakingRequest(const MessageSharedPtr& message, + ApplicationManager& application_manager); /** * @brief TTSStopSpeakingRequest class destructor diff --git a/src/components/application_manager/include/application_manager/commands/hmi/tts_stop_speaking_response.h b/src/components/application_manager/include/application_manager/commands/hmi/tts_stop_speaking_response.h index fe7fc28702..a23889a733 100644 --- a/src/components/application_manager/include/application_manager/commands/hmi/tts_stop_speaking_response.h +++ b/src/components/application_manager/include/application_manager/commands/hmi/tts_stop_speaking_response.h @@ -49,7 +49,8 @@ class TTSStopSpeakingResponse : public ResponseFromHMI { * * @param message Incoming SmartObject message **/ - TTSStopSpeakingResponse(const MessageSharedPtr& message, ApplicationManager& application_manager); + TTSStopSpeakingResponse(const MessageSharedPtr& message, + ApplicationManager& application_manager); /** * @brief TTSStopSpeakingResponse class destructor diff --git a/src/components/application_manager/include/application_manager/commands/hmi/ui_add_command_request.h b/src/components/application_manager/include/application_manager/commands/hmi/ui_add_command_request.h index 8b6c349051..294fd11912 100644 --- a/src/components/application_manager/include/application_manager/commands/hmi/ui_add_command_request.h +++ b/src/components/application_manager/include/application_manager/commands/hmi/ui_add_command_request.h @@ -49,7 +49,8 @@ class UIAddCommandRequest : public RequestToHMI { * * @param message Incoming SmartObject message **/ - UIAddCommandRequest(const MessageSharedPtr& message, ApplicationManager& application_manager); + UIAddCommandRequest(const MessageSharedPtr& message, + ApplicationManager& application_manager); /** * @brief UIAddCommandRequest class destructor diff --git a/src/components/application_manager/include/application_manager/commands/hmi/ui_add_command_response.h b/src/components/application_manager/include/application_manager/commands/hmi/ui_add_command_response.h index 1d57a24a1f..ed48e13322 100644 --- a/src/components/application_manager/include/application_manager/commands/hmi/ui_add_command_response.h +++ b/src/components/application_manager/include/application_manager/commands/hmi/ui_add_command_response.h @@ -49,7 +49,8 @@ class UIAddCommandResponse : public ResponseFromHMI { * * @param message Incoming SmartObject message **/ - UIAddCommandResponse(const MessageSharedPtr& message, ApplicationManager& application_manager); + UIAddCommandResponse(const MessageSharedPtr& message, + ApplicationManager& application_manager); /** * @brief UIAddCommandResponse class destructor diff --git a/src/components/application_manager/include/application_manager/commands/hmi/ui_add_submenu_request.h b/src/components/application_manager/include/application_manager/commands/hmi/ui_add_submenu_request.h index 5f5244869a..96fa0557ae 100644 --- a/src/components/application_manager/include/application_manager/commands/hmi/ui_add_submenu_request.h +++ b/src/components/application_manager/include/application_manager/commands/hmi/ui_add_submenu_request.h @@ -49,7 +49,8 @@ class UIAddSubmenuRequest : public RequestToHMI { * * @param message Incoming SmartObject message **/ - UIAddSubmenuRequest(const MessageSharedPtr& message, ApplicationManager& application_manager); + UIAddSubmenuRequest(const MessageSharedPtr& message, + ApplicationManager& application_manager); /** * @brief UIAddSubmenuRequest class destructor diff --git a/src/components/application_manager/include/application_manager/commands/hmi/ui_add_submenu_response.h b/src/components/application_manager/include/application_manager/commands/hmi/ui_add_submenu_response.h index bb214b05d4..62abf10b60 100644 --- a/src/components/application_manager/include/application_manager/commands/hmi/ui_add_submenu_response.h +++ b/src/components/application_manager/include/application_manager/commands/hmi/ui_add_submenu_response.h @@ -49,7 +49,8 @@ class UIAddSubmenuResponse : public ResponseFromHMI { * * @param message Incoming SmartObject message **/ - UIAddSubmenuResponse(const MessageSharedPtr& message, ApplicationManager& application_manager); + UIAddSubmenuResponse(const MessageSharedPtr& message, + ApplicationManager& application_manager); /** * @brief UIAddSubmenuResponse class destructor diff --git a/src/components/application_manager/include/application_manager/commands/hmi/ui_alert_request.h b/src/components/application_manager/include/application_manager/commands/hmi/ui_alert_request.h index 7f728335a7..123246e596 100644 --- a/src/components/application_manager/include/application_manager/commands/hmi/ui_alert_request.h +++ b/src/components/application_manager/include/application_manager/commands/hmi/ui_alert_request.h @@ -49,7 +49,8 @@ class UIAlertRequest : public RequestToHMI { * * @param message Incoming SmartObject message **/ - UIAlertRequest(const MessageSharedPtr& message, ApplicationManager& application_manager); + UIAlertRequest(const MessageSharedPtr& message, + ApplicationManager& application_manager); /** * @brief UIAlertRequest class destructor diff --git a/src/components/application_manager/include/application_manager/commands/hmi/ui_alert_response.h b/src/components/application_manager/include/application_manager/commands/hmi/ui_alert_response.h index 1856b1f3db..db48699a23 100644 --- a/src/components/application_manager/include/application_manager/commands/hmi/ui_alert_response.h +++ b/src/components/application_manager/include/application_manager/commands/hmi/ui_alert_response.h @@ -49,7 +49,8 @@ class UIAlertResponse : public ResponseFromHMI { * * @param message Incoming SmartObject message **/ - UIAlertResponse(const MessageSharedPtr& message, ApplicationManager& application_manager); + UIAlertResponse(const MessageSharedPtr& message, + ApplicationManager& application_manager); /** * @brief UIAlertResponse class destructor diff --git a/src/components/application_manager/include/application_manager/commands/hmi/ui_change_registration_request.h b/src/components/application_manager/include/application_manager/commands/hmi/ui_change_registration_request.h index 22dda65be7..744ed82cad 100644 --- a/src/components/application_manager/include/application_manager/commands/hmi/ui_change_registration_request.h +++ b/src/components/application_manager/include/application_manager/commands/hmi/ui_change_registration_request.h @@ -49,7 +49,8 @@ class UIChangeRegistrationRequest : public RequestToHMI { * * @param message Incoming SmartObject message **/ - UIChangeRegistrationRequest(const MessageSharedPtr& message, ApplicationManager& application_manager); + UIChangeRegistrationRequest(const MessageSharedPtr& message, + ApplicationManager& application_manager); /** * @brief UIChangeRegistrationRequest class destructor diff --git a/src/components/application_manager/include/application_manager/commands/hmi/ui_change_registration_response.h b/src/components/application_manager/include/application_manager/commands/hmi/ui_change_registration_response.h index 7e63b8e10e..57814b9acf 100644 --- a/src/components/application_manager/include/application_manager/commands/hmi/ui_change_registration_response.h +++ b/src/components/application_manager/include/application_manager/commands/hmi/ui_change_registration_response.h @@ -49,7 +49,8 @@ class UIChangeRegistratioResponse : public ResponseFromHMI { * * @param message Incoming SmartObject message **/ - UIChangeRegistratioResponse(const MessageSharedPtr& message, ApplicationManager& application_manager); + UIChangeRegistratioResponse(const MessageSharedPtr& message, + ApplicationManager& application_manager); /** * @brief UIChangeRegistratioResponse class destructor diff --git a/src/components/application_manager/include/application_manager/commands/hmi/ui_delete_command_request.h b/src/components/application_manager/include/application_manager/commands/hmi/ui_delete_command_request.h index c3dd651a12..21a4c6dd42 100644 --- a/src/components/application_manager/include/application_manager/commands/hmi/ui_delete_command_request.h +++ b/src/components/application_manager/include/application_manager/commands/hmi/ui_delete_command_request.h @@ -49,7 +49,8 @@ class UIDeleteCommandRequest : public RequestToHMI { * * @param message Incoming SmartObject message **/ - UIDeleteCommandRequest(const MessageSharedPtr& message, ApplicationManager& application_manager); + UIDeleteCommandRequest(const MessageSharedPtr& message, + ApplicationManager& application_manager); /** * @brief UIDeleteCommandRequest class destructor diff --git a/src/components/application_manager/include/application_manager/commands/hmi/ui_delete_command_response.h b/src/components/application_manager/include/application_manager/commands/hmi/ui_delete_command_response.h index 2d048f507c..c9baba728f 100644 --- a/src/components/application_manager/include/application_manager/commands/hmi/ui_delete_command_response.h +++ b/src/components/application_manager/include/application_manager/commands/hmi/ui_delete_command_response.h @@ -49,7 +49,8 @@ class UIDeleteCommandResponse : public ResponseFromHMI { * * @param message Incoming SmartObject message **/ - UIDeleteCommandResponse(const MessageSharedPtr& message, ApplicationManager& application_manager); + UIDeleteCommandResponse(const MessageSharedPtr& message, + ApplicationManager& application_manager); /** * @brief UIDeleteCommandResponse class destructor diff --git a/src/components/application_manager/include/application_manager/commands/hmi/ui_delete_submenu_request.h b/src/components/application_manager/include/application_manager/commands/hmi/ui_delete_submenu_request.h index b80e4ff961..d238e39a10 100644 --- a/src/components/application_manager/include/application_manager/commands/hmi/ui_delete_submenu_request.h +++ b/src/components/application_manager/include/application_manager/commands/hmi/ui_delete_submenu_request.h @@ -49,7 +49,8 @@ class UIDeleteSubmenuRequest : public RequestToHMI { * * @param message Incoming SmartObject message **/ - UIDeleteSubmenuRequest(const MessageSharedPtr& message, ApplicationManager& application_manager); + UIDeleteSubmenuRequest(const MessageSharedPtr& message, + ApplicationManager& application_manager); /** * @brief UIDeleteSubmenuRequest class destructor diff --git a/src/components/application_manager/include/application_manager/commands/hmi/ui_delete_submenu_response.h b/src/components/application_manager/include/application_manager/commands/hmi/ui_delete_submenu_response.h index faf4cbf561..36d7bee528 100644 --- a/src/components/application_manager/include/application_manager/commands/hmi/ui_delete_submenu_response.h +++ b/src/components/application_manager/include/application_manager/commands/hmi/ui_delete_submenu_response.h @@ -49,7 +49,8 @@ class UIDeleteSubmenuResponse : public ResponseFromHMI { * * @param message Incoming SmartObject message **/ - UIDeleteSubmenuResponse(const MessageSharedPtr& message, ApplicationManager& application_manager); + UIDeleteSubmenuResponse(const MessageSharedPtr& message, + ApplicationManager& application_manager); /** * @brief UIDeleteSubmenuResponse class destructor diff --git a/src/components/application_manager/include/application_manager/commands/hmi/ui_end_audio_pass_thru_request.h b/src/components/application_manager/include/application_manager/commands/hmi/ui_end_audio_pass_thru_request.h index 769fcc8cbe..d8bd10a9ca 100644 --- a/src/components/application_manager/include/application_manager/commands/hmi/ui_end_audio_pass_thru_request.h +++ b/src/components/application_manager/include/application_manager/commands/hmi/ui_end_audio_pass_thru_request.h @@ -50,7 +50,8 @@ class UIEndAudioPassThruRequest : public RequestToHMI { * * @param message Incoming SmartObject message **/ - UIEndAudioPassThruRequest(const MessageSharedPtr& message, ApplicationManager& application_manager); + UIEndAudioPassThruRequest(const MessageSharedPtr& message, + ApplicationManager& application_manager); /** * @brief UIEndAudioPassThruRequest class destructor diff --git a/src/components/application_manager/include/application_manager/commands/hmi/ui_end_audio_pass_thru_response.h b/src/components/application_manager/include/application_manager/commands/hmi/ui_end_audio_pass_thru_response.h index 5cf923bc04..c2a373d8c0 100644 --- a/src/components/application_manager/include/application_manager/commands/hmi/ui_end_audio_pass_thru_response.h +++ b/src/components/application_manager/include/application_manager/commands/hmi/ui_end_audio_pass_thru_response.h @@ -49,7 +49,8 @@ class UIEndAudioPassThruResponse : public ResponseFromHMI { * * @param message Incoming SmartObject message **/ - UIEndAudioPassThruResponse(const MessageSharedPtr& message, ApplicationManager& application_manager); + UIEndAudioPassThruResponse(const MessageSharedPtr& message, + ApplicationManager& application_manager); /** * @brief UIEndAudioPassThruResponse class destructor diff --git a/src/components/application_manager/include/application_manager/commands/hmi/ui_get_capabilities_request.h b/src/components/application_manager/include/application_manager/commands/hmi/ui_get_capabilities_request.h index 50c428c216..cffba5ca42 100644 --- a/src/components/application_manager/include/application_manager/commands/hmi/ui_get_capabilities_request.h +++ b/src/components/application_manager/include/application_manager/commands/hmi/ui_get_capabilities_request.h @@ -49,7 +49,8 @@ class UIGetCapabilitiesRequest : public RequestToHMI { * * @param message Incoming SmartObject message **/ - UIGetCapabilitiesRequest(const MessageSharedPtr& message, ApplicationManager& application_manager); + UIGetCapabilitiesRequest(const MessageSharedPtr& message, + ApplicationManager& application_manager); /** * @brief UIGetCapabilitiesRequest class destructor diff --git a/src/components/application_manager/include/application_manager/commands/hmi/ui_get_capabilities_response.h b/src/components/application_manager/include/application_manager/commands/hmi/ui_get_capabilities_response.h index e428128859..525dd7ad9d 100644 --- a/src/components/application_manager/include/application_manager/commands/hmi/ui_get_capabilities_response.h +++ b/src/components/application_manager/include/application_manager/commands/hmi/ui_get_capabilities_response.h @@ -49,7 +49,8 @@ class UIGetCapabilitiesResponse : public ResponseFromHMI { * * @param message Incoming SmartObject message **/ - UIGetCapabilitiesResponse(const MessageSharedPtr& message, ApplicationManager& application_manager); + UIGetCapabilitiesResponse(const MessageSharedPtr& message, + ApplicationManager& application_manager); /** * @brief UIGetCapabilitiesResponse class destructor diff --git a/src/components/application_manager/include/application_manager/commands/hmi/ui_get_language_request.h b/src/components/application_manager/include/application_manager/commands/hmi/ui_get_language_request.h index 470072f725..4bf8e11d7e 100644 --- a/src/components/application_manager/include/application_manager/commands/hmi/ui_get_language_request.h +++ b/src/components/application_manager/include/application_manager/commands/hmi/ui_get_language_request.h @@ -49,7 +49,8 @@ class UIGetLanguageRequest : public RequestToHMI { * * @param message Incoming SmartObject message **/ - UIGetLanguageRequest(const MessageSharedPtr& message, ApplicationManager& application_manager); + UIGetLanguageRequest(const MessageSharedPtr& message, + ApplicationManager& application_manager); /** * @brief UIGetLanguageRequest class destructor diff --git a/src/components/application_manager/include/application_manager/commands/hmi/ui_get_language_response.h b/src/components/application_manager/include/application_manager/commands/hmi/ui_get_language_response.h index cefa4e70b9..29bbba85ff 100644 --- a/src/components/application_manager/include/application_manager/commands/hmi/ui_get_language_response.h +++ b/src/components/application_manager/include/application_manager/commands/hmi/ui_get_language_response.h @@ -49,7 +49,8 @@ class UIGetLanguageResponse : public ResponseFromHMI { * * @param message Incoming SmartObject message **/ - UIGetLanguageResponse(const MessageSharedPtr& message, ApplicationManager& application_manager); + UIGetLanguageResponse(const MessageSharedPtr& message, + ApplicationManager& application_manager); /** * @brief UIGetLanguageResponse class destructor diff --git a/src/components/application_manager/include/application_manager/commands/hmi/ui_get_supported_languages_request.h b/src/components/application_manager/include/application_manager/commands/hmi/ui_get_supported_languages_request.h index d499de829f..94c197b7bc 100644 --- a/src/components/application_manager/include/application_manager/commands/hmi/ui_get_supported_languages_request.h +++ b/src/components/application_manager/include/application_manager/commands/hmi/ui_get_supported_languages_request.h @@ -49,7 +49,8 @@ class UIGetSupportedLanguagesRequest : public RequestToHMI { * * @param message Incoming SmartObject message **/ - UIGetSupportedLanguagesRequest(const MessageSharedPtr& message, ApplicationManager& application_manager); + UIGetSupportedLanguagesRequest(const MessageSharedPtr& message, + ApplicationManager& application_manager); /** * @brief UIGetSupportedLanguagesRequest class destructor diff --git a/src/components/application_manager/include/application_manager/commands/hmi/ui_get_supported_languages_response.h b/src/components/application_manager/include/application_manager/commands/hmi/ui_get_supported_languages_response.h index d06d79a7ef..8962b77833 100644 --- a/src/components/application_manager/include/application_manager/commands/hmi/ui_get_supported_languages_response.h +++ b/src/components/application_manager/include/application_manager/commands/hmi/ui_get_supported_languages_response.h @@ -49,7 +49,8 @@ class UIGetSupportedLanguagesResponse : public ResponseFromHMI { * * @param message Incoming SmartObject message **/ - UIGetSupportedLanguagesResponse(const MessageSharedPtr& message, ApplicationManager& application_manager); + UIGetSupportedLanguagesResponse(const MessageSharedPtr& message, + ApplicationManager& application_manager); /** * @brief UIGetSupportedLanguagesResponse class destructor diff --git a/src/components/application_manager/include/application_manager/commands/hmi/ui_is_ready_request.h b/src/components/application_manager/include/application_manager/commands/hmi/ui_is_ready_request.h index 61ea93cfdc..a505df6de4 100644 --- a/src/components/application_manager/include/application_manager/commands/hmi/ui_is_ready_request.h +++ b/src/components/application_manager/include/application_manager/commands/hmi/ui_is_ready_request.h @@ -49,7 +49,8 @@ class UIIsReadyRequest : public RequestToHMI { * * @param message Incoming SmartObject message **/ - UIIsReadyRequest(const MessageSharedPtr& message, ApplicationManager& application_manager); + UIIsReadyRequest(const MessageSharedPtr& message, + ApplicationManager& application_manager); /** * @brief UIIsReadyRequest class destructor diff --git a/src/components/application_manager/include/application_manager/commands/hmi/ui_is_ready_response.h b/src/components/application_manager/include/application_manager/commands/hmi/ui_is_ready_response.h index 251884d0ab..93b2d9a569 100644 --- a/src/components/application_manager/include/application_manager/commands/hmi/ui_is_ready_response.h +++ b/src/components/application_manager/include/application_manager/commands/hmi/ui_is_ready_response.h @@ -49,7 +49,8 @@ class UIIsReadyResponse : public ResponseFromHMI { * * @param message Incoming SmartObject message **/ - UIIsReadyResponse(const MessageSharedPtr& message, ApplicationManager& application_manager); + UIIsReadyResponse(const MessageSharedPtr& message, + ApplicationManager& application_manager); /** * @brief UIIsReadyResponse class destructor diff --git a/src/components/application_manager/include/application_manager/commands/hmi/ui_perform_audio_pass_thru_request.h b/src/components/application_manager/include/application_manager/commands/hmi/ui_perform_audio_pass_thru_request.h index 8c71cd7b51..4cec5a5600 100644 --- a/src/components/application_manager/include/application_manager/commands/hmi/ui_perform_audio_pass_thru_request.h +++ b/src/components/application_manager/include/application_manager/commands/hmi/ui_perform_audio_pass_thru_request.h @@ -49,7 +49,8 @@ class UIPerformAudioPassThruRequest : public RequestToHMI { * * @param message Incoming SmartObject message **/ - UIPerformAudioPassThruRequest(const MessageSharedPtr& message, ApplicationManager& application_manager); + UIPerformAudioPassThruRequest(const MessageSharedPtr& message, + ApplicationManager& application_manager); /** * @brief UIPerformAudioPassThruRequest class destructor diff --git a/src/components/application_manager/include/application_manager/commands/hmi/ui_perform_audio_pass_thru_response.h b/src/components/application_manager/include/application_manager/commands/hmi/ui_perform_audio_pass_thru_response.h index 458d72a960..9fb502233f 100644 --- a/src/components/application_manager/include/application_manager/commands/hmi/ui_perform_audio_pass_thru_response.h +++ b/src/components/application_manager/include/application_manager/commands/hmi/ui_perform_audio_pass_thru_response.h @@ -49,7 +49,8 @@ class UIPerformAudioPassThruResponse : public ResponseFromHMI { * * @param message Incoming SmartObject message **/ - UIPerformAudioPassThruResponse(const MessageSharedPtr& message, ApplicationManager& application_manager); + UIPerformAudioPassThruResponse(const MessageSharedPtr& message, + ApplicationManager& application_manager); /** * @brief UIPerformAudioPassThruResponse class destructor diff --git a/src/components/application_manager/include/application_manager/commands/hmi/ui_perform_interaction_request.h b/src/components/application_manager/include/application_manager/commands/hmi/ui_perform_interaction_request.h index 01d168927f..d9ae72a319 100644 --- a/src/components/application_manager/include/application_manager/commands/hmi/ui_perform_interaction_request.h +++ b/src/components/application_manager/include/application_manager/commands/hmi/ui_perform_interaction_request.h @@ -49,7 +49,8 @@ class UIPerformInteractionRequest : public RequestToHMI { * * @param message Incoming SmartObject message **/ - UIPerformInteractionRequest(const MessageSharedPtr& message, ApplicationManager& application_manager); + UIPerformInteractionRequest(const MessageSharedPtr& message, + ApplicationManager& application_manager); /** * @brief UIPerformInteractionRequest class destructor diff --git a/src/components/application_manager/include/application_manager/commands/hmi/ui_perform_interaction_response.h b/src/components/application_manager/include/application_manager/commands/hmi/ui_perform_interaction_response.h index bc00e184bd..4db471bbae 100644 --- a/src/components/application_manager/include/application_manager/commands/hmi/ui_perform_interaction_response.h +++ b/src/components/application_manager/include/application_manager/commands/hmi/ui_perform_interaction_response.h @@ -49,7 +49,8 @@ class UIPerformInteractionResponse : public ResponseFromHMI { * * @param message Incoming SmartObject message **/ - UIPerformInteractionResponse(const MessageSharedPtr& message, ApplicationManager& application_manager); + UIPerformInteractionResponse(const MessageSharedPtr& message, + ApplicationManager& application_manager); /** * @brief UIPerformInteractionResponse class destructor diff --git a/src/components/application_manager/include/application_manager/commands/hmi/ui_scrollable_message_request.h b/src/components/application_manager/include/application_manager/commands/hmi/ui_scrollable_message_request.h index f3d451253a..8ba828a25e 100644 --- a/src/components/application_manager/include/application_manager/commands/hmi/ui_scrollable_message_request.h +++ b/src/components/application_manager/include/application_manager/commands/hmi/ui_scrollable_message_request.h @@ -49,7 +49,8 @@ class UIScrollableMessageRequest : public RequestToHMI { * * @param message Incoming SmartObject message **/ - UIScrollableMessageRequest(const MessageSharedPtr& message, ApplicationManager& application_manager); + UIScrollableMessageRequest(const MessageSharedPtr& message, + ApplicationManager& application_manager); /** * @brief UIScrollableMessageRequest class destructor diff --git a/src/components/application_manager/include/application_manager/commands/hmi/ui_scrollable_message_response.h b/src/components/application_manager/include/application_manager/commands/hmi/ui_scrollable_message_response.h index 29242fec50..4ae432d658 100644 --- a/src/components/application_manager/include/application_manager/commands/hmi/ui_scrollable_message_response.h +++ b/src/components/application_manager/include/application_manager/commands/hmi/ui_scrollable_message_response.h @@ -49,7 +49,8 @@ class UIScrollableMessageResponse : public ResponseFromHMI { * * @param message Incoming SmartObject message **/ - UIScrollableMessageResponse(const MessageSharedPtr& message, ApplicationManager& application_manager); + UIScrollableMessageResponse(const MessageSharedPtr& message, + ApplicationManager& application_manager); /** * @brief UIScrollableMessageResponse class destructor diff --git a/src/components/application_manager/include/application_manager/commands/hmi/ui_set_app_icon_request.h b/src/components/application_manager/include/application_manager/commands/hmi/ui_set_app_icon_request.h index ab56c7a9ba..c016cf7cda 100644 --- a/src/components/application_manager/include/application_manager/commands/hmi/ui_set_app_icon_request.h +++ b/src/components/application_manager/include/application_manager/commands/hmi/ui_set_app_icon_request.h @@ -49,7 +49,8 @@ class UISetAppIconRequest : public RequestToHMI { * * @param message Incoming SmartObject message **/ - UISetAppIconRequest(const MessageSharedPtr& message, ApplicationManager& application_manager); + UISetAppIconRequest(const MessageSharedPtr& message, + ApplicationManager& application_manager); /** * @brief UISetIconRequest class destructor diff --git a/src/components/application_manager/include/application_manager/commands/hmi/ui_set_app_icon_response.h b/src/components/application_manager/include/application_manager/commands/hmi/ui_set_app_icon_response.h index 16671b2cea..640e43c9f4 100644 --- a/src/components/application_manager/include/application_manager/commands/hmi/ui_set_app_icon_response.h +++ b/src/components/application_manager/include/application_manager/commands/hmi/ui_set_app_icon_response.h @@ -49,7 +49,8 @@ class UISetAppIconResponse : public ResponseFromHMI { * * @param message Incoming SmartObject message **/ - UISetAppIconResponse(const MessageSharedPtr& message, ApplicationManager& application_manager); + UISetAppIconResponse(const MessageSharedPtr& message, + ApplicationManager& application_manager); /** * @brief UISetIconResponse class destructor diff --git a/src/components/application_manager/include/application_manager/commands/hmi/ui_set_display_layout_request.h b/src/components/application_manager/include/application_manager/commands/hmi/ui_set_display_layout_request.h index 95a1f73179..573e9351b1 100644 --- a/src/components/application_manager/include/application_manager/commands/hmi/ui_set_display_layout_request.h +++ b/src/components/application_manager/include/application_manager/commands/hmi/ui_set_display_layout_request.h @@ -42,26 +42,27 @@ namespace commands { * @brief UiSetDisplayLayoutRequest command class **/ class UiSetDisplayLayoutRequest : public RequestToHMI { - public: - /** - * @brief UiSetDisplayLayoutRequest class constructor - * - * @param message Incoming SmartObject message - **/ - UiSetDisplayLayoutRequest(const MessageSharedPtr& message, ApplicationManager& application_manager); + public: + /** + * @brief UiSetDisplayLayoutRequest class constructor + * + * @param message Incoming SmartObject message + **/ + UiSetDisplayLayoutRequest(const MessageSharedPtr& message, + ApplicationManager& application_manager); - /** - * @brief UiSetDisplayLayoutRequest class destructor - **/ - virtual ~UiSetDisplayLayoutRequest(); + /** + * @brief UiSetDisplayLayoutRequest class destructor + **/ + virtual ~UiSetDisplayLayoutRequest(); - /** - * @brief Execute command - **/ - virtual void Run(); + /** + * @brief Execute command + **/ + virtual void Run(); - private: - DISALLOW_COPY_AND_ASSIGN(UiSetDisplayLayoutRequest); + private: + DISALLOW_COPY_AND_ASSIGN(UiSetDisplayLayoutRequest); }; } // namespace commands diff --git a/src/components/application_manager/include/application_manager/commands/hmi/ui_set_display_layout_response.h b/src/components/application_manager/include/application_manager/commands/hmi/ui_set_display_layout_response.h index 3267848671..7b8098fdf5 100644 --- a/src/components/application_manager/include/application_manager/commands/hmi/ui_set_display_layout_response.h +++ b/src/components/application_manager/include/application_manager/commands/hmi/ui_set_display_layout_response.h @@ -43,26 +43,27 @@ namespace commands { * @brief UiSetDisplayLayoutResponse command class **/ class UiSetDisplayLayoutResponse : public ResponseFromHMI { - public: - /** - * @brief UiSetDisplayLayoutResponse class constructor - * - * @param message Incoming SmartObject message - **/ - UiSetDisplayLayoutResponse(const MessageSharedPtr& message, ApplicationManager& application_manager); + public: + /** + * @brief UiSetDisplayLayoutResponse class constructor + * + * @param message Incoming SmartObject message + **/ + UiSetDisplayLayoutResponse(const MessageSharedPtr& message, + ApplicationManager& application_manager); - /** - * @brief UiSetDisplayLayoutResponse class destructor - **/ - virtual ~UiSetDisplayLayoutResponse(); + /** + * @brief UiSetDisplayLayoutResponse class destructor + **/ + virtual ~UiSetDisplayLayoutResponse(); - /** - * @brief Execute command - **/ - virtual void Run(); + /** + * @brief Execute command + **/ + virtual void Run(); - private: - DISALLOW_COPY_AND_ASSIGN(UiSetDisplayLayoutResponse); + private: + DISALLOW_COPY_AND_ASSIGN(UiSetDisplayLayoutResponse); }; } // namespace commands diff --git a/src/components/application_manager/include/application_manager/commands/hmi/ui_set_global_properties_request.h b/src/components/application_manager/include/application_manager/commands/hmi/ui_set_global_properties_request.h index 9d69ad457f..83bf11e2e1 100644 --- a/src/components/application_manager/include/application_manager/commands/hmi/ui_set_global_properties_request.h +++ b/src/components/application_manager/include/application_manager/commands/hmi/ui_set_global_properties_request.h @@ -49,7 +49,8 @@ class UISetGlobalPropertiesRequest : public RequestToHMI { * * @param message Incoming SmartObject message **/ - UISetGlobalPropertiesRequest(const MessageSharedPtr& message, ApplicationManager& application_manager); + UISetGlobalPropertiesRequest(const MessageSharedPtr& message, + ApplicationManager& application_manager); /** * @brief UIShowRequest class destructor diff --git a/src/components/application_manager/include/application_manager/commands/hmi/ui_set_global_properties_response.h b/src/components/application_manager/include/application_manager/commands/hmi/ui_set_global_properties_response.h index 851b289e6a..91de5e6df7 100644 --- a/src/components/application_manager/include/application_manager/commands/hmi/ui_set_global_properties_response.h +++ b/src/components/application_manager/include/application_manager/commands/hmi/ui_set_global_properties_response.h @@ -49,7 +49,8 @@ class UISetGlobalPropertiesResponse : public ResponseFromHMI { * * @param message Incoming SmartObject message **/ - UISetGlobalPropertiesResponse(const MessageSharedPtr& message, ApplicationManager& application_manager); + UISetGlobalPropertiesResponse(const MessageSharedPtr& message, + ApplicationManager& application_manager); /** * @brief UISetGlobalPropertiesResponse class destructor diff --git a/src/components/application_manager/include/application_manager/commands/hmi/ui_set_media_clock_timer_request.h b/src/components/application_manager/include/application_manager/commands/hmi/ui_set_media_clock_timer_request.h index 535390ee2d..92565e6f02 100644 --- a/src/components/application_manager/include/application_manager/commands/hmi/ui_set_media_clock_timer_request.h +++ b/src/components/application_manager/include/application_manager/commands/hmi/ui_set_media_clock_timer_request.h @@ -49,7 +49,8 @@ class UISetMediaClockTimerRequest : public RequestToHMI { * * @param message Incoming SmartObject message **/ - UISetMediaClockTimerRequest(const MessageSharedPtr& message, ApplicationManager& application_manager); + UISetMediaClockTimerRequest(const MessageSharedPtr& message, + ApplicationManager& application_manager); /** * @brief UISetMediaClockTimerRequest class destructor diff --git a/src/components/application_manager/include/application_manager/commands/hmi/ui_set_media_clock_timer_response.h b/src/components/application_manager/include/application_manager/commands/hmi/ui_set_media_clock_timer_response.h index d20ddb1108..0d71ff00f0 100644 --- a/src/components/application_manager/include/application_manager/commands/hmi/ui_set_media_clock_timer_response.h +++ b/src/components/application_manager/include/application_manager/commands/hmi/ui_set_media_clock_timer_response.h @@ -49,7 +49,8 @@ class UISetMediaClockTimerResponse : public ResponseFromHMI { * * @param message Incoming SmartObject message **/ - UISetMediaClockTimerResponse(const MessageSharedPtr& message, ApplicationManager& application_manager); + UISetMediaClockTimerResponse(const MessageSharedPtr& message, + ApplicationManager& application_manager); /** * @brief UISetMediaClockTimerResponse class destructor diff --git a/src/components/application_manager/include/application_manager/commands/hmi/ui_show_request.h b/src/components/application_manager/include/application_manager/commands/hmi/ui_show_request.h index a231e857c5..80348de63b 100644 --- a/src/components/application_manager/include/application_manager/commands/hmi/ui_show_request.h +++ b/src/components/application_manager/include/application_manager/commands/hmi/ui_show_request.h @@ -49,7 +49,8 @@ class UIShowRequest : public RequestToHMI { * * @param message Incoming SmartObject message **/ - UIShowRequest(const MessageSharedPtr& message, ApplicationManager& application_manager); + UIShowRequest(const MessageSharedPtr& message, + ApplicationManager& application_manager); /** * @brief UIShowRequest class destructor diff --git a/src/components/application_manager/include/application_manager/commands/hmi/ui_show_response.h b/src/components/application_manager/include/application_manager/commands/hmi/ui_show_response.h index aef0f9dfc3..d696d2b9f8 100644 --- a/src/components/application_manager/include/application_manager/commands/hmi/ui_show_response.h +++ b/src/components/application_manager/include/application_manager/commands/hmi/ui_show_response.h @@ -49,7 +49,8 @@ class UIShowResponse : public ResponseFromHMI { * * @param message Incoming SmartObject message **/ - UIShowResponse(const MessageSharedPtr& message, ApplicationManager& application_manager); + UIShowResponse(const MessageSharedPtr& message, + ApplicationManager& application_manager); /** * @brief UIShowResponse class destructor diff --git a/src/components/application_manager/include/application_manager/commands/hmi/ui_slider_request.h b/src/components/application_manager/include/application_manager/commands/hmi/ui_slider_request.h index a7d03444a5..583f52084d 100644 --- a/src/components/application_manager/include/application_manager/commands/hmi/ui_slider_request.h +++ b/src/components/application_manager/include/application_manager/commands/hmi/ui_slider_request.h @@ -49,7 +49,8 @@ class UISliderRequest : public RequestToHMI { * * @param message Incoming SmartObject message **/ - UISliderRequest(const MessageSharedPtr& message, ApplicationManager& application_manager); + UISliderRequest(const MessageSharedPtr& message, + ApplicationManager& application_manager); /** * @brief UISliderRequest class destructor diff --git a/src/components/application_manager/include/application_manager/commands/hmi/ui_slider_response.h b/src/components/application_manager/include/application_manager/commands/hmi/ui_slider_response.h index 85e664be28..cabb54f6cb 100644 --- a/src/components/application_manager/include/application_manager/commands/hmi/ui_slider_response.h +++ b/src/components/application_manager/include/application_manager/commands/hmi/ui_slider_response.h @@ -49,7 +49,8 @@ class UISliderResponse : public ResponseFromHMI { * * @param message Incoming SmartObject message **/ - UISliderResponse(const MessageSharedPtr& message, ApplicationManager& application_manager); + UISliderResponse(const MessageSharedPtr& message, + ApplicationManager& application_manager); /** * @brief UISliderResponse class destructor diff --git a/src/components/application_manager/include/application_manager/commands/hmi/update_app_list_request.h b/src/components/application_manager/include/application_manager/commands/hmi/update_app_list_request.h index 672310ae90..61be04d04f 100644 --- a/src/components/application_manager/include/application_manager/commands/hmi/update_app_list_request.h +++ b/src/components/application_manager/include/application_manager/commands/hmi/update_app_list_request.h @@ -49,7 +49,8 @@ class UpdateAppListRequest : public RequestToHMI { * * @param message Incoming SmartObject message **/ - UpdateAppListRequest(const MessageSharedPtr& message, ApplicationManager& application_manager); + UpdateAppListRequest(const MessageSharedPtr& message, + ApplicationManager& application_manager); /** * @brief UpdateAppListRequest class destructor @@ -70,4 +71,3 @@ class UpdateAppListRequest : public RequestToHMI { } // namespace application_manager #endif // SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_HMI_UPDATE_APP_LIST_REQUEST_H_ - diff --git a/src/components/application_manager/include/application_manager/commands/hmi/update_app_list_response.h b/src/components/application_manager/include/application_manager/commands/hmi/update_app_list_response.h index 53bc796a22..5ff8948393 100644 --- a/src/components/application_manager/include/application_manager/commands/hmi/update_app_list_response.h +++ b/src/components/application_manager/include/application_manager/commands/hmi/update_app_list_response.h @@ -49,7 +49,8 @@ class UpdateAppListResponse : public ResponseFromHMI { * * @param message Incoming SmartObject message **/ - UpdateAppListResponse(const MessageSharedPtr& message, ApplicationManager& application_manager); + UpdateAppListResponse(const MessageSharedPtr& message, + ApplicationManager& application_manager); /** * @brief UpdateAppListResponse class destructor diff --git a/src/components/application_manager/include/application_manager/commands/hmi/update_device_list_request.h b/src/components/application_manager/include/application_manager/commands/hmi/update_device_list_request.h index 298b4187c2..c52ec96075 100644 --- a/src/components/application_manager/include/application_manager/commands/hmi/update_device_list_request.h +++ b/src/components/application_manager/include/application_manager/commands/hmi/update_device_list_request.h @@ -53,7 +53,8 @@ class UpdateDeviceListRequest : public RequestToHMI, * * @param message Incoming SmartObject message **/ - UpdateDeviceListRequest(const MessageSharedPtr& message, ApplicationManager& application_manager); + UpdateDeviceListRequest(const MessageSharedPtr& message, + ApplicationManager& application_manager); /** * @brief UpdateDeviceListRequest class destructor @@ -73,14 +74,14 @@ class UpdateDeviceListRequest : public RequestToHMI, */ virtual void on_event(const event_engine::Event& event); - /** - * @brief Need to stop execution StopMethod if HMI did not started - */ + /** + * @brief Need to stop execution StopMethod if HMI did not started + */ virtual bool CleanUp(); private: - sync_primitives::Lock wait_hmi_lock; - sync_primitives::ConditionalVariable termination_condition_; + sync_primitives::Lock wait_hmi_lock; + sync_primitives::ConditionalVariable termination_condition_; DISALLOW_COPY_AND_ASSIGN(UpdateDeviceListRequest); }; diff --git a/src/components/application_manager/include/application_manager/commands/hmi/update_device_list_response.h b/src/components/application_manager/include/application_manager/commands/hmi/update_device_list_response.h index ef040f94d4..1928b81207 100644 --- a/src/components/application_manager/include/application_manager/commands/hmi/update_device_list_response.h +++ b/src/components/application_manager/include/application_manager/commands/hmi/update_device_list_response.h @@ -43,26 +43,27 @@ namespace commands { * @brief UpdateDeviceListResponse command class **/ class UpdateDeviceListResponse : public ResponseFromHMI { - public: - /** - * @brief UpdateDeviceListResponse class constructor - * - * @param message Incoming SmartObject message - **/ - UpdateDeviceListResponse(const MessageSharedPtr& message, ApplicationManager& application_manager); + public: + /** + * @brief UpdateDeviceListResponse class constructor + * + * @param message Incoming SmartObject message + **/ + UpdateDeviceListResponse(const MessageSharedPtr& message, + ApplicationManager& application_manager); - /** - * @brief UpdateDeviceListResponse class destructor - **/ - virtual ~UpdateDeviceListResponse(); + /** + * @brief UpdateDeviceListResponse class destructor + **/ + virtual ~UpdateDeviceListResponse(); - /** - * @brief Execute command - **/ - virtual void Run(); + /** + * @brief Execute command + **/ + virtual void Run(); - private: - DISALLOW_COPY_AND_ASSIGN(UpdateDeviceListResponse); + private: + DISALLOW_COPY_AND_ASSIGN(UpdateDeviceListResponse); }; } // namespace commands diff --git a/src/components/application_manager/include/application_manager/commands/hmi/update_sdl_request.h b/src/components/application_manager/include/application_manager/commands/hmi/update_sdl_request.h index 872f2e5798..d8be10da2e 100644 --- a/src/components/application_manager/include/application_manager/commands/hmi/update_sdl_request.h +++ b/src/components/application_manager/include/application_manager/commands/hmi/update_sdl_request.h @@ -50,7 +50,8 @@ class UpdateSDLRequest : public RequestToHMI { * * @param message Incoming SmartObject message **/ - UpdateSDLRequest(const MessageSharedPtr& message, ApplicationManager& application_manager); + UpdateSDLRequest(const MessageSharedPtr& message, + ApplicationManager& application_manager); /** * @brief UpdateSDLRequest class destructor diff --git a/src/components/application_manager/include/application_manager/commands/hmi/update_sdl_response.h b/src/components/application_manager/include/application_manager/commands/hmi/update_sdl_response.h index a833a9b55b..bc0375d5fa 100644 --- a/src/components/application_manager/include/application_manager/commands/hmi/update_sdl_response.h +++ b/src/components/application_manager/include/application_manager/commands/hmi/update_sdl_response.h @@ -49,7 +49,8 @@ class UpdateSDLResponse : public ResponseFromHMI { * * @param message Incoming SmartObject message **/ - UpdateSDLResponse(const MessageSharedPtr& message, ApplicationManager& application_manager); + UpdateSDLResponse(const MessageSharedPtr& message, + ApplicationManager& application_manager); /** * @brief UpdateSDLResponse class destructor diff --git a/src/components/application_manager/include/application_manager/commands/hmi/vi_diagnostic_message_request.h b/src/components/application_manager/include/application_manager/commands/hmi/vi_diagnostic_message_request.h index e4396fc031..099f27b734 100644 --- a/src/components/application_manager/include/application_manager/commands/hmi/vi_diagnostic_message_request.h +++ b/src/components/application_manager/include/application_manager/commands/hmi/vi_diagnostic_message_request.h @@ -49,7 +49,8 @@ class VIDiagnosticMessageRequest : public RequestToHMI { * * @param message Incoming SmartObject message **/ - VIDiagnosticMessageRequest(const MessageSharedPtr& message, ApplicationManager& application_manager); + VIDiagnosticMessageRequest(const MessageSharedPtr& message, + ApplicationManager& application_manager); /** * @brief VIDiagnosticMessageRequest class destructor diff --git a/src/components/application_manager/include/application_manager/commands/hmi/vi_diagnostic_message_response.h b/src/components/application_manager/include/application_manager/commands/hmi/vi_diagnostic_message_response.h index 67fbd0e493..f0ae76ccb7 100644 --- a/src/components/application_manager/include/application_manager/commands/hmi/vi_diagnostic_message_response.h +++ b/src/components/application_manager/include/application_manager/commands/hmi/vi_diagnostic_message_response.h @@ -49,7 +49,8 @@ class VIDiagnosticMessageResponse : public ResponseFromHMI { * * @param message Incoming SmartObject message **/ - VIDiagnosticMessageResponse(const MessageSharedPtr& message, ApplicationManager& application_manager); + VIDiagnosticMessageResponse(const MessageSharedPtr& message, + ApplicationManager& application_manager); /** * @brief VIDiagnosticMessageResponse class destructor diff --git a/src/components/application_manager/include/application_manager/commands/hmi/vi_get_dtcs_request.h b/src/components/application_manager/include/application_manager/commands/hmi/vi_get_dtcs_request.h index ce2ee9f355..3b7e502a57 100644 --- a/src/components/application_manager/include/application_manager/commands/hmi/vi_get_dtcs_request.h +++ b/src/components/application_manager/include/application_manager/commands/hmi/vi_get_dtcs_request.h @@ -49,7 +49,8 @@ class VIGetDTCsRequest : public RequestToHMI { * * @param message Incoming SmartObject message **/ - VIGetDTCsRequest(const MessageSharedPtr& message, ApplicationManager& application_manager); + VIGetDTCsRequest(const MessageSharedPtr& message, + ApplicationManager& application_manager); /** * @brief VIGetDTCsRequest class destructor diff --git a/src/components/application_manager/include/application_manager/commands/hmi/vi_get_dtcs_response.h b/src/components/application_manager/include/application_manager/commands/hmi/vi_get_dtcs_response.h index 73de095a83..7b7dab567b 100644 --- a/src/components/application_manager/include/application_manager/commands/hmi/vi_get_dtcs_response.h +++ b/src/components/application_manager/include/application_manager/commands/hmi/vi_get_dtcs_response.h @@ -49,7 +49,8 @@ class VIGetDTCsResponse : public ResponseFromHMI { * * @param message Incoming SmartObject message **/ - VIGetDTCsResponse(const MessageSharedPtr& message, ApplicationManager& application_manager); + VIGetDTCsResponse(const MessageSharedPtr& message, + ApplicationManager& application_manager); /** * @brief VIGetDTCsResponse class destructor diff --git a/src/components/application_manager/include/application_manager/commands/hmi/vi_get_vehicle_data_request.h b/src/components/application_manager/include/application_manager/commands/hmi/vi_get_vehicle_data_request.h index 087bfef207..006f18e864 100644 --- a/src/components/application_manager/include/application_manager/commands/hmi/vi_get_vehicle_data_request.h +++ b/src/components/application_manager/include/application_manager/commands/hmi/vi_get_vehicle_data_request.h @@ -49,7 +49,8 @@ class VIGetVehicleDataRequest : public RequestToHMI { * * @param message Incoming SmartObject message **/ - VIGetVehicleDataRequest(const MessageSharedPtr& message, ApplicationManager& application_manager); + VIGetVehicleDataRequest(const MessageSharedPtr& message, + ApplicationManager& application_manager); /** * @brief VIGetVehicleDataRequest class destructor diff --git a/src/components/application_manager/include/application_manager/commands/hmi/vi_get_vehicle_data_request_template.h b/src/components/application_manager/include/application_manager/commands/hmi/vi_get_vehicle_data_request_template.h index 913b62b431..a11c763021 100644 --- a/src/components/application_manager/include/application_manager/commands/hmi/vi_get_vehicle_data_request_template.h +++ b/src/components/application_manager/include/application_manager/commands/hmi/vi_get_vehicle_data_request_template.h @@ -44,7 +44,7 @@ namespace commands { * * Template class for sending 1 subscribe thin request **/ -template<event_engine::Event::EventID eventID> +template <event_engine::Event::EventID eventID> class VIGetVehicleDataRequestTemplate : public RequestToHMI { public: /** @@ -52,9 +52,9 @@ class VIGetVehicleDataRequestTemplate : public RequestToHMI { * * @param message Incoming SmartObject message **/ - VIGetVehicleDataRequestTemplate(const MessageSharedPtr& message, ApplicationManager& application_manager) - : RequestToHMI(message, application_manager) { - } + VIGetVehicleDataRequestTemplate(const MessageSharedPtr& message, + ApplicationManager& application_manager) + : RequestToHMI(message, application_manager) {} /** * @brief Execute command with sending DBus thin request to HMI diff --git a/src/components/application_manager/include/application_manager/commands/hmi/vi_get_vehicle_data_response.h b/src/components/application_manager/include/application_manager/commands/hmi/vi_get_vehicle_data_response.h index d7fe667f3c..ef19072bb0 100644 --- a/src/components/application_manager/include/application_manager/commands/hmi/vi_get_vehicle_data_response.h +++ b/src/components/application_manager/include/application_manager/commands/hmi/vi_get_vehicle_data_response.h @@ -50,7 +50,8 @@ class VIGetVehicleDataResponse : public ResponseFromHMI { * * @param message Incoming SmartObject message **/ - VIGetVehicleDataResponse(const MessageSharedPtr& message, ApplicationManager& application_manager); + VIGetVehicleDataResponse(const MessageSharedPtr& message, + ApplicationManager& application_manager); /** * @brief VIGetVehicleDataResponse class destructor diff --git a/src/components/application_manager/include/application_manager/commands/hmi/vi_get_vehicle_data_response_template.h b/src/components/application_manager/include/application_manager/commands/hmi/vi_get_vehicle_data_response_template.h index b43dd3d7e4..a1c143baed 100644 --- a/src/components/application_manager/include/application_manager/commands/hmi/vi_get_vehicle_data_response_template.h +++ b/src/components/application_manager/include/application_manager/commands/hmi/vi_get_vehicle_data_response_template.h @@ -43,7 +43,7 @@ namespace commands { /** * @brief VIGetVehicleDataResponseTemplate command class **/ -template<event_engine::Event::EventID eventID> +template <event_engine::Event::EventID eventID> class VIGetVehicleDataResponseTemplate : public ResponseFromHMI { public: /** @@ -51,9 +51,9 @@ class VIGetVehicleDataResponseTemplate : public ResponseFromHMI { * * @param message Incoming SmartObject message **/ - VIGetVehicleDataResponseTemplate(const MessageSharedPtr& message, ApplicationManager& application_manager) - : ResponseFromHMI(message, application_manager) { - } + VIGetVehicleDataResponseTemplate(const MessageSharedPtr& message, + ApplicationManager& application_manager) + : ResponseFromHMI(message, application_manager) {} /** * @brief Execute command diff --git a/src/components/application_manager/include/application_manager/commands/hmi/vi_get_vehicle_type_request.h b/src/components/application_manager/include/application_manager/commands/hmi/vi_get_vehicle_type_request.h index 04af5903e9..cd70c3349b 100644 --- a/src/components/application_manager/include/application_manager/commands/hmi/vi_get_vehicle_type_request.h +++ b/src/components/application_manager/include/application_manager/commands/hmi/vi_get_vehicle_type_request.h @@ -49,7 +49,8 @@ class VIGetVehicleTypeRequest : public RequestToHMI { * * @param message Incoming SmartObject message **/ - VIGetVehicleTypeRequest(const MessageSharedPtr& message, ApplicationManager& application_manager); + VIGetVehicleTypeRequest(const MessageSharedPtr& message, + ApplicationManager& application_manager); /** * @brief VIGetVehicleTypeRequest class destructor diff --git a/src/components/application_manager/include/application_manager/commands/hmi/vi_get_vehicle_type_response.h b/src/components/application_manager/include/application_manager/commands/hmi/vi_get_vehicle_type_response.h index ee74b8478c..0ef35dd7fc 100644 --- a/src/components/application_manager/include/application_manager/commands/hmi/vi_get_vehicle_type_response.h +++ b/src/components/application_manager/include/application_manager/commands/hmi/vi_get_vehicle_type_response.h @@ -49,7 +49,8 @@ class VIGetVehicleTypeResponse : public ResponseFromHMI { * * @param message Incoming SmartObject message **/ - VIGetVehicleTypeResponse(const MessageSharedPtr& message, ApplicationManager& application_manager); + VIGetVehicleTypeResponse(const MessageSharedPtr& message, + ApplicationManager& application_manager); /** * @brief VIGetVehicleTypeResponse class destructor diff --git a/src/components/application_manager/include/application_manager/commands/hmi/vi_is_ready_request.h b/src/components/application_manager/include/application_manager/commands/hmi/vi_is_ready_request.h index a1df2bd990..9049db4d24 100644 --- a/src/components/application_manager/include/application_manager/commands/hmi/vi_is_ready_request.h +++ b/src/components/application_manager/include/application_manager/commands/hmi/vi_is_ready_request.h @@ -49,7 +49,8 @@ class VIIsReadyRequest : public RequestToHMI { * * @param message Incoming SmartObject message **/ - VIIsReadyRequest(const MessageSharedPtr& message, ApplicationManager& application_manager); + VIIsReadyRequest(const MessageSharedPtr& message, + ApplicationManager& application_manager); /** * @brief VIIsReadyRequest class destructor diff --git a/src/components/application_manager/include/application_manager/commands/hmi/vi_is_ready_response.h b/src/components/application_manager/include/application_manager/commands/hmi/vi_is_ready_response.h index b19aea7a63..a7866a1e73 100644 --- a/src/components/application_manager/include/application_manager/commands/hmi/vi_is_ready_response.h +++ b/src/components/application_manager/include/application_manager/commands/hmi/vi_is_ready_response.h @@ -50,7 +50,8 @@ class VIIsReadyResponse : public ResponseFromHMI { * * @param message Incoming SmartObject message **/ - VIIsReadyResponse(const MessageSharedPtr& message, ApplicationManager& application_manager); + VIIsReadyResponse(const MessageSharedPtr& message, + ApplicationManager& application_manager); /** * @brief VIIsReadyResponse class destructor diff --git a/src/components/application_manager/include/application_manager/commands/hmi/vi_read_did_request.h b/src/components/application_manager/include/application_manager/commands/hmi/vi_read_did_request.h index 358076ef23..cdbdb45a8b 100644 --- a/src/components/application_manager/include/application_manager/commands/hmi/vi_read_did_request.h +++ b/src/components/application_manager/include/application_manager/commands/hmi/vi_read_did_request.h @@ -49,7 +49,8 @@ class VIReadDIDRequest : public RequestToHMI { * * @param message Incoming SmartObject message **/ - VIReadDIDRequest(const MessageSharedPtr& message, ApplicationManager& application_manager); + VIReadDIDRequest(const MessageSharedPtr& message, + ApplicationManager& application_manager); /** * @brief VIReadDIDRequest class destructor diff --git a/src/components/application_manager/include/application_manager/commands/hmi/vi_read_did_response.h b/src/components/application_manager/include/application_manager/commands/hmi/vi_read_did_response.h index 8d95f12bd4..acb8760c5b 100644 --- a/src/components/application_manager/include/application_manager/commands/hmi/vi_read_did_response.h +++ b/src/components/application_manager/include/application_manager/commands/hmi/vi_read_did_response.h @@ -49,7 +49,8 @@ class VIReadDIDResponse : public ResponseFromHMI { * * @param message Incoming SmartObject message **/ - VIReadDIDResponse(const MessageSharedPtr& message, ApplicationManager& application_manager); + VIReadDIDResponse(const MessageSharedPtr& message, + ApplicationManager& application_manager); /** * @brief VIReadDIDResponse class destructor diff --git a/src/components/application_manager/include/application_manager/commands/hmi/vi_subscribe_vehicle_data_request.h b/src/components/application_manager/include/application_manager/commands/hmi/vi_subscribe_vehicle_data_request.h index 0ef5b4e9f2..58d4984f8d 100644 --- a/src/components/application_manager/include/application_manager/commands/hmi/vi_subscribe_vehicle_data_request.h +++ b/src/components/application_manager/include/application_manager/commands/hmi/vi_subscribe_vehicle_data_request.h @@ -49,7 +49,8 @@ class VISubscribeVehicleDataRequest : public RequestToHMI { * * @param message Incoming SmartObject message **/ - VISubscribeVehicleDataRequest(const MessageSharedPtr& message, ApplicationManager& application_manager); + VISubscribeVehicleDataRequest(const MessageSharedPtr& message, + ApplicationManager& application_manager); /** * @brief VISubscribeVehicleDataRequest class destructor diff --git a/src/components/application_manager/include/application_manager/commands/hmi/vi_subscribe_vehicle_data_request_template.h b/src/components/application_manager/include/application_manager/commands/hmi/vi_subscribe_vehicle_data_request_template.h index 385bd4d029..7fefe0dbe2 100644 --- a/src/components/application_manager/include/application_manager/commands/hmi/vi_subscribe_vehicle_data_request_template.h +++ b/src/components/application_manager/include/application_manager/commands/hmi/vi_subscribe_vehicle_data_request_template.h @@ -44,7 +44,7 @@ namespace commands { * * Template class for sending 1 subscribe thin request **/ -template<event_engine::Event::EventID eventID> +template <event_engine::Event::EventID eventID> class VISubscribeVehicleDataRequestTemplate : public RequestToHMI { public: /** @@ -52,10 +52,9 @@ class VISubscribeVehicleDataRequestTemplate : public RequestToHMI { * * @param message Incoming SmartObject message **/ - VISubscribeVehicleDataRequestTemplate( - const MessageSharedPtr& message, ApplicationManager& application_manager) - : RequestToHMI(message, application_manager) { - } + VISubscribeVehicleDataRequestTemplate(const MessageSharedPtr& message, + ApplicationManager& application_manager) + : RequestToHMI(message, application_manager) {} /** * @brief Execute command with sending DBus thin request to HMI diff --git a/src/components/application_manager/include/application_manager/commands/hmi/vi_subscribe_vehicle_data_response.h b/src/components/application_manager/include/application_manager/commands/hmi/vi_subscribe_vehicle_data_response.h index 8494894787..8f038bf941 100644 --- a/src/components/application_manager/include/application_manager/commands/hmi/vi_subscribe_vehicle_data_response.h +++ b/src/components/application_manager/include/application_manager/commands/hmi/vi_subscribe_vehicle_data_response.h @@ -49,7 +49,8 @@ class VISubscribeVehicleDataResponse : public ResponseFromHMI { * * @param message Incoming SmartObject message **/ - VISubscribeVehicleDataResponse(const MessageSharedPtr& message, ApplicationManager& application_manager); + VISubscribeVehicleDataResponse(const MessageSharedPtr& message, + ApplicationManager& application_manager); /** * @brief VISubscribeVehicleDataResponse class destructor diff --git a/src/components/application_manager/include/application_manager/commands/hmi/vi_subscribe_vehicle_data_response_template.h b/src/components/application_manager/include/application_manager/commands/hmi/vi_subscribe_vehicle_data_response_template.h index 5262a6992c..7790c57092 100644 --- a/src/components/application_manager/include/application_manager/commands/hmi/vi_subscribe_vehicle_data_response_template.h +++ b/src/components/application_manager/include/application_manager/commands/hmi/vi_subscribe_vehicle_data_response_template.h @@ -42,7 +42,7 @@ namespace commands { /** * @brief VISubscriveVehicleDataResponseTemplate command class **/ -template<event_engine::Event::EventID eventID> +template <event_engine::Event::EventID eventID> class VISubscribeVehicleDataResponseTemplate : public ResponseFromHMI { public: /** @@ -52,8 +52,7 @@ class VISubscribeVehicleDataResponseTemplate : public ResponseFromHMI { **/ VISubscribeVehicleDataResponseTemplate( const MessageSharedPtr& message, ApplicationManager& application_manager) - : ResponseFromHMI(message, application_manager) { - } + : ResponseFromHMI(message, application_manager) {} /** * @brief Execute command @@ -64,6 +63,7 @@ class VISubscribeVehicleDataResponseTemplate : public ResponseFromHMI { event.set_smart_object(*message_); event.raise(application_manager_.event_dispatcher()); } + private: DISALLOW_COPY_AND_ASSIGN(VISubscribeVehicleDataResponseTemplate<eventID>); }; diff --git a/src/components/application_manager/include/application_manager/commands/hmi/vi_unsubscribe_vehicle_data_request.h b/src/components/application_manager/include/application_manager/commands/hmi/vi_unsubscribe_vehicle_data_request.h index 14e510c412..b99eee47e7 100644 --- a/src/components/application_manager/include/application_manager/commands/hmi/vi_unsubscribe_vehicle_data_request.h +++ b/src/components/application_manager/include/application_manager/commands/hmi/vi_unsubscribe_vehicle_data_request.h @@ -49,7 +49,8 @@ class VIUnsubscribeVehicleDataRequest : public RequestToHMI { * * @param message Incoming SmartObject message **/ - VIUnsubscribeVehicleDataRequest(const MessageSharedPtr& message, ApplicationManager& application_manager); + VIUnsubscribeVehicleDataRequest(const MessageSharedPtr& message, + ApplicationManager& application_manager); /** * @brief VIUnsubscribeVehicleDataRequest class destructor diff --git a/src/components/application_manager/include/application_manager/commands/hmi/vi_unsubscribe_vehicle_data_request_template.h b/src/components/application_manager/include/application_manager/commands/hmi/vi_unsubscribe_vehicle_data_request_template.h index 070d1aba5c..b9367a372e 100644 --- a/src/components/application_manager/include/application_manager/commands/hmi/vi_unsubscribe_vehicle_data_request_template.h +++ b/src/components/application_manager/include/application_manager/commands/hmi/vi_unsubscribe_vehicle_data_request_template.h @@ -44,7 +44,7 @@ namespace commands { * * Template class for sending 1 unsubscribe thin request **/ -template<event_engine::Event::EventID eventID> +template <event_engine::Event::EventID eventID> class VIUnsubscribeVehicleDataRequestTemplate : public RequestToHMI { public: /** @@ -54,8 +54,7 @@ class VIUnsubscribeVehicleDataRequestTemplate : public RequestToHMI { **/ VIUnsubscribeVehicleDataRequestTemplate( const MessageSharedPtr& message, ApplicationManager& application_manager) - : RequestToHMI(message, application_manager) { - } + : RequestToHMI(message, application_manager) {} /** * @brief Execute command with sending DBus thin request to HMI diff --git a/src/components/application_manager/include/application_manager/commands/hmi/vi_unsubscribe_vehicle_data_response.h b/src/components/application_manager/include/application_manager/commands/hmi/vi_unsubscribe_vehicle_data_response.h index 3febb1f035..3f930b5a5b 100644 --- a/src/components/application_manager/include/application_manager/commands/hmi/vi_unsubscribe_vehicle_data_response.h +++ b/src/components/application_manager/include/application_manager/commands/hmi/vi_unsubscribe_vehicle_data_response.h @@ -49,7 +49,8 @@ class VIUnsubscribeVehicleDataResponse : public ResponseFromHMI { * * @param message Incoming SmartObject message **/ - VIUnsubscribeVehicleDataResponse(const MessageSharedPtr& message, ApplicationManager& application_manager); + VIUnsubscribeVehicleDataResponse(const MessageSharedPtr& message, + ApplicationManager& application_manager); /** * @brief VIUnsubscribeVehicleDataResponse class destructor diff --git a/src/components/application_manager/include/application_manager/commands/hmi/vi_unsubscribe_vehicle_data_response_template.h b/src/components/application_manager/include/application_manager/commands/hmi/vi_unsubscribe_vehicle_data_response_template.h index ed4c7f3e1f..9d943b838d 100644 --- a/src/components/application_manager/include/application_manager/commands/hmi/vi_unsubscribe_vehicle_data_response_template.h +++ b/src/components/application_manager/include/application_manager/commands/hmi/vi_unsubscribe_vehicle_data_response_template.h @@ -43,7 +43,7 @@ namespace commands { /** * @brief VIUnsubscriveVehicleDataResponseTemplate command class **/ -template<event_engine::Event::EventID eventID> +template <event_engine::Event::EventID eventID> class VIUnsubscribeVehicleDataResponseTemplate : public ResponseFromHMI { public: /** @@ -53,8 +53,7 @@ class VIUnsubscribeVehicleDataResponseTemplate : public ResponseFromHMI { **/ VIUnsubscribeVehicleDataResponseTemplate( const MessageSharedPtr& message, ApplicationManager& application_manager) - : ResponseFromHMI(message, application_manager) { - } + : ResponseFromHMI(message, application_manager) {} /** * @brief Execute command @@ -65,6 +64,7 @@ class VIUnsubscribeVehicleDataResponseTemplate : public ResponseFromHMI { event.set_smart_object(*message_); event.raise(application_manager_.event_dispatcher()); } + private: DISALLOW_COPY_AND_ASSIGN(VIUnsubscribeVehicleDataResponseTemplate<eventID>); }; diff --git a/src/components/application_manager/include/application_manager/commands/hmi/vr_add_command_request.h b/src/components/application_manager/include/application_manager/commands/hmi/vr_add_command_request.h index 95c80e4e99..1ef4125c89 100644 --- a/src/components/application_manager/include/application_manager/commands/hmi/vr_add_command_request.h +++ b/src/components/application_manager/include/application_manager/commands/hmi/vr_add_command_request.h @@ -49,7 +49,8 @@ class VRAddCommandRequest : public RequestToHMI { * * @param message Incoming SmartObject message **/ - VRAddCommandRequest(const MessageSharedPtr& message, ApplicationManager& application_manager); + VRAddCommandRequest(const MessageSharedPtr& message, + ApplicationManager& application_manager); /** * @brief VRAddCommandRequest class destructor diff --git a/src/components/application_manager/include/application_manager/commands/hmi/vr_add_command_response.h b/src/components/application_manager/include/application_manager/commands/hmi/vr_add_command_response.h index 7d2a7e2ba5..1b419ed6ec 100644 --- a/src/components/application_manager/include/application_manager/commands/hmi/vr_add_command_response.h +++ b/src/components/application_manager/include/application_manager/commands/hmi/vr_add_command_response.h @@ -49,7 +49,8 @@ class VRAddCommandResponse : public ResponseFromHMI { * * @param message Incoming SmartObject message **/ - VRAddCommandResponse(const MessageSharedPtr& message, ApplicationManager& application_manager); + VRAddCommandResponse(const MessageSharedPtr& message, + ApplicationManager& application_manager); /** * @brief VRAddCommandResponse class destructor diff --git a/src/components/application_manager/include/application_manager/commands/hmi/vr_change_registration_request.h b/src/components/application_manager/include/application_manager/commands/hmi/vr_change_registration_request.h index 041f971b84..642319e8d6 100644 --- a/src/components/application_manager/include/application_manager/commands/hmi/vr_change_registration_request.h +++ b/src/components/application_manager/include/application_manager/commands/hmi/vr_change_registration_request.h @@ -49,7 +49,8 @@ class VRChangeRegistrationRequest : public RequestToHMI { * * @param message Incoming SmartObject message **/ - VRChangeRegistrationRequest(const MessageSharedPtr& message, ApplicationManager& application_manager); + VRChangeRegistrationRequest(const MessageSharedPtr& message, + ApplicationManager& application_manager); /** * @brief VRChangeRegistrationRequest class destructor diff --git a/src/components/application_manager/include/application_manager/commands/hmi/vr_change_registration_response.h b/src/components/application_manager/include/application_manager/commands/hmi/vr_change_registration_response.h index 0085088760..8dc5e96729 100644 --- a/src/components/application_manager/include/application_manager/commands/hmi/vr_change_registration_response.h +++ b/src/components/application_manager/include/application_manager/commands/hmi/vr_change_registration_response.h @@ -49,7 +49,8 @@ class VRChangeRegistrationResponse : public ResponseFromHMI { * * @param message Incoming SmartObject message **/ - VRChangeRegistrationResponse(const MessageSharedPtr& message, ApplicationManager& application_manager); + VRChangeRegistrationResponse(const MessageSharedPtr& message, + ApplicationManager& application_manager); /** * @brief VRChangeRegistrationResponse class destructor diff --git a/src/components/application_manager/include/application_manager/commands/hmi/vr_delete_command_request.h b/src/components/application_manager/include/application_manager/commands/hmi/vr_delete_command_request.h index 78f8670da6..bc5c24a350 100644 --- a/src/components/application_manager/include/application_manager/commands/hmi/vr_delete_command_request.h +++ b/src/components/application_manager/include/application_manager/commands/hmi/vr_delete_command_request.h @@ -49,7 +49,8 @@ class VRDeleteCommandRequest : public RequestToHMI { * * @param message Incoming SmartObject message **/ - VRDeleteCommandRequest(const MessageSharedPtr& message, ApplicationManager& application_manager); + VRDeleteCommandRequest(const MessageSharedPtr& message, + ApplicationManager& application_manager); /** * @brief VRDeleteCommandRequest class destructor diff --git a/src/components/application_manager/include/application_manager/commands/hmi/vr_delete_command_response.h b/src/components/application_manager/include/application_manager/commands/hmi/vr_delete_command_response.h index 25229af8e8..526c296321 100644 --- a/src/components/application_manager/include/application_manager/commands/hmi/vr_delete_command_response.h +++ b/src/components/application_manager/include/application_manager/commands/hmi/vr_delete_command_response.h @@ -49,7 +49,8 @@ class VRDeleteCommandResponse : public ResponseFromHMI { * * @param message Incoming SmartObject message **/ - VRDeleteCommandResponse(const MessageSharedPtr& message, ApplicationManager& application_manager); + VRDeleteCommandResponse(const MessageSharedPtr& message, + ApplicationManager& application_manager); /** * @brief VRDeleteCommandResponse class destructor diff --git a/src/components/application_manager/include/application_manager/commands/hmi/vr_get_capabilities_request.h b/src/components/application_manager/include/application_manager/commands/hmi/vr_get_capabilities_request.h index 9f877c41a9..8dcc240e9b 100644 --- a/src/components/application_manager/include/application_manager/commands/hmi/vr_get_capabilities_request.h +++ b/src/components/application_manager/include/application_manager/commands/hmi/vr_get_capabilities_request.h @@ -43,26 +43,27 @@ namespace commands { * @brief VRGetCapabilitiesRequest command class **/ class VRGetCapabilitiesRequest : public RequestToHMI { - public: - /** - * @brief VRGetCapabilitiesRequest class constructor - * - * @param message Incoming SmartObject message - **/ - VRGetCapabilitiesRequest(const MessageSharedPtr& message, ApplicationManager& application_manager); + public: + /** + * @brief VRGetCapabilitiesRequest class constructor + * + * @param message Incoming SmartObject message + **/ + VRGetCapabilitiesRequest(const MessageSharedPtr& message, + ApplicationManager& application_manager); - /** - * @brief VRGetCapabilitiesRequest class destructor - **/ - virtual ~VRGetCapabilitiesRequest(); + /** + * @brief VRGetCapabilitiesRequest class destructor + **/ + virtual ~VRGetCapabilitiesRequest(); - /** - * @brief Execute command - **/ - virtual void Run(); + /** + * @brief Execute command + **/ + virtual void Run(); - private: - DISALLOW_COPY_AND_ASSIGN(VRGetCapabilitiesRequest); + private: + DISALLOW_COPY_AND_ASSIGN(VRGetCapabilitiesRequest); }; } // namespace commands diff --git a/src/components/application_manager/include/application_manager/commands/hmi/vr_get_capabilities_response.h b/src/components/application_manager/include/application_manager/commands/hmi/vr_get_capabilities_response.h index 8a75a2485b..b6c8e081f5 100644 --- a/src/components/application_manager/include/application_manager/commands/hmi/vr_get_capabilities_response.h +++ b/src/components/application_manager/include/application_manager/commands/hmi/vr_get_capabilities_response.h @@ -43,26 +43,27 @@ namespace commands { * @brief VRGetCapabilitiesResponse command class **/ class VRGetCapabilitiesResponse : public ResponseFromHMI { - public: - /** - * @brief VRGetCapabilitiesResponse class constructor - * - * @param message Incoming SmartObject message - **/ - VRGetCapabilitiesResponse(const MessageSharedPtr& message, ApplicationManager& application_manager); + public: + /** + * @brief VRGetCapabilitiesResponse class constructor + * + * @param message Incoming SmartObject message + **/ + VRGetCapabilitiesResponse(const MessageSharedPtr& message, + ApplicationManager& application_manager); - /** - * @brief VRGetCapabilitiesResponse class destructor - **/ - virtual ~VRGetCapabilitiesResponse(); + /** + * @brief VRGetCapabilitiesResponse class destructor + **/ + virtual ~VRGetCapabilitiesResponse(); - /** - * @brief Execute command - **/ - virtual void Run(); + /** + * @brief Execute command + **/ + virtual void Run(); - private: - DISALLOW_COPY_AND_ASSIGN(VRGetCapabilitiesResponse); + private: + DISALLOW_COPY_AND_ASSIGN(VRGetCapabilitiesResponse); }; } // namespace commands diff --git a/src/components/application_manager/include/application_manager/commands/hmi/vr_get_language_request.h b/src/components/application_manager/include/application_manager/commands/hmi/vr_get_language_request.h index a8bdf7450f..05373784f3 100644 --- a/src/components/application_manager/include/application_manager/commands/hmi/vr_get_language_request.h +++ b/src/components/application_manager/include/application_manager/commands/hmi/vr_get_language_request.h @@ -49,7 +49,8 @@ class VRGetLanguageRequest : public RequestToHMI { * * @param message Incoming SmartObject message **/ - VRGetLanguageRequest(const MessageSharedPtr& message, ApplicationManager& application_manager); + VRGetLanguageRequest(const MessageSharedPtr& message, + ApplicationManager& application_manager); /** * @brief VRGetLanguageRequest class destructor diff --git a/src/components/application_manager/include/application_manager/commands/hmi/vr_get_language_response.h b/src/components/application_manager/include/application_manager/commands/hmi/vr_get_language_response.h index 2d027de578..fad2f219df 100644 --- a/src/components/application_manager/include/application_manager/commands/hmi/vr_get_language_response.h +++ b/src/components/application_manager/include/application_manager/commands/hmi/vr_get_language_response.h @@ -49,7 +49,8 @@ class VRGetLanguageResponse : public ResponseFromHMI { * * @param message Incoming SmartObject message **/ - VRGetLanguageResponse(const MessageSharedPtr& message, ApplicationManager& application_manager); + VRGetLanguageResponse(const MessageSharedPtr& message, + ApplicationManager& application_manager); /** * @brief VRGetLanguageResponse class destructor diff --git a/src/components/application_manager/include/application_manager/commands/hmi/vr_get_supported_languages_request.h b/src/components/application_manager/include/application_manager/commands/hmi/vr_get_supported_languages_request.h index 9da9a3394c..6ed56ebd32 100644 --- a/src/components/application_manager/include/application_manager/commands/hmi/vr_get_supported_languages_request.h +++ b/src/components/application_manager/include/application_manager/commands/hmi/vr_get_supported_languages_request.h @@ -49,7 +49,8 @@ class VRGetSupportedLanguagesRequest : public RequestToHMI { * * @param message Incoming SmartObject message **/ - VRGetSupportedLanguagesRequest(const MessageSharedPtr& message, ApplicationManager& application_manager); + VRGetSupportedLanguagesRequest(const MessageSharedPtr& message, + ApplicationManager& application_manager); /** * @brief VRGetSupportedLanguagesRequest class destructor diff --git a/src/components/application_manager/include/application_manager/commands/hmi/vr_get_supported_languages_response.h b/src/components/application_manager/include/application_manager/commands/hmi/vr_get_supported_languages_response.h index 29f4c58b6e..c4e742ecd0 100644 --- a/src/components/application_manager/include/application_manager/commands/hmi/vr_get_supported_languages_response.h +++ b/src/components/application_manager/include/application_manager/commands/hmi/vr_get_supported_languages_response.h @@ -49,7 +49,8 @@ class VRGetSupportedLanguagesResponse : public ResponseFromHMI { * * @param message Incoming SmartObject message **/ - VRGetSupportedLanguagesResponse(const MessageSharedPtr& message, ApplicationManager& application_manager); + VRGetSupportedLanguagesResponse(const MessageSharedPtr& message, + ApplicationManager& application_manager); /** * @brief VRGetSupportedLanguagesResponse class destructor diff --git a/src/components/application_manager/include/application_manager/commands/hmi/vr_is_ready_request.h b/src/components/application_manager/include/application_manager/commands/hmi/vr_is_ready_request.h index 0c5d9a1db1..9fc4ccd2f3 100644 --- a/src/components/application_manager/include/application_manager/commands/hmi/vr_is_ready_request.h +++ b/src/components/application_manager/include/application_manager/commands/hmi/vr_is_ready_request.h @@ -49,7 +49,8 @@ class VRIsReadyRequest : public RequestToHMI { * * @param message Incoming SmartObject message **/ - VRIsReadyRequest(const MessageSharedPtr& message, ApplicationManager& application_manager); + VRIsReadyRequest(const MessageSharedPtr& message, + ApplicationManager& application_manager); /** * @brief VRIsReadyRequest class destructor diff --git a/src/components/application_manager/include/application_manager/commands/hmi/vr_is_ready_response.h b/src/components/application_manager/include/application_manager/commands/hmi/vr_is_ready_response.h index 3fe226e9b7..474b3373a3 100644 --- a/src/components/application_manager/include/application_manager/commands/hmi/vr_is_ready_response.h +++ b/src/components/application_manager/include/application_manager/commands/hmi/vr_is_ready_response.h @@ -49,7 +49,8 @@ class VRIsReadyResponse : public ResponseFromHMI { * * @param message Incoming SmartObject message **/ - VRIsReadyResponse(const MessageSharedPtr& message, ApplicationManager& application_manager); + VRIsReadyResponse(const MessageSharedPtr& message, + ApplicationManager& application_manager); /** * @brief VRIsReadyResponse class destructor diff --git a/src/components/application_manager/include/application_manager/commands/hmi/vr_perform_interaction_request.h b/src/components/application_manager/include/application_manager/commands/hmi/vr_perform_interaction_request.h index 8737128826..35a7e80b06 100644 --- a/src/components/application_manager/include/application_manager/commands/hmi/vr_perform_interaction_request.h +++ b/src/components/application_manager/include/application_manager/commands/hmi/vr_perform_interaction_request.h @@ -43,26 +43,27 @@ namespace commands { * @brief VRPerformInteractionRequest command class **/ class VRPerformInteractionRequest : public RequestToHMI { - public: - /** - * @brief VRPerformInteractionRequest class constructor - * - * @param message Incoming SmartObject message - **/ - VRPerformInteractionRequest(const MessageSharedPtr& message, ApplicationManager& application_manager); + public: + /** + * @brief VRPerformInteractionRequest class constructor + * + * @param message Incoming SmartObject message + **/ + VRPerformInteractionRequest(const MessageSharedPtr& message, + ApplicationManager& application_manager); - /** - * @brief VRPerformInteractionRequest class destructor - **/ - virtual ~VRPerformInteractionRequest(); + /** + * @brief VRPerformInteractionRequest class destructor + **/ + virtual ~VRPerformInteractionRequest(); - /** - * @brief Execute command - **/ - virtual void Run(); + /** + * @brief Execute command + **/ + virtual void Run(); - private: - DISALLOW_COPY_AND_ASSIGN(VRPerformInteractionRequest); + private: + DISALLOW_COPY_AND_ASSIGN(VRPerformInteractionRequest); }; } // namespace commands diff --git a/src/components/application_manager/include/application_manager/commands/hmi/vr_perform_interaction_response.h b/src/components/application_manager/include/application_manager/commands/hmi/vr_perform_interaction_response.h index 5f1b870542..7c445416ce 100644 --- a/src/components/application_manager/include/application_manager/commands/hmi/vr_perform_interaction_response.h +++ b/src/components/application_manager/include/application_manager/commands/hmi/vr_perform_interaction_response.h @@ -49,7 +49,8 @@ class VRPerformInteractionResponse : public ResponseFromHMI { * * @param message Incoming SmartObject message **/ - VRPerformInteractionResponse(const MessageSharedPtr& message, ApplicationManager& application_manager); + VRPerformInteractionResponse(const MessageSharedPtr& message, + ApplicationManager& application_manager); /** * @brief TTSPerformInteractionResponse class destructor diff --git a/src/components/application_manager/include/application_manager/commands/mobile/add_command_request.h b/src/components/application_manager/include/application_manager/commands/mobile/add_command_request.h index 39ffef24a8..22a0c7e85f 100644 --- a/src/components/application_manager/include/application_manager/commands/mobile/add_command_request.h +++ b/src/components/application_manager/include/application_manager/commands/mobile/add_command_request.h @@ -52,7 +52,8 @@ class AddCommandRequest : public CommandRequestImpl { * * @param message Incoming SmartObject message **/ - AddCommandRequest(const MessageSharedPtr& message, ApplicationManager& application_manager); + AddCommandRequest(const MessageSharedPtr& message, + ApplicationManager& application_manager); /** * @brief AddCommandRequest class destructor @@ -72,7 +73,6 @@ class AddCommandRequest : public CommandRequestImpl { void on_event(const event_engine::Event& event); private: - /* * @brief Check if command name doesn't exist in application * Please see SDLAQ-CRS-407 for more information diff --git a/src/components/application_manager/include/application_manager/commands/mobile/add_command_response.h b/src/components/application_manager/include/application_manager/commands/mobile/add_command_response.h index ef9c810bfe..84bcdebc31 100644 --- a/src/components/application_manager/include/application_manager/commands/mobile/add_command_response.h +++ b/src/components/application_manager/include/application_manager/commands/mobile/add_command_response.h @@ -51,7 +51,8 @@ class AddCommandResponse : public CommandResponseImpl { * * @param message Incoming SmartObject message **/ - AddCommandResponse(const MessageSharedPtr& message, ApplicationManager& application_manager); + AddCommandResponse(const MessageSharedPtr& message, + ApplicationManager& application_manager); /** * @brief AddCommandResponse class destructor diff --git a/src/components/application_manager/include/application_manager/commands/mobile/add_sub_menu_request.h b/src/components/application_manager/include/application_manager/commands/mobile/add_sub_menu_request.h index b36cb46545..1f12523953 100644 --- a/src/components/application_manager/include/application_manager/commands/mobile/add_sub_menu_request.h +++ b/src/components/application_manager/include/application_manager/commands/mobile/add_sub_menu_request.h @@ -51,7 +51,8 @@ class AddSubMenuRequest : public CommandRequestImpl { * * @param message Incoming SmartObject message **/ - AddSubMenuRequest(const MessageSharedPtr& message, ApplicationManager& application_manager); + AddSubMenuRequest(const MessageSharedPtr& message, + ApplicationManager& application_manager); /** * @brief AddSubMenuRequest class destructor @@ -71,7 +72,6 @@ class AddSubMenuRequest : public CommandRequestImpl { void on_event(const event_engine::Event& event); private: - /* * @brief Check if submenu name is valid * diff --git a/src/components/application_manager/include/application_manager/commands/mobile/add_sub_menu_response.h b/src/components/application_manager/include/application_manager/commands/mobile/add_sub_menu_response.h index 51d70cc615..4d71e5f017 100644 --- a/src/components/application_manager/include/application_manager/commands/mobile/add_sub_menu_response.h +++ b/src/components/application_manager/include/application_manager/commands/mobile/add_sub_menu_response.h @@ -51,7 +51,8 @@ class AddSubMenuResponse : public CommandResponseImpl { * * @param message Incoming SmartObject message **/ - AddSubMenuResponse(const MessageSharedPtr& message, ApplicationManager& application_manager); + AddSubMenuResponse(const MessageSharedPtr& message, + ApplicationManager& application_manager); /** * @brief AddSubMenuResponse class destructor diff --git a/src/components/application_manager/include/application_manager/commands/mobile/alert_maneuver_request.h b/src/components/application_manager/include/application_manager/commands/mobile/alert_maneuver_request.h index aacec08f12..03c0db83c4 100644 --- a/src/components/application_manager/include/application_manager/commands/mobile/alert_maneuver_request.h +++ b/src/components/application_manager/include/application_manager/commands/mobile/alert_maneuver_request.h @@ -53,7 +53,8 @@ class AlertManeuverRequest : public CommandRequestImpl { * * @param message Incoming SmartObject message **/ - AlertManeuverRequest(const MessageSharedPtr& message, ApplicationManager& application_manager); + AlertManeuverRequest(const MessageSharedPtr& message, + ApplicationManager& application_manager); /** * @brief AlertManeuverRequest class destructor @@ -81,8 +82,8 @@ class AlertManeuverRequest : public CommandRequestImpl { */ bool IsWhiteSpaceExist(); - mobile_apis::Result::eType tts_speak_result_code_; - mobile_apis::Result::eType navi_alert_maneuver_result_code_; + mobile_apis::Result::eType tts_speak_result_code_; + mobile_apis::Result::eType navi_alert_maneuver_result_code_; Pending pending_requests_; DISALLOW_COPY_AND_ASSIGN(AlertManeuverRequest); diff --git a/src/components/application_manager/include/application_manager/commands/mobile/alert_maneuver_response.h b/src/components/application_manager/include/application_manager/commands/mobile/alert_maneuver_response.h index 4209edcf5e..c02322e298 100644 --- a/src/components/application_manager/include/application_manager/commands/mobile/alert_maneuver_response.h +++ b/src/components/application_manager/include/application_manager/commands/mobile/alert_maneuver_response.h @@ -51,7 +51,8 @@ class AlertManeuverResponse : public CommandResponseImpl { * * @param message Incoming SmartObject message **/ - AlertManeuverResponse(const MessageSharedPtr& message, ApplicationManager& application_manager); + AlertManeuverResponse(const MessageSharedPtr& message, + ApplicationManager& application_manager); /** * @brief AlertManeuverResponse class destructor diff --git a/src/components/application_manager/include/application_manager/commands/mobile/alert_request.h b/src/components/application_manager/include/application_manager/commands/mobile/alert_request.h index 3061d87653..bc99665d82 100644 --- a/src/components/application_manager/include/application_manager/commands/mobile/alert_request.h +++ b/src/components/application_manager/include/application_manager/commands/mobile/alert_request.h @@ -52,7 +52,8 @@ class AlertRequest : public CommandRequestImpl { * * @param message Incoming SmartObject message **/ - AlertRequest(const MessageSharedPtr& message, ApplicationManager& application_manager); + AlertRequest(const MessageSharedPtr& message, + ApplicationManager& application_manager); /** * @brief AlertRequest class destructor @@ -71,7 +72,8 @@ class AlertRequest : public CommandRequestImpl { /* * @brief Will caled by request controller, when default will be expired. - * If Alert request has soft buttons, timeout response should not be sent to mobile + * If Alert request has soft buttons, timeout response should not be sent to + * mobile */ virtual void onTimeOut(); @@ -83,7 +85,6 @@ class AlertRequest : public CommandRequestImpl { void on_event(const event_engine::Event& event); protected: - private: /* * @brief Checks if request parameters are valid @@ -109,7 +110,8 @@ class AlertRequest : public CommandRequestImpl { * @param length_tts_chunks contains length of array * tts chunks. */ - void SendSpeakRequest(int32_t app_id, bool tts_chunks_exists, + void SendSpeakRequest(int32_t app_id, + bool tts_chunks_exists, size_t length_tts_chunks); /* @@ -124,14 +126,14 @@ class AlertRequest : public CommandRequestImpl { */ bool CheckStringsOfAlertRequest(); - bool awaiting_ui_alert_response_; - bool awaiting_tts_speak_response_; - bool awaiting_tts_stop_speaking_response_; - bool is_alert_succeeded_; - bool is_ui_alert_sent_; - mobile_apis::Result::eType alert_result_; - smart_objects::SmartObject alert_response_params_; - mobile_apis::Result::eType tts_speak_result_; + bool awaiting_ui_alert_response_; + bool awaiting_tts_speak_response_; + bool awaiting_tts_stop_speaking_response_; + bool is_alert_succeeded_; + bool is_ui_alert_sent_; + mobile_apis::Result::eType alert_result_; + smart_objects::SmartObject alert_response_params_; + mobile_apis::Result::eType tts_speak_result_; DISALLOW_COPY_AND_ASSIGN(AlertRequest); }; diff --git a/src/components/application_manager/include/application_manager/commands/mobile/alert_response.h b/src/components/application_manager/include/application_manager/commands/mobile/alert_response.h index a874a67aae..acac21d738 100644 --- a/src/components/application_manager/include/application_manager/commands/mobile/alert_response.h +++ b/src/components/application_manager/include/application_manager/commands/mobile/alert_response.h @@ -51,7 +51,8 @@ class AlertResponse : public CommandResponseImpl { * * @param message Incoming SmartObject message **/ - AlertResponse(const MessageSharedPtr& message, ApplicationManager& application_manager); + AlertResponse(const MessageSharedPtr& message, + ApplicationManager& application_manager); /** * @brief AlertResponse class destructor diff --git a/src/components/application_manager/include/application_manager/commands/mobile/change_registration_request.h b/src/components/application_manager/include/application_manager/commands/mobile/change_registration_request.h index a83fbd7e5c..c81ed0b5d3 100644 --- a/src/components/application_manager/include/application_manager/commands/mobile/change_registration_request.h +++ b/src/components/application_manager/include/application_manager/commands/mobile/change_registration_request.h @@ -57,7 +57,8 @@ class ChangeRegistrationRequest : public CommandRequestImpl { * * @param message Incoming SmartObject message **/ - ChangeRegistrationRequest(const MessageSharedPtr& message, ApplicationManager& application_manager); + ChangeRegistrationRequest(const MessageSharedPtr& message, + ApplicationManager& application_manager); /** * @brief ChangeRegistrationRequest class destructor diff --git a/src/components/application_manager/include/application_manager/commands/mobile/change_registration_response.h b/src/components/application_manager/include/application_manager/commands/mobile/change_registration_response.h index 247fb0192c..6ff3fd9a4a 100644 --- a/src/components/application_manager/include/application_manager/commands/mobile/change_registration_response.h +++ b/src/components/application_manager/include/application_manager/commands/mobile/change_registration_response.h @@ -51,7 +51,8 @@ class ChangeRegistrationResponse : public CommandResponseImpl { * * @param message Incoming SmartObject message **/ - ChangeRegistrationResponse(const MessageSharedPtr& message, ApplicationManager& application_manager); + ChangeRegistrationResponse(const MessageSharedPtr& message, + ApplicationManager& application_manager); /** * @brief ChangeRegistrationResponse class destructor diff --git a/src/components/application_manager/include/application_manager/commands/mobile/create_interaction_choice_set_request.h b/src/components/application_manager/include/application_manager/commands/mobile/create_interaction_choice_set_request.h index c77ffc3203..2a6e55f312 100644 --- a/src/components/application_manager/include/application_manager/commands/mobile/create_interaction_choice_set_request.h +++ b/src/components/application_manager/include/application_manager/commands/mobile/create_interaction_choice_set_request.h @@ -53,186 +53,185 @@ namespace commands { **/ class CreateInteractionChoiceSetRequest : public CommandRequestImpl { public: - /** - * @brief CreateInteractionChoiceSetRequest class constructor - * - * @param message Incoming SmartObject message - **/ - CreateInteractionChoiceSetRequest(const MessageSharedPtr& message, ApplicationManager& application_manager); - - /** - * @brief CreateInteractionChoiceSetRequest class destructor - **/ - virtual ~CreateInteractionChoiceSetRequest(); - - /** - * @brief Execute command - **/ - virtual void Run(); - + /** + * @brief CreateInteractionChoiceSetRequest class constructor + * + * @param message Incoming SmartObject message + **/ + CreateInteractionChoiceSetRequest(const MessageSharedPtr& message, + ApplicationManager& application_manager); + + /** + * @brief CreateInteractionChoiceSetRequest class destructor + **/ + virtual ~CreateInteractionChoiceSetRequest(); + + /** + * @brief Execute command + **/ + virtual void Run(); private: - /** - * @brief Interface method that is called whenever new event received - * - * @param event The received event - */ - virtual void on_event(const event_engine::Event& event); - - /** - * @brief Function is called by RequestController when request execution time - * has exceed it's limit - */ - virtual void onTimeOut(); - /** - * @brief DeleteChoices allows to walk through the sent commands collection - * in order to sent appropriate DeleteCommand request. - */ - void DeleteChoices(); - - /** - * @brief Calls after all responses from HMI were received. - * Terminates request and sends successful response to mobile - * if all responses were SUCCESS or calls DeleteChoices in other case. - */ - void OnAllHMIResponsesReceived(); - - /** - * @brief The VRCommand struct - * Collect minimum information about sent VR commands, for correctly - * processing deleting sent commands if error from HMI received - */ - struct VRCommandInfo { - VRCommandInfo() {} - VRCommandInfo(uint32_t cmd_id): - cmd_id_(cmd_id), - succesful_response_received_(false) {} - uint32_t cmd_id_; - bool succesful_response_received_; - }; - - typedef std::map<uint32_t, VRCommandInfo> SentCommandsMap; - SentCommandsMap sent_commands_map_; - - int32_t choice_set_id_; - size_t expected_chs_count_; - size_t received_chs_count_; - - /** - * @brief Flag for stop sending VR commands to HMI, in case one of responses - * failed - */ - volatile bool error_from_hmi_; - sync_primitives::Lock error_from_hmi_lock_; - - /** - * @brief Flag shows if request already was expired by timeout - */ - volatile bool is_timed_out_; - sync_primitives::Lock is_timed_out_lock_; - - sync_primitives::Lock vr_commands_lock_; - /* - * @brief Sends VR AddCommand request to HMI - * - * @param app_id Application ID - * - */ - void SendVRAddCommandRequests(ApplicationSharedPtr const app); - - /* - * @brief Checks incoming choiseSet params. - * @param app Registred mobile application - * - * @return Mobile result code - */ - mobile_apis::Result::eType CheckChoiceSet(ApplicationConstSharedPtr app); - - /* - * @brief Predicate for using with CheckChoiceSet method to compare choice ID param - * - * return TRUE if there is coincidence of choice ID, otherwise FALSE - */ - struct CoincidencePredicateChoiceID { - CoincidencePredicateChoiceID(const uint32_t newItem) - : newItem_(newItem) - {} - - bool operator()(smart_objects::SmartObject obj) { - return obj[strings::choice_id].asUInt() == newItem_; - } - - const uint32_t newItem_; - }; - - /* - * @brief Predicate for using with CheckChoiceSet method to compare menu name param - * - * return TRUE if there is coincidence of menu name, otherwise FALSE - */ - struct CoincidencePredicateMenuName { - CoincidencePredicateMenuName(const std::string& newItem) - : newItem_(newItem) - {}; - - bool operator()(smart_objects::SmartObject obj) { - return obj[strings::menu_name].asString() == newItem_; - } - - const std::string& newItem_; - }; - - /* - * @brief Predicate for using with CheckChoiceSet method to compare VR commands param - * - * return TRUE if there is coincidence of VR commands, otherwise FALSE - */ - struct CoincidencePredicateVRCommands { - CoincidencePredicateVRCommands( - const smart_objects::SmartObject& newItem): newItem_(newItem) {} - - bool operator()(smart_objects::SmartObject obj) { - return compareStr(obj, newItem_); - } - - const smart_objects::SmartObject& newItem_; - }; - - /* - * @brief Checks if incoming choice set doesn't has similar VR synonyms. - * - * @param choice1 Choice to compare - * @param choice2 Choice to compare - * - * return Return TRUE if there are similar VR synonyms in choice set, - * otherwise FALSE - */ - bool compareSynonyms( + /** + * @brief Interface method that is called whenever new event received + * + * @param event The received event + */ + virtual void on_event(const event_engine::Event& event); + + /** + * @brief Function is called by RequestController when request execution time + * has exceed it's limit + */ + virtual void onTimeOut(); + /** + * @brief DeleteChoices allows to walk through the sent commands collection + * in order to sent appropriate DeleteCommand request. + */ + void DeleteChoices(); + + /** + * @brief Calls after all responses from HMI were received. + * Terminates request and sends successful response to mobile + * if all responses were SUCCESS or calls DeleteChoices in other case. + */ + void OnAllHMIResponsesReceived(); + + /** + * @brief The VRCommand struct + * Collect minimum information about sent VR commands, for correctly + * processing deleting sent commands if error from HMI received + */ + struct VRCommandInfo { + VRCommandInfo() {} + VRCommandInfo(uint32_t cmd_id) + : cmd_id_(cmd_id), succesful_response_received_(false) {} + uint32_t cmd_id_; + bool succesful_response_received_; + }; + + typedef std::map<uint32_t, VRCommandInfo> SentCommandsMap; + SentCommandsMap sent_commands_map_; + + int32_t choice_set_id_; + size_t expected_chs_count_; + size_t received_chs_count_; + + /** + * @brief Flag for stop sending VR commands to HMI, in case one of responses + * failed + */ + volatile bool error_from_hmi_; + sync_primitives::Lock error_from_hmi_lock_; + + /** + * @brief Flag shows if request already was expired by timeout + */ + volatile bool is_timed_out_; + sync_primitives::Lock is_timed_out_lock_; + + sync_primitives::Lock vr_commands_lock_; + /* + * @brief Sends VR AddCommand request to HMI + * + * @param app_id Application ID + * + */ + void SendVRAddCommandRequests(ApplicationSharedPtr const app); + + /* + * @brief Checks incoming choiseSet params. + * @param app Registred mobile application + * + * @return Mobile result code + */ + mobile_apis::Result::eType CheckChoiceSet(ApplicationConstSharedPtr app); + + /* + * @brief Predicate for using with CheckChoiceSet method to compare choice ID + *param + * + * return TRUE if there is coincidence of choice ID, otherwise FALSE + */ + struct CoincidencePredicateChoiceID { + CoincidencePredicateChoiceID(const uint32_t newItem) : newItem_(newItem) {} + + bool operator()(smart_objects::SmartObject obj) { + return obj[strings::choice_id].asUInt() == newItem_; + } + + const uint32_t newItem_; + }; + + /* + * @brief Predicate for using with CheckChoiceSet method to compare menu name + *param + * + * return TRUE if there is coincidence of menu name, otherwise FALSE + */ + struct CoincidencePredicateMenuName { + CoincidencePredicateMenuName(const std::string& newItem) + : newItem_(newItem){}; + + bool operator()(smart_objects::SmartObject obj) { + return obj[strings::menu_name].asString() == newItem_; + } + + const std::string& newItem_; + }; + + /* + * @brief Predicate for using with CheckChoiceSet method to compare VR commands + *param + * + * return TRUE if there is coincidence of VR commands, otherwise FALSE + */ + struct CoincidencePredicateVRCommands { + CoincidencePredicateVRCommands(const smart_objects::SmartObject& newItem) + : newItem_(newItem) {} + + bool operator()(smart_objects::SmartObject obj) { + return compareStr(obj, newItem_); + } + + const smart_objects::SmartObject& newItem_; + }; + + /* + * @brief Checks if incoming choice set doesn't has similar VR synonyms. + * + * @param choice1 Choice to compare + * @param choice2 Choice to compare + * + * return Return TRUE if there are similar VR synonyms in choice set, + * otherwise FALSE + */ + bool compareSynonyms( const NsSmartDeviceLink::NsSmartObjects::SmartObject& choice1, const NsSmartDeviceLink::NsSmartObjects::SmartObject& choice2); - /* - * @brief Checks VR synonyms ignoring differences in case. - * - * @param str1 VR synonym to compare - * @param str2 VR synonym to compare - * - * return Return TRUE if there are similar VR synonyms in choice set, - * otherwise FALSE - */ - static bool compareStr( + /* + * @brief Checks VR synonyms ignoring differences in case. + * + * @param str1 VR synonym to compare + * @param str2 VR synonym to compare + * + * return Return TRUE if there are similar VR synonyms in choice set, + * otherwise FALSE + */ + static bool compareStr( const NsSmartDeviceLink::NsSmartObjects::SmartObject& str1, const NsSmartDeviceLink::NsSmartObjects::SmartObject& str2); - /** - * @brief Checks choice set params(menuName, tertiaryText, ...) - * When type is String there is a check on the contents \t\n \\t \\n - * @param choice_set which must check - * @return if choice_set contains \t\n \\t \\n return TRUE, FALSE otherwise - */ - bool IsWhiteSpaceExist(const smart_objects::SmartObject& choice_set); + /** + * @brief Checks choice set params(menuName, tertiaryText, ...) + * When type is String there is a check on the contents \t\n \\t \\n + * @param choice_set which must check + * @return if choice_set contains \t\n \\t \\n return TRUE, FALSE otherwise + */ + bool IsWhiteSpaceExist(const smart_objects::SmartObject& choice_set); - DISALLOW_COPY_AND_ASSIGN(CreateInteractionChoiceSetRequest); + DISALLOW_COPY_AND_ASSIGN(CreateInteractionChoiceSetRequest); }; } // namespace commands diff --git a/src/components/application_manager/include/application_manager/commands/mobile/create_interaction_choice_set_response.h b/src/components/application_manager/include/application_manager/commands/mobile/create_interaction_choice_set_response.h index 589402209b..6a7faf705c 100644 --- a/src/components/application_manager/include/application_manager/commands/mobile/create_interaction_choice_set_response.h +++ b/src/components/application_manager/include/application_manager/commands/mobile/create_interaction_choice_set_response.h @@ -51,7 +51,8 @@ class CreateInteractionChoiceSetResponse : public CommandResponseImpl { * * @param message Incoming SmartObject message **/ - CreateInteractionChoiceSetResponse(const MessageSharedPtr& message, ApplicationManager& application_manager); + CreateInteractionChoiceSetResponse(const MessageSharedPtr& message, + ApplicationManager& application_manager); /** * @brief CreateInteractionChoiceSetResponse class destructor diff --git a/src/components/application_manager/include/application_manager/commands/mobile/delete_command_request.h b/src/components/application_manager/include/application_manager/commands/mobile/delete_command_request.h index 6961911889..6a19014c96 100644 --- a/src/components/application_manager/include/application_manager/commands/mobile/delete_command_request.h +++ b/src/components/application_manager/include/application_manager/commands/mobile/delete_command_request.h @@ -51,7 +51,8 @@ class DeleteCommandRequest : public CommandRequestImpl { * * @param message Incoming SmartObject message **/ - DeleteCommandRequest(const MessageSharedPtr& message, ApplicationManager& application_manager); + DeleteCommandRequest(const MessageSharedPtr& message, + ApplicationManager& application_manager); /** * @brief DeleteCommandRequest class destructor @@ -71,7 +72,6 @@ class DeleteCommandRequest : public CommandRequestImpl { void on_event(const event_engine::Event& event); private: - DISALLOW_COPY_AND_ASSIGN(DeleteCommandRequest); /* diff --git a/src/components/application_manager/include/application_manager/commands/mobile/delete_command_response.h b/src/components/application_manager/include/application_manager/commands/mobile/delete_command_response.h index 0780f81255..b61035ca1b 100644 --- a/src/components/application_manager/include/application_manager/commands/mobile/delete_command_response.h +++ b/src/components/application_manager/include/application_manager/commands/mobile/delete_command_response.h @@ -51,7 +51,8 @@ class DeleteCommandResponse : public CommandResponseImpl { * * @param message Incoming SmartObject message **/ - DeleteCommandResponse(const MessageSharedPtr& message, ApplicationManager& application_manager); + DeleteCommandResponse(const MessageSharedPtr& message, + ApplicationManager& application_manager); /** * @brief DeleteCommandResponse class destructor diff --git a/src/components/application_manager/include/application_manager/commands/mobile/delete_file_request.h b/src/components/application_manager/include/application_manager/commands/mobile/delete_file_request.h index 2b74ee150b..adaf2686bc 100644 --- a/src/components/application_manager/include/application_manager/commands/mobile/delete_file_request.h +++ b/src/components/application_manager/include/application_manager/commands/mobile/delete_file_request.h @@ -53,7 +53,8 @@ class DeleteFileRequest : public CommandRequestImpl { * * @param message Incoming SmartObject message **/ - DeleteFileRequest(const MessageSharedPtr& message, ApplicationManager& application_manager); + DeleteFileRequest(const MessageSharedPtr& message, + ApplicationManager& application_manager); /** * @brief DeleteFileRequest class destructor diff --git a/src/components/application_manager/include/application_manager/commands/mobile/delete_file_response.h b/src/components/application_manager/include/application_manager/commands/mobile/delete_file_response.h index c7ec60e3ba..e001e46a22 100644 --- a/src/components/application_manager/include/application_manager/commands/mobile/delete_file_response.h +++ b/src/components/application_manager/include/application_manager/commands/mobile/delete_file_response.h @@ -51,7 +51,8 @@ class DeleteFileResponse : public CommandResponseImpl { * * @param message Incoming SmartObject message **/ - DeleteFileResponse(const MessageSharedPtr& message, ApplicationManager& application_manager); + DeleteFileResponse(const MessageSharedPtr& message, + ApplicationManager& application_manager); /** * @brief DeleteFileResponse class destructor diff --git a/src/components/application_manager/include/application_manager/commands/mobile/delete_interaction_choice_set_request.h b/src/components/application_manager/include/application_manager/commands/mobile/delete_interaction_choice_set_request.h index 0eee4e8dc9..716a1d82de 100644 --- a/src/components/application_manager/include/application_manager/commands/mobile/delete_interaction_choice_set_request.h +++ b/src/components/application_manager/include/application_manager/commands/mobile/delete_interaction_choice_set_request.h @@ -52,7 +52,8 @@ class DeleteInteractionChoiceSetRequest : public CommandRequestImpl { * * @param message Incoming SmartObject message **/ - DeleteInteractionChoiceSetRequest(const MessageSharedPtr& message, ApplicationManager& application_manager); + DeleteInteractionChoiceSetRequest(const MessageSharedPtr& message, + ApplicationManager& application_manager); /** * @brief DeleteInteractionChoiceSetRequest class destructor @@ -65,7 +66,6 @@ class DeleteInteractionChoiceSetRequest : public CommandRequestImpl { virtual void Run(); private: - /* * @brief Check if requested choice set ID in use by perform interaction * diff --git a/src/components/application_manager/include/application_manager/commands/mobile/delete_interaction_choice_set_response.h b/src/components/application_manager/include/application_manager/commands/mobile/delete_interaction_choice_set_response.h index 1888f1d4a3..86e20bc6d4 100644 --- a/src/components/application_manager/include/application_manager/commands/mobile/delete_interaction_choice_set_response.h +++ b/src/components/application_manager/include/application_manager/commands/mobile/delete_interaction_choice_set_response.h @@ -51,7 +51,8 @@ class DeleteInteractionChoiceSetResponse : public CommandResponseImpl { * * @param message Incoming SmartObject message **/ - DeleteInteractionChoiceSetResponse(const MessageSharedPtr& message, ApplicationManager& application_manager); + DeleteInteractionChoiceSetResponse(const MessageSharedPtr& message, + ApplicationManager& application_manager); /** * @brief DeleteInteractionChoiceSetResponse class destructor diff --git a/src/components/application_manager/include/application_manager/commands/mobile/delete_sub_menu_request.h b/src/components/application_manager/include/application_manager/commands/mobile/delete_sub_menu_request.h index a6bb2f233d..7c48de5d8e 100644 --- a/src/components/application_manager/include/application_manager/commands/mobile/delete_sub_menu_request.h +++ b/src/components/application_manager/include/application_manager/commands/mobile/delete_sub_menu_request.h @@ -52,7 +52,8 @@ class DeleteSubMenuRequest : public CommandRequestImpl { * * @param message Incoming SmartObject message **/ - DeleteSubMenuRequest(const MessageSharedPtr& message, ApplicationManager& application_manager); + DeleteSubMenuRequest(const MessageSharedPtr& message, + ApplicationManager& application_manager); /** * @brief DeleteSubMenuRequest class destructor diff --git a/src/components/application_manager/include/application_manager/commands/mobile/delete_sub_menu_response.h b/src/components/application_manager/include/application_manager/commands/mobile/delete_sub_menu_response.h index 5d65685785..76232aee4b 100644 --- a/src/components/application_manager/include/application_manager/commands/mobile/delete_sub_menu_response.h +++ b/src/components/application_manager/include/application_manager/commands/mobile/delete_sub_menu_response.h @@ -51,7 +51,8 @@ class DeleteSubMenuResponse : public CommandResponseImpl { * * @param message Incoming SmartObject message **/ - DeleteSubMenuResponse(const MessageSharedPtr& message, ApplicationManager& application_manager); + DeleteSubMenuResponse(const MessageSharedPtr& message, + ApplicationManager& application_manager); /** * @brief DeleteSubMenuResponse class destructor diff --git a/src/components/application_manager/include/application_manager/commands/mobile/diagnostic_message_request.h b/src/components/application_manager/include/application_manager/commands/mobile/diagnostic_message_request.h index 888d7d1ee8..34c8b0e872 100644 --- a/src/components/application_manager/include/application_manager/commands/mobile/diagnostic_message_request.h +++ b/src/components/application_manager/include/application_manager/commands/mobile/diagnostic_message_request.h @@ -51,7 +51,8 @@ class DiagnosticMessageRequest : public CommandRequestImpl { * * @param message Incoming SmartObject message **/ - DiagnosticMessageRequest(const MessageSharedPtr& message, ApplicationManager& application_manager); + DiagnosticMessageRequest(const MessageSharedPtr& message, + ApplicationManager& application_manager); /** * @brief DiagnosticMessageRequest class destructor diff --git a/src/components/application_manager/include/application_manager/commands/mobile/diagnostic_message_response.h b/src/components/application_manager/include/application_manager/commands/mobile/diagnostic_message_response.h index d24b3f4428..439f11a57e 100644 --- a/src/components/application_manager/include/application_manager/commands/mobile/diagnostic_message_response.h +++ b/src/components/application_manager/include/application_manager/commands/mobile/diagnostic_message_response.h @@ -51,7 +51,8 @@ class DiagnosticMessageResponse : public CommandResponseImpl { * * @param message Incoming SmartObject message **/ - DiagnosticMessageResponse(const MessageSharedPtr& message, ApplicationManager& application_manager); + DiagnosticMessageResponse(const MessageSharedPtr& message, + ApplicationManager& application_manager); /** * @brief DiagnosticMessageResponse class destructor diff --git a/src/components/application_manager/include/application_manager/commands/mobile/dial_number_request.h b/src/components/application_manager/include/application_manager/commands/mobile/dial_number_request.h index 700e01b484..1b945fc5fb 100644 --- a/src/components/application_manager/include/application_manager/commands/mobile/dial_number_request.h +++ b/src/components/application_manager/include/application_manager/commands/mobile/dial_number_request.h @@ -48,7 +48,8 @@ class DialNumberRequest : public CommandRequestImpl { /** * \brief DialNumberRequest class constructor **/ - DialNumberRequest(const MessageSharedPtr& message, ApplicationManager& application_manager); + DialNumberRequest(const MessageSharedPtr& message, + ApplicationManager& application_manager); /** * \brief DialNumberRequest class destructor @@ -58,11 +59,11 @@ class DialNumberRequest : public CommandRequestImpl { /** * @brief Initialize request params **/ - bool Init() OVERRIDE; + bool Init() OVERRIDE; - /** - * @brief Execute command - **/ + /** + * @brief Execute command + **/ void Run() OVERRIDE; /** @@ -73,13 +74,12 @@ class DialNumberRequest : public CommandRequestImpl { void on_event(const event_engine::Event& event); private: - /** * @brief Removes from number param all characters * except the + character and digits. * */ - void StripNumberParam(std::string &number); + void StripNumberParam(std::string& number); DISALLOW_COPY_AND_ASSIGN(DialNumberRequest); }; diff --git a/src/components/application_manager/include/application_manager/commands/mobile/dial_number_response.h b/src/components/application_manager/include/application_manager/commands/mobile/dial_number_response.h index fcb6bf865b..4a6980bd04 100644 --- a/src/components/application_manager/include/application_manager/commands/mobile/dial_number_response.h +++ b/src/components/application_manager/include/application_manager/commands/mobile/dial_number_response.h @@ -51,7 +51,8 @@ class DialNumberResponse : public CommandResponseImpl { * * @param message Incoming SmartObject message **/ - DialNumberResponse(const MessageSharedPtr& message, ApplicationManager& application_manager); + DialNumberResponse(const MessageSharedPtr& message, + ApplicationManager& application_manager); /** * @brief DialNumberResponse class destructor diff --git a/src/components/application_manager/include/application_manager/commands/mobile/end_audio_pass_thru_request.h b/src/components/application_manager/include/application_manager/commands/mobile/end_audio_pass_thru_request.h index cc01b9c176..add6d2497e 100644 --- a/src/components/application_manager/include/application_manager/commands/mobile/end_audio_pass_thru_request.h +++ b/src/components/application_manager/include/application_manager/commands/mobile/end_audio_pass_thru_request.h @@ -51,7 +51,8 @@ class EndAudioPassThruRequest : public CommandRequestImpl { * * @param message Incoming SmartObject message **/ - EndAudioPassThruRequest(const MessageSharedPtr& message, ApplicationManager& application_manager); + EndAudioPassThruRequest(const MessageSharedPtr& message, + ApplicationManager& application_manager); /** * @brief EndAudioPassThruRequest class destructor diff --git a/src/components/application_manager/include/application_manager/commands/mobile/end_audio_pass_thru_response.h b/src/components/application_manager/include/application_manager/commands/mobile/end_audio_pass_thru_response.h index 124361f0d5..381a397fbd 100644 --- a/src/components/application_manager/include/application_manager/commands/mobile/end_audio_pass_thru_response.h +++ b/src/components/application_manager/include/application_manager/commands/mobile/end_audio_pass_thru_response.h @@ -51,7 +51,8 @@ class EndAudioPassThruResponse : public CommandResponseImpl { * * @param message Incoming SmartObject message **/ - EndAudioPassThruResponse(const MessageSharedPtr& message, ApplicationManager& application_manager); + EndAudioPassThruResponse(const MessageSharedPtr& message, + ApplicationManager& application_manager); /** * @brief EndAudioPassThruResponse class destructor diff --git a/src/components/application_manager/include/application_manager/commands/mobile/generic_response.h b/src/components/application_manager/include/application_manager/commands/mobile/generic_response.h index 8eb257c356..9ccef12152 100644 --- a/src/components/application_manager/include/application_manager/commands/mobile/generic_response.h +++ b/src/components/application_manager/include/application_manager/commands/mobile/generic_response.h @@ -45,15 +45,14 @@ class GenericResponse : public CommandResponseImpl { /** * \brief GenericResponse class constructor **/ - GenericResponse(const MessageSharedPtr& message, ApplicationManager& application_manager) - : CommandResponseImpl(message, application_manager) { - } + GenericResponse(const MessageSharedPtr& message, + ApplicationManager& application_manager) + : CommandResponseImpl(message, application_manager) {} /** * \brief GenericResponse class destructor **/ - virtual ~GenericResponse() { - } + virtual ~GenericResponse() {} /** * @brief Execute command diff --git a/src/components/application_manager/include/application_manager/commands/mobile/get_dtcs_request.h b/src/components/application_manager/include/application_manager/commands/mobile/get_dtcs_request.h index af3958699a..d962937e39 100644 --- a/src/components/application_manager/include/application_manager/commands/mobile/get_dtcs_request.h +++ b/src/components/application_manager/include/application_manager/commands/mobile/get_dtcs_request.h @@ -51,7 +51,8 @@ class GetDTCsRequest : public CommandRequestImpl { * * @param message Incoming SmartObject message **/ - GetDTCsRequest(const MessageSharedPtr& message, ApplicationManager& application_manager); + GetDTCsRequest(const MessageSharedPtr& message, + ApplicationManager& application_manager); /** * @brief GetDTCsRequest class destructor diff --git a/src/components/application_manager/include/application_manager/commands/mobile/get_dtcs_response.h b/src/components/application_manager/include/application_manager/commands/mobile/get_dtcs_response.h index ed3600da3e..abe970d60f 100644 --- a/src/components/application_manager/include/application_manager/commands/mobile/get_dtcs_response.h +++ b/src/components/application_manager/include/application_manager/commands/mobile/get_dtcs_response.h @@ -51,7 +51,8 @@ class GetDTCsResponse : public CommandResponseImpl { * * @param message Incoming SmartObject message **/ - GetDTCsResponse(const MessageSharedPtr& message, ApplicationManager& application_manager); + GetDTCsResponse(const MessageSharedPtr& message, + ApplicationManager& application_manager); /** * @brief GetDTCsResponse class destructor diff --git a/src/components/application_manager/include/application_manager/commands/mobile/get_vehicle_data_request.h b/src/components/application_manager/include/application_manager/commands/mobile/get_vehicle_data_request.h index 9fd8c9ddbe..eda77e59b0 100644 --- a/src/components/application_manager/include/application_manager/commands/mobile/get_vehicle_data_request.h +++ b/src/components/application_manager/include/application_manager/commands/mobile/get_vehicle_data_request.h @@ -53,7 +53,8 @@ class GetVehicleDataRequest : public CommandRequestImpl { * * @param message Incoming SmartObject message **/ - GetVehicleDataRequest(const MessageSharedPtr& message, ApplicationManager& application_manager); + GetVehicleDataRequest(const MessageSharedPtr& message, + ApplicationManager& application_manager); /** * @brief GetVehicleDataRequest class destructor @@ -65,7 +66,6 @@ class GetVehicleDataRequest : public CommandRequestImpl { **/ virtual void Run(); - protected: virtual void on_event(const event_engine::Event& event); @@ -83,7 +83,7 @@ class GetVehicleDataRequest : public CommandRequestImpl { typedef std::vector<HmiRequest> HmiRequests; HmiRequests hmi_requests_; -#endif // #ifdef HMI_DBUS_API +#endif // #ifdef HMI_DBUS_API DISALLOW_COPY_AND_ASSIGN(GetVehicleDataRequest); }; diff --git a/src/components/application_manager/include/application_manager/commands/mobile/get_vehicle_data_response.h b/src/components/application_manager/include/application_manager/commands/mobile/get_vehicle_data_response.h index 0a3d48a0e4..4fadaf2b01 100644 --- a/src/components/application_manager/include/application_manager/commands/mobile/get_vehicle_data_response.h +++ b/src/components/application_manager/include/application_manager/commands/mobile/get_vehicle_data_response.h @@ -51,7 +51,8 @@ class GetVehicleDataResponse : public CommandResponseImpl { * * @param message Incoming SmartObject message **/ - GetVehicleDataResponse(const MessageSharedPtr& message, ApplicationManager& application_manager); + GetVehicleDataResponse(const MessageSharedPtr& message, + ApplicationManager& application_manager); /** * @brief GetVehicleDataResponse class destructor diff --git a/src/components/application_manager/include/application_manager/commands/mobile/get_way_points_request.h b/src/components/application_manager/include/application_manager/commands/mobile/get_way_points_request.h index 5d77949352..bf23121177 100644 --- a/src/components/application_manager/include/application_manager/commands/mobile/get_way_points_request.h +++ b/src/components/application_manager/include/application_manager/commands/mobile/get_way_points_request.h @@ -43,7 +43,7 @@ namespace commands { * @brief GetWayPointsRequest command class **/ class GetWayPointsRequest : public CommandRequestImpl { -public: + public: /** * \brief GetWayPointsRequest class constructor **/ @@ -65,12 +65,13 @@ public: * @param event The received event */ virtual void on_event(const event_engine::Event& event); -private: + + private: DISALLOW_COPY_AND_ASSIGN(GetWayPointsRequest); }; -} // namespace commands +} // namespace commands -} // namespace application_manager +} // namespace application_manager -#endif // SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_MOBILE_GET_WAY_POINTS_REQUEST_H_ +#endif // SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_MOBILE_GET_WAY_POINTS_REQUEST_H_ diff --git a/src/components/application_manager/include/application_manager/commands/mobile/get_way_points_response.h b/src/components/application_manager/include/application_manager/commands/mobile/get_way_points_response.h index 51bfdb5f83..cb4f840763 100644 --- a/src/components/application_manager/include/application_manager/commands/mobile/get_way_points_response.h +++ b/src/components/application_manager/include/application_manager/commands/mobile/get_way_points_response.h @@ -44,7 +44,7 @@ namespace commands { * @brief GetWayPointsResponse command class **/ class GetWayPointsResponse : public CommandResponseImpl { -public: + public: /** * \brief GetWayPointsResponse class constructor **/ @@ -60,12 +60,13 @@ public: * @brief Execute command **/ virtual void Run() OVERRIDE; -private: + + private: DISALLOW_COPY_AND_ASSIGN(GetWayPointsResponse); }; -} // namespace commands +} // namespace commands -} // namespace application_manager +} // namespace application_manager -#endif // SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_MOBILE_GET_WAY_POINTS_RESPONSE_H_ +#endif // SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_MOBILE_GET_WAY_POINTS_RESPONSE_H_ diff --git a/src/components/application_manager/include/application_manager/commands/mobile/list_files_request.h b/src/components/application_manager/include/application_manager/commands/mobile/list_files_request.h index 7bfeb5ba3b..d8d28b7e9d 100644 --- a/src/components/application_manager/include/application_manager/commands/mobile/list_files_request.h +++ b/src/components/application_manager/include/application_manager/commands/mobile/list_files_request.h @@ -51,7 +51,8 @@ class ListFilesRequest : public CommandRequestImpl { * * @param message Incoming SmartObject message **/ - ListFilesRequest(const MessageSharedPtr& message, ApplicationManager& application_manager); + ListFilesRequest(const MessageSharedPtr& message, + ApplicationManager& application_manager); /** * @brief ListFilesRequest class destructor diff --git a/src/components/application_manager/include/application_manager/commands/mobile/list_files_response.h b/src/components/application_manager/include/application_manager/commands/mobile/list_files_response.h index fade4cbc3b..a211ee5968 100644 --- a/src/components/application_manager/include/application_manager/commands/mobile/list_files_response.h +++ b/src/components/application_manager/include/application_manager/commands/mobile/list_files_response.h @@ -51,7 +51,8 @@ class ListFilesResponse : public CommandResponseImpl { * * @param message Incoming SmartObject message **/ - ListFilesResponse(const MessageSharedPtr& message, ApplicationManager& application_manager); + ListFilesResponse(const MessageSharedPtr& message, + ApplicationManager& application_manager); /** * @brief ListFilesResponse class destructor diff --git a/src/components/application_manager/include/application_manager/commands/mobile/on_audio_pass_thru_notification.h b/src/components/application_manager/include/application_manager/commands/mobile/on_audio_pass_thru_notification.h index 2db99f9984..b74d8fbe41 100644 --- a/src/components/application_manager/include/application_manager/commands/mobile/on_audio_pass_thru_notification.h +++ b/src/components/application_manager/include/application_manager/commands/mobile/on_audio_pass_thru_notification.h @@ -42,7 +42,8 @@ namespace application_manager { namespace commands { /** - * @brief OnAudioPassThruNotification class used to send notification with binary data written from + * @brief OnAudioPassThruNotification class used to send notification with + *binary data written from * microphone to mobile device while PerformAudioPassThru is active. **/ class OnAudioPassThruNotification : public CommandNotificationImpl { @@ -52,7 +53,8 @@ class OnAudioPassThruNotification : public CommandNotificationImpl { * * @param message Incoming SmartObject message **/ - OnAudioPassThruNotification(const MessageSharedPtr& message, ApplicationManager& application_manager); + OnAudioPassThruNotification(const MessageSharedPtr& message, + ApplicationManager& application_manager); /** * @brief OnAudioPassThruNotification class destructor diff --git a/src/components/application_manager/include/application_manager/commands/mobile/on_button_event_notification.h b/src/components/application_manager/include/application_manager/commands/mobile/on_button_event_notification.h index 04b6fdc767..80355993e1 100644 --- a/src/components/application_manager/include/application_manager/commands/mobile/on_button_event_notification.h +++ b/src/components/application_manager/include/application_manager/commands/mobile/on_button_event_notification.h @@ -55,7 +55,8 @@ class OnButtonEventNotification : public CommandNotificationImpl { * * @param message Incoming SmartObject message **/ - OnButtonEventNotification(const MessageSharedPtr& message, ApplicationManager& application_manager); + OnButtonEventNotification(const MessageSharedPtr& message, + ApplicationManager& application_manager); /** * @brief OnButtonEventNotification class destructor diff --git a/src/components/application_manager/include/application_manager/commands/mobile/on_button_press_notification.h b/src/components/application_manager/include/application_manager/commands/mobile/on_button_press_notification.h index 91f66b54b3..1443e58a70 100644 --- a/src/components/application_manager/include/application_manager/commands/mobile/on_button_press_notification.h +++ b/src/components/application_manager/include/application_manager/commands/mobile/on_button_press_notification.h @@ -55,7 +55,8 @@ class OnButtonPressNotification : public CommandNotificationImpl { * * @param message Incoming SmartObject message **/ - OnButtonPressNotification(const MessageSharedPtr& message, ApplicationManager& application_manager); + OnButtonPressNotification(const MessageSharedPtr& message, + ApplicationManager& application_manager); /** * @brief OnButtonEventCommand class destructor diff --git a/src/components/application_manager/include/application_manager/commands/mobile/on_command_notification.h b/src/components/application_manager/include/application_manager/commands/mobile/on_command_notification.h index c983555fa7..3f9a0ad6c2 100644 --- a/src/components/application_manager/include/application_manager/commands/mobile/on_command_notification.h +++ b/src/components/application_manager/include/application_manager/commands/mobile/on_command_notification.h @@ -54,7 +54,8 @@ class OnCommandNotification : public CommandNotificationImpl { * * @param message Incoming SmartObject message **/ - OnCommandNotification(const MessageSharedPtr& message, ApplicationManager& application_manager); + OnCommandNotification(const MessageSharedPtr& message, + ApplicationManager& application_manager); /** * @brief OnCommandNotification class destructor @@ -65,6 +66,7 @@ class OnCommandNotification : public CommandNotificationImpl { * @brief Execute command **/ virtual void Run(); + private: DISALLOW_COPY_AND_ASSIGN(OnCommandNotification); }; diff --git a/src/components/application_manager/include/application_manager/commands/mobile/on_driver_distraction_notification.h b/src/components/application_manager/include/application_manager/commands/mobile/on_driver_distraction_notification.h index 0408b2b918..ee3c19c707 100644 --- a/src/components/application_manager/include/application_manager/commands/mobile/on_driver_distraction_notification.h +++ b/src/components/application_manager/include/application_manager/commands/mobile/on_driver_distraction_notification.h @@ -53,7 +53,8 @@ class OnDriverDistractionNotification : public CommandNotificationImpl { * * @param message Incoming SmartObject message **/ - OnDriverDistractionNotification(const MessageSharedPtr& message, ApplicationManager& application_manager); + OnDriverDistractionNotification(const MessageSharedPtr& message, + ApplicationManager& application_manager); /** * @brief OnDriverDistractionNotification class destructor diff --git a/src/components/application_manager/include/application_manager/commands/mobile/on_hash_change_notification.h b/src/components/application_manager/include/application_manager/commands/mobile/on_hash_change_notification.h index 779cc37364..9f9fad16d4 100644 --- a/src/components/application_manager/include/application_manager/commands/mobile/on_hash_change_notification.h +++ b/src/components/application_manager/include/application_manager/commands/mobile/on_hash_change_notification.h @@ -52,7 +52,8 @@ class OnHashChangeNotification : public CommandNotificationImpl { * * @param message Incoming SmartObject message **/ - OnHashChangeNotification(const MessageSharedPtr& message, ApplicationManager& application_manager); + OnHashChangeNotification(const MessageSharedPtr& message, + ApplicationManager& application_manager); /** * @brief OnHashChangeNotification class destructor @@ -68,7 +69,7 @@ class OnHashChangeNotification : public CommandNotificationImpl { DISALLOW_COPY_AND_ASSIGN(OnHashChangeNotification); }; -} // namespace mobile +} // namespace mobile } // namespace commands } // namespace application_manager diff --git a/src/components/application_manager/include/application_manager/commands/mobile/on_hmi_status_notification.h b/src/components/application_manager/include/application_manager/commands/mobile/on_hmi_status_notification.h index ea2b949048..a82182eea0 100644 --- a/src/components/application_manager/include/application_manager/commands/mobile/on_hmi_status_notification.h +++ b/src/components/application_manager/include/application_manager/commands/mobile/on_hmi_status_notification.h @@ -51,7 +51,8 @@ class OnHMIStatusNotification : public CommandNotificationImpl { * * @param message Incoming SmartObject message **/ - OnHMIStatusNotification(const MessageSharedPtr& message, ApplicationManager& application_manager); + OnHMIStatusNotification(const MessageSharedPtr& message, + ApplicationManager& application_manager); /** * @brief OnHMIStatusNotification class destructor @@ -63,7 +64,7 @@ class OnHMIStatusNotification : public CommandNotificationImpl { **/ virtual void Run(); -private: + private: DISALLOW_COPY_AND_ASSIGN(OnHMIStatusNotification); }; diff --git a/src/components/application_manager/include/application_manager/commands/mobile/on_hmi_status_notification_from_mobile.h b/src/components/application_manager/include/application_manager/commands/mobile/on_hmi_status_notification_from_mobile.h index 73700e52c3..878f4fa720 100644 --- a/src/components/application_manager/include/application_manager/commands/mobile/on_hmi_status_notification_from_mobile.h +++ b/src/components/application_manager/include/application_manager/commands/mobile/on_hmi_status_notification_from_mobile.h @@ -46,8 +46,8 @@ namespace commands { /** * @brief OnHMIStatusNotificationFromMobile class **/ -class OnHMIStatusNotificationFromMobile : - public CommandNotificationFromMobileImpl { +class OnHMIStatusNotificationFromMobile + : public CommandNotificationFromMobileImpl { public: /** * @brief OnHMIStatusNotificationFromMobile class constructor @@ -55,7 +55,7 @@ class OnHMIStatusNotificationFromMobile : * @param message Incoming SmartObject message **/ OnHMIStatusNotificationFromMobile(const MessageSharedPtr& message, - ApplicationManager& application_manager); + ApplicationManager& application_manager); /** * @brief OnHMIStatusNotificationFromMobile class destructor @@ -67,7 +67,7 @@ class OnHMIStatusNotificationFromMobile : **/ virtual void Run(); -private: + private: DISALLOW_COPY_AND_ASSIGN(OnHMIStatusNotificationFromMobile); }; diff --git a/src/components/application_manager/include/application_manager/commands/mobile/on_keyboard_input_notification.h b/src/components/application_manager/include/application_manager/commands/mobile/on_keyboard_input_notification.h index 77036e2856..911ca70cdf 100644 --- a/src/components/application_manager/include/application_manager/commands/mobile/on_keyboard_input_notification.h +++ b/src/components/application_manager/include/application_manager/commands/mobile/on_keyboard_input_notification.h @@ -53,7 +53,8 @@ class OnKeyBoardInputNotification : public CommandNotificationImpl { * * @param message Incoming SmartObject message **/ - OnKeyBoardInputNotification(const MessageSharedPtr& message, ApplicationManager& application_manager); + OnKeyBoardInputNotification(const MessageSharedPtr& message, + ApplicationManager& application_manager); /** * @brief OnKeyBoardInputNotification class destructor diff --git a/src/components/application_manager/include/application_manager/commands/mobile/on_language_change_notification.h b/src/components/application_manager/include/application_manager/commands/mobile/on_language_change_notification.h index ac04a81801..c62652ff67 100644 --- a/src/components/application_manager/include/application_manager/commands/mobile/on_language_change_notification.h +++ b/src/components/application_manager/include/application_manager/commands/mobile/on_language_change_notification.h @@ -51,7 +51,8 @@ class OnLanguageChangeNotification : public CommandNotificationImpl { * * @param message Incoming SmartObject message **/ - OnLanguageChangeNotification(const MessageSharedPtr& message, ApplicationManager& application_manager); + OnLanguageChangeNotification(const MessageSharedPtr& message, + ApplicationManager& application_manager); /** * @brief OnLanguageChangeNotification class destructor diff --git a/src/components/application_manager/include/application_manager/commands/mobile/on_permissions_change_notification.h b/src/components/application_manager/include/application_manager/commands/mobile/on_permissions_change_notification.h index 88a1443ffa..d5f7aa96b8 100644 --- a/src/components/application_manager/include/application_manager/commands/mobile/on_permissions_change_notification.h +++ b/src/components/application_manager/include/application_manager/commands/mobile/on_permissions_change_notification.h @@ -51,7 +51,8 @@ class OnPermissionsChangeNotification : public CommandNotificationImpl { * * @param message Incoming SmartObject message **/ - OnPermissionsChangeNotification(const MessageSharedPtr& message, ApplicationManager& application_manager); + OnPermissionsChangeNotification(const MessageSharedPtr& message, + ApplicationManager& application_manager); /** * @brief OnPermissionsChangeNotification class destructor diff --git a/src/components/application_manager/include/application_manager/commands/mobile/on_system_request_notification.h b/src/components/application_manager/include/application_manager/commands/mobile/on_system_request_notification.h index e45b332386..54b23f6ba3 100644 --- a/src/components/application_manager/include/application_manager/commands/mobile/on_system_request_notification.h +++ b/src/components/application_manager/include/application_manager/commands/mobile/on_system_request_notification.h @@ -34,7 +34,6 @@ #ifndef SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_ON_SYSTEM_REQUEST_NOTIFICATION_H_ #define SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_ON_SYSTEM_REQUEST_NOTIFICATION_H_ - #include "application_manager/commands/command_notification_impl.h" namespace application_manager { @@ -53,7 +52,8 @@ class OnSystemRequestNotification : public CommandNotificationImpl { * * @param message Incoming SmartObject message **/ - OnSystemRequestNotification(const MessageSharedPtr& message, ApplicationManager& application_manager); + OnSystemRequestNotification(const MessageSharedPtr& message, + ApplicationManager& application_manager); /** * @brief OnSystemRequestNotification class destructor @@ -64,7 +64,8 @@ class OnSystemRequestNotification : public CommandNotificationImpl { * @brief Execute command **/ virtual void Run(); - private: + + private: DISALLOW_COPY_AND_ASSIGN(OnSystemRequestNotification); }; diff --git a/src/components/application_manager/include/application_manager/commands/mobile/on_tbt_client_state_notification.h b/src/components/application_manager/include/application_manager/commands/mobile/on_tbt_client_state_notification.h index b2aac1543b..e7b895dceb 100644 --- a/src/components/application_manager/include/application_manager/commands/mobile/on_tbt_client_state_notification.h +++ b/src/components/application_manager/include/application_manager/commands/mobile/on_tbt_client_state_notification.h @@ -51,7 +51,8 @@ class OnTBTClientStateNotification : public CommandNotificationImpl { * * @param message Incoming SmartObject message **/ - OnTBTClientStateNotification(const MessageSharedPtr& message, ApplicationManager& application_manager); + OnTBTClientStateNotification(const MessageSharedPtr& message, + ApplicationManager& application_manager); /** * @brief OnTBTClientStateNotification class destructor diff --git a/src/components/application_manager/include/application_manager/commands/mobile/on_touch_event_notification.h b/src/components/application_manager/include/application_manager/commands/mobile/on_touch_event_notification.h index 29b89e2f3f..abbf6787db 100644 --- a/src/components/application_manager/include/application_manager/commands/mobile/on_touch_event_notification.h +++ b/src/components/application_manager/include/application_manager/commands/mobile/on_touch_event_notification.h @@ -53,7 +53,8 @@ class OnTouchEventNotification : public CommandNotificationImpl { * * @param message Incoming SmartObject message **/ - OnTouchEventNotification(const MessageSharedPtr& message, ApplicationManager& application_manager); + OnTouchEventNotification(const MessageSharedPtr& message, + ApplicationManager& application_manager); /** * @brief OnTouchEventNotification class destructor diff --git a/src/components/application_manager/include/application_manager/commands/mobile/on_vehicle_data_notification.h b/src/components/application_manager/include/application_manager/commands/mobile/on_vehicle_data_notification.h index 1fea85c09d..de6172de64 100644 --- a/src/components/application_manager/include/application_manager/commands/mobile/on_vehicle_data_notification.h +++ b/src/components/application_manager/include/application_manager/commands/mobile/on_vehicle_data_notification.h @@ -53,7 +53,8 @@ class OnVehicleDataNotification : public CommandNotificationImpl { * * @param message Incoming SmartObject message **/ - OnVehicleDataNotification(const MessageSharedPtr& message, ApplicationManager& application_manager); + OnVehicleDataNotification(const MessageSharedPtr& message, + ApplicationManager& application_manager); /** * @brief OnVehicleDataNotification class destructor diff --git a/src/components/application_manager/include/application_manager/commands/mobile/on_way_point_change_notification.h b/src/components/application_manager/include/application_manager/commands/mobile/on_way_point_change_notification.h index c48458b8bc..c204e1669c 100644 --- a/src/components/application_manager/include/application_manager/commands/mobile/on_way_point_change_notification.h +++ b/src/components/application_manager/include/application_manager/commands/mobile/on_way_point_change_notification.h @@ -40,30 +40,30 @@ namespace application_manager { namespace commands { -class OnWayPointChangeNotification: public CommandNotificationImpl { +class OnWayPointChangeNotification : public CommandNotificationImpl { public: - /** - * @brief OnWayPointChangeNotification class constructor - * - * @param message Incoming SmartObject message - **/ - OnWayPointChangeNotification(const MessageSharedPtr& message, - ApplicationManager& application_manager); + /** + * @brief OnWayPointChangeNotification class constructor + * + * @param message Incoming SmartObject message + **/ + OnWayPointChangeNotification(const MessageSharedPtr& message, + ApplicationManager& application_manager); - /** - * @brief OnWayPointChangeNotification class destructor - **/ - virtual ~OnWayPointChangeNotification(); + /** + * @brief OnWayPointChangeNotification class destructor + **/ + virtual ~OnWayPointChangeNotification(); - /** - * @brief Execute command - **/ - virtual void Run() OVERRIDE; + /** + * @brief Execute command + **/ + virtual void Run() OVERRIDE; private: - DISALLOW_COPY_AND_ASSIGN(OnWayPointChangeNotification); + DISALLOW_COPY_AND_ASSIGN(OnWayPointChangeNotification); }; } // namespace commands } // namespace application_manager -#endif // SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_ON_WAY_POINT_CHANGE_NOTIFICATION_H_ +#endif // SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_ON_WAY_POINT_CHANGE_NOTIFICATION_H_ diff --git a/src/components/application_manager/include/application_manager/commands/mobile/perform_audio_pass_thru_request.h b/src/components/application_manager/include/application_manager/commands/mobile/perform_audio_pass_thru_request.h index 2487c85381..b69cb969e1 100644 --- a/src/components/application_manager/include/application_manager/commands/mobile/perform_audio_pass_thru_request.h +++ b/src/components/application_manager/include/application_manager/commands/mobile/perform_audio_pass_thru_request.h @@ -52,7 +52,8 @@ class PerformAudioPassThruRequest : public CommandRequestImpl { * * @param message Incoming SmartObject message **/ - PerformAudioPassThruRequest(const MessageSharedPtr& message, ApplicationManager& application_manager); + PerformAudioPassThruRequest(const MessageSharedPtr& message, + ApplicationManager& application_manager); /** * @brief PerformAudioPassThruRequest class destructor @@ -126,7 +127,7 @@ class PerformAudioPassThruRequest : public CommandRequestImpl { */ void FinishTTSSpeak(); - //flag display state of speak during perform audio pass thru + // flag display state of speak during perform audio pass thru bool is_active_tts_speak_; mobile_apis::Result::eType result_tts_speak_; diff --git a/src/components/application_manager/include/application_manager/commands/mobile/perform_audio_pass_thru_response.h b/src/components/application_manager/include/application_manager/commands/mobile/perform_audio_pass_thru_response.h index 97f46ff518..d227c4fef3 100644 --- a/src/components/application_manager/include/application_manager/commands/mobile/perform_audio_pass_thru_response.h +++ b/src/components/application_manager/include/application_manager/commands/mobile/perform_audio_pass_thru_response.h @@ -51,7 +51,8 @@ class PerformAudioPassThruResponse : public CommandResponseImpl { * * @param message Incoming SmartObject message **/ - PerformAudioPassThruResponse(const MessageSharedPtr& message, ApplicationManager& application_manager); + PerformAudioPassThruResponse(const MessageSharedPtr& message, + ApplicationManager& application_manager); /** * @brief PerformAudioPassThruResponse class destructor diff --git a/src/components/application_manager/include/application_manager/commands/mobile/perform_interaction_request.h b/src/components/application_manager/include/application_manager/commands/mobile/perform_interaction_request.h index 8eee969e86..f64b2ab334 100644 --- a/src/components/application_manager/include/application_manager/commands/mobile/perform_interaction_request.h +++ b/src/components/application_manager/include/application_manager/commands/mobile/perform_interaction_request.h @@ -47,15 +47,15 @@ namespace commands { /** * @brief PerformInteractionRequest command class **/ -class PerformInteractionRequest : public CommandRequestImpl { - +class PerformInteractionRequest : public CommandRequestImpl { public: /** * @brief PerformInteractionRequest class constructor * * @param message Incoming SmartObject message **/ - PerformInteractionRequest(const MessageSharedPtr& message, ApplicationManager& application_manager); + PerformInteractionRequest(const MessageSharedPtr& message, + ApplicationManager& application_manager); /** * @brief PerformInteractionRequest class destructor @@ -85,7 +85,7 @@ class PerformInteractionRequest : public CommandRequestImpl { * has exceed it's limit * */ - virtual void onTimeOut(); + virtual void onTimeOut(); /* * @brief Function will be called when VR_OnCommand event @@ -94,7 +94,8 @@ class PerformInteractionRequest : public CommandRequestImpl { * @param message which should send to mobile side * */ - void ProcessVRResponse(const smart_objects::SmartObject& message, smart_objects::SmartObject& msg_params); + void ProcessVRResponse(const smart_objects::SmartObject& message, + smart_objects::SmartObject& msg_params); /* * @brief Sends PerformInteraction response to mobile side @@ -102,9 +103,9 @@ class PerformInteractionRequest : public CommandRequestImpl { * @param message which should send to mobile side * */ - void ProcessPerformInteractionResponse - (const smart_objects::SmartObject& message, smart_objects::SmartObject &msg_params); - + void ProcessPerformInteractionResponse( + const smart_objects::SmartObject& message, + smart_objects::SmartObject& msg_params); /* * @brief Sends UI PerformInteraction request to HMI @@ -139,7 +140,8 @@ class PerformInteractionRequest : public CommandRequestImpl { * return Return TRUE if there are no similar menu names in choice set, * otherwise FALSE */ - bool CheckChoiceSetMenuNames(application_manager::ApplicationSharedPtr const app); + bool CheckChoiceSetMenuNames( + application_manager::ApplicationSharedPtr const app); /* * @brief Checks if incoming choice set doesn't has similar VR synonyms. @@ -149,7 +151,8 @@ class PerformInteractionRequest : public CommandRequestImpl { * return Return TRUE if there are no similar VR synonyms in choice set, * otherwise FALSE */ - bool CheckChoiceSetVRSynonyms(application_manager::ApplicationSharedPtr const app); + bool CheckChoiceSetVRSynonyms( + application_manager::ApplicationSharedPtr const app); /* * @brief Checks if request with non-sequential positions of vrHelpItems @@ -160,7 +163,8 @@ class PerformInteractionRequest : public CommandRequestImpl { * @return TRUE if vrHelpItems positions are sequential, * otherwise FALSE */ - bool CheckVrHelpItemPositions(application_manager::ApplicationSharedPtr const app); + bool CheckVrHelpItemPositions( + application_manager::ApplicationSharedPtr const app); /* * @brief Disable PerformInteraction state in application and @@ -201,9 +205,10 @@ class PerformInteractionRequest : public CommandRequestImpl { * same choice id returns false, otherwise returns * true. */ - bool CheckChoiceIDFromRequest(ApplicationSharedPtr app, - const size_t choice_set_id_list_length, - const smart_objects::SmartObject& choice_set_id_list) const; + bool CheckChoiceIDFromRequest( + ApplicationSharedPtr app, + const size_t choice_set_id_list_length, + const smart_objects::SmartObject& choice_set_id_list) const; /** * @brief Tells if there are sent requests without responses @@ -222,17 +227,17 @@ class PerformInteractionRequest : public CommandRequestImpl { * @brief Check UI & VR result codes, send response to mobile * @param msg_param Message params to send */ - void SendBothModeResponse(const smart_objects::SmartObject &msg_param); + void SendBothModeResponse(const smart_objects::SmartObject& msg_param); mobile_apis::InteractionMode::eType interaction_mode_; - bool ui_response_recived_; - bool vr_response_recived_; - bool ui_result_; - bool vr_result_; - bool app_pi_was_active_before_; - static uint32_t pi_requests_count_; - mobile_apis::Result::eType vr_resultCode_; - mobile_apis::Result::eType ui_resultCode_; + bool ui_response_recived_; + bool vr_response_recived_; + bool ui_result_; + bool vr_result_; + bool app_pi_was_active_before_; + static uint32_t pi_requests_count_; + mobile_apis::Result::eType vr_resultCode_; + mobile_apis::Result::eType ui_resultCode_; DISALLOW_COPY_AND_ASSIGN(PerformInteractionRequest); }; diff --git a/src/components/application_manager/include/application_manager/commands/mobile/perform_interaction_response.h b/src/components/application_manager/include/application_manager/commands/mobile/perform_interaction_response.h index f1801486f1..1274996747 100644 --- a/src/components/application_manager/include/application_manager/commands/mobile/perform_interaction_response.h +++ b/src/components/application_manager/include/application_manager/commands/mobile/perform_interaction_response.h @@ -51,7 +51,8 @@ class PerformInteractionResponse : public CommandResponseImpl { * * @param message Incoming SmartObject message **/ - PerformInteractionResponse(const MessageSharedPtr& message, ApplicationManager& application_manager); + PerformInteractionResponse(const MessageSharedPtr& message, + ApplicationManager& application_manager); /** * @brief PerformInteractionResponse class destructor diff --git a/src/components/application_manager/include/application_manager/commands/mobile/put_file_request.h b/src/components/application_manager/include/application_manager/commands/mobile/put_file_request.h index 78f2d9cb94..e3af8ac69b 100644 --- a/src/components/application_manager/include/application_manager/commands/mobile/put_file_request.h +++ b/src/components/application_manager/include/application_manager/commands/mobile/put_file_request.h @@ -52,7 +52,8 @@ class PutFileRequest : public CommandRequestImpl { * * @param message Incoming SmartObject message **/ - PutFileRequest(const MessageSharedPtr& message, ApplicationManager& application_manager); + PutFileRequest(const MessageSharedPtr& message, + ApplicationManager& application_manager); /** * @brief PutFileRequest class destructor @@ -65,13 +66,13 @@ class PutFileRequest : public CommandRequestImpl { virtual void Run(); private: - int64_t offset_; - std::string sync_file_name_; - int64_t length_; - mobile_apis::FileType::eType file_type_; - bool is_persistent_file_; + int64_t offset_; + std::string sync_file_name_; + int64_t length_; + mobile_apis::FileType::eType file_type_; + bool is_persistent_file_; - void SendOnPutFileNotification(); + void SendOnPutFileNotification(); DISALLOW_COPY_AND_ASSIGN(PutFileRequest); }; diff --git a/src/components/application_manager/include/application_manager/commands/mobile/put_file_response.h b/src/components/application_manager/include/application_manager/commands/mobile/put_file_response.h index 2b603579a6..f561f9fdbc 100644 --- a/src/components/application_manager/include/application_manager/commands/mobile/put_file_response.h +++ b/src/components/application_manager/include/application_manager/commands/mobile/put_file_response.h @@ -51,7 +51,8 @@ class PutFileResponse : public CommandResponseImpl { * * @param message Incoming SmartObject message **/ - PutFileResponse(const MessageSharedPtr& message, ApplicationManager& application_manager); + PutFileResponse(const MessageSharedPtr& message, + ApplicationManager& application_manager); /** * @brief PutFileResponse class destructor diff --git a/src/components/application_manager/include/application_manager/commands/mobile/read_did_request.h b/src/components/application_manager/include/application_manager/commands/mobile/read_did_request.h index 7325f5ee3e..c88f16dab0 100644 --- a/src/components/application_manager/include/application_manager/commands/mobile/read_did_request.h +++ b/src/components/application_manager/include/application_manager/commands/mobile/read_did_request.h @@ -51,7 +51,8 @@ class ReadDIDRequest : public CommandRequestImpl { * * @param message Incoming SmartObject message **/ - ReadDIDRequest(const MessageSharedPtr& message, ApplicationManager& application_manager); + ReadDIDRequest(const MessageSharedPtr& message, + ApplicationManager& application_manager); /** * @brief ReadDIDRequest class destructor diff --git a/src/components/application_manager/include/application_manager/commands/mobile/read_did_response.h b/src/components/application_manager/include/application_manager/commands/mobile/read_did_response.h index 137d73f220..2e493fa0ec 100644 --- a/src/components/application_manager/include/application_manager/commands/mobile/read_did_response.h +++ b/src/components/application_manager/include/application_manager/commands/mobile/read_did_response.h @@ -51,7 +51,8 @@ class ReadDIDResponse : public CommandResponseImpl { * * @param message Incoming SmartObject message **/ - ReadDIDResponse(const MessageSharedPtr& message, ApplicationManager& application_manager); + ReadDIDResponse(const MessageSharedPtr& message, + ApplicationManager& application_manager); /** * @brief ReadDIDResponse class destructor diff --git a/src/components/application_manager/include/application_manager/commands/mobile/register_app_interface_request.h b/src/components/application_manager/include/application_manager/commands/mobile/register_app_interface_request.h index 7b20a59f93..7c766a94af 100644 --- a/src/components/application_manager/include/application_manager/commands/mobile/register_app_interface_request.h +++ b/src/components/application_manager/include/application_manager/commands/mobile/register_app_interface_request.h @@ -60,7 +60,7 @@ class RegisterAppInterfaceRequest : public CommandRequestImpl { * \brief RegisterAppInterfaceRequest class constructor **/ RegisterAppInterfaceRequest(const MessageSharedPtr& message, - ApplicationManager& application_manager); + ApplicationManager& application_manager); /** * @brief RegisterAppInterfaceRequest class destructor @@ -119,7 +119,7 @@ class RegisterAppInterfaceRequest : public CommandRequestImpl { */ struct CoincidencePredicateVR { CoincidencePredicateVR(const custom_str::CustomString& newItem) - : newItem_(newItem){} + : newItem_(newItem) {} bool operator()(const smart_objects::SmartObject& obj) { const custom_str::CustomString& vr_synonym = obj.asCustomString(); @@ -168,7 +168,7 @@ class RegisterAppInterfaceRequest : public CommandRequestImpl { std::string response_info_; mobile_apis::Result::eType result_checking_app_hmi_type_; - policy::PolicyHandlerInterface &GetPolicyHandler(); + policy::PolicyHandlerInterface& GetPolicyHandler(); DISALLOW_COPY_AND_ASSIGN(RegisterAppInterfaceRequest); }; diff --git a/src/components/application_manager/include/application_manager/commands/mobile/register_app_interface_response.h b/src/components/application_manager/include/application_manager/commands/mobile/register_app_interface_response.h index befd17256a..b125cc7c55 100644 --- a/src/components/application_manager/include/application_manager/commands/mobile/register_app_interface_response.h +++ b/src/components/application_manager/include/application_manager/commands/mobile/register_app_interface_response.h @@ -48,14 +48,13 @@ class RegisterAppInterfaceResponse : public CommandResponseImpl { * \brief RegisterAppInterfaceResponse class constructor **/ RegisterAppInterfaceResponse(const MessageSharedPtr& response, - ApplicationManager& application_manager) + ApplicationManager& application_manager) : CommandResponseImpl(response, application_manager) {} /** * \brief RegisterAppInterfaceResponse class destructor **/ - virtual ~RegisterAppInterfaceResponse() { - } + virtual ~RegisterAppInterfaceResponse() {} /** * @brief Execute command diff --git a/src/components/application_manager/include/application_manager/commands/mobile/reset_global_properties_request.h b/src/components/application_manager/include/application_manager/commands/mobile/reset_global_properties_request.h index 4b6864f057..0053c14f3c 100644 --- a/src/components/application_manager/include/application_manager/commands/mobile/reset_global_properties_request.h +++ b/src/components/application_manager/include/application_manager/commands/mobile/reset_global_properties_request.h @@ -52,7 +52,8 @@ class ResetGlobalPropertiesRequest : public CommandRequestImpl { * * @param message Incoming SmartObject message **/ - ResetGlobalPropertiesRequest(const MessageSharedPtr& message, ApplicationManager& application_manager); + ResetGlobalPropertiesRequest(const MessageSharedPtr& message, + ApplicationManager& application_manager); /** * @brief ResetGlobalPropertiesRequest class destructor @@ -103,7 +104,8 @@ class ResetGlobalPropertiesRequest : public CommandRequestImpl { * * @return TRUE on success, otherwise FALSE */ - bool ResetVrHelpTitleItems(application_manager::ApplicationSharedPtr const app); + bool ResetVrHelpTitleItems( + application_manager::ApplicationSharedPtr const app); /* * @brief Check if there some not delivered hmi responses exist diff --git a/src/components/application_manager/include/application_manager/commands/mobile/reset_global_properties_response.h b/src/components/application_manager/include/application_manager/commands/mobile/reset_global_properties_response.h index 9630d7f105..39e28486d4 100644 --- a/src/components/application_manager/include/application_manager/commands/mobile/reset_global_properties_response.h +++ b/src/components/application_manager/include/application_manager/commands/mobile/reset_global_properties_response.h @@ -51,7 +51,8 @@ class ResetGlobalPropertiesResponse : public CommandResponseImpl { * * @param message Incoming SmartObject message **/ - ResetGlobalPropertiesResponse(const MessageSharedPtr& message, ApplicationManager& application_manager); + ResetGlobalPropertiesResponse(const MessageSharedPtr& message, + ApplicationManager& application_manager); /** * @brief ResetGlobalPropertiesResponse class destructor diff --git a/src/components/application_manager/include/application_manager/commands/mobile/scrollable_message_request.h b/src/components/application_manager/include/application_manager/commands/mobile/scrollable_message_request.h index 7740447f1d..b3058c9a26 100644 --- a/src/components/application_manager/include/application_manager/commands/mobile/scrollable_message_request.h +++ b/src/components/application_manager/include/application_manager/commands/mobile/scrollable_message_request.h @@ -50,7 +50,8 @@ class ScrollableMessageRequest : public CommandRequestImpl { /** * @brief ScrollableMessageRequest class constructor **/ - ScrollableMessageRequest(const MessageSharedPtr& message, ApplicationManager& application_manager); + ScrollableMessageRequest(const MessageSharedPtr& message, + ApplicationManager& application_manager); /** * @brief SliderCommand class destructor diff --git a/src/components/application_manager/include/application_manager/commands/mobile/scrollable_message_response.h b/src/components/application_manager/include/application_manager/commands/mobile/scrollable_message_response.h index 7a8c9eec14..aa0ac01e9d 100644 --- a/src/components/application_manager/include/application_manager/commands/mobile/scrollable_message_response.h +++ b/src/components/application_manager/include/application_manager/commands/mobile/scrollable_message_response.h @@ -45,13 +45,13 @@ class ScrollableMessageResponse : public CommandResponseImpl { /** * \brief ScrollableMessageResponse class constructor **/ - ScrollableMessageResponse(const MessageSharedPtr& message, ApplicationManager& application_manager); + ScrollableMessageResponse(const MessageSharedPtr& message, + ApplicationManager& application_manager); /** * \brief SpeakResponseCommand class destructor **/ - virtual ~ScrollableMessageResponse() { - } + virtual ~ScrollableMessageResponse() {} /** * @brief Execute command diff --git a/src/components/application_manager/include/application_manager/commands/mobile/send_location_request.h b/src/components/application_manager/include/application_manager/commands/mobile/send_location_request.h index ccb494d432..9cc1a4fd83 100644 --- a/src/components/application_manager/include/application_manager/commands/mobile/send_location_request.h +++ b/src/components/application_manager/include/application_manager/commands/mobile/send_location_request.h @@ -49,7 +49,8 @@ class SendLocationRequest : public CommandRequestImpl { /** * @brief SendLocationRquest class constructor */ - SendLocationRequest(const MessageSharedPtr& message, ApplicationManager& application_manager); + SendLocationRequest(const MessageSharedPtr& message, + ApplicationManager& application_manager); /** * @brief SendLocationRquest class destructor @@ -68,13 +69,12 @@ class SendLocationRequest : public CommandRequestImpl { */ virtual void on_event(const event_engine::Event& event); - private: - - /** - * @brief CheckFieldsCompatibility checks if fields are compatible with each other. - * @return true if compatible, otherwise return false - */ + /** + * @brief CheckFieldsCompatibility checks if fields are compatible with each + * other. + * @return true if compatible, otherwise return false + */ bool CheckFieldsCompatibility(); /** @@ -84,7 +84,8 @@ class SendLocationRequest : public CommandRequestImpl { */ bool IsWhiteSpaceExist(); - bool CheckHMICapabilities(std::list<hmi_apis::Common_TextFieldName::eType>& fields_names); + bool CheckHMICapabilities( + std::list<hmi_apis::Common_TextFieldName::eType>& fields_names); DISALLOW_COPY_AND_ASSIGN(SendLocationRequest); }; diff --git a/src/components/application_manager/include/application_manager/commands/mobile/send_location_response.h b/src/components/application_manager/include/application_manager/commands/mobile/send_location_response.h index 84a30c4029..0be0be8ca3 100644 --- a/src/components/application_manager/include/application_manager/commands/mobile/send_location_response.h +++ b/src/components/application_manager/include/application_manager/commands/mobile/send_location_response.h @@ -36,7 +36,6 @@ #include "application_manager/commands/command_response_impl.h" #include "application_manager/message.h" - namespace application_manager { namespace commands { @@ -45,7 +44,8 @@ class SendLocationResponse : public CommandResponseImpl { /** * @brief SendLocationResponse class constructor */ - SendLocationResponse(const MessageSharedPtr& message, ApplicationManager& application_manager); + SendLocationResponse(const MessageSharedPtr& message, + ApplicationManager& application_manager); /** * @brief SendLocationResponse class destructor diff --git a/src/components/application_manager/include/application_manager/commands/mobile/set_app_icon_request.h b/src/components/application_manager/include/application_manager/commands/mobile/set_app_icon_request.h index 91cd842982..42eedad19b 100644 --- a/src/components/application_manager/include/application_manager/commands/mobile/set_app_icon_request.h +++ b/src/components/application_manager/include/application_manager/commands/mobile/set_app_icon_request.h @@ -49,17 +49,15 @@ class SetAppIconRequest : public CommandRequestImpl { /** * @brief Contains information about the type of image */ - typedef enum { - STATIC = 0, - DYNAMIC - } ImageType; + typedef enum { STATIC = 0, DYNAMIC } ImageType; /** * @brief SetIconRequest class constructor * * @param message Incoming SmartObject message **/ - SetAppIconRequest(const MessageSharedPtr& message, ApplicationManager& application_manager); + SetAppIconRequest(const MessageSharedPtr& message, + ApplicationManager& application_manager); /** * @brief SetIconRequest class destructor @@ -101,7 +99,7 @@ class SetAppIconRequest : public CommandRequestImpl { bool IsEnoughSpaceForIcon(const uint64_t icon_size) const; DISALLOW_COPY_AND_ASSIGN(SetAppIconRequest); -private: + private: /** * @brief Checks, if icons saving to configured folder is enabled */ diff --git a/src/components/application_manager/include/application_manager/commands/mobile/set_app_icon_response.h b/src/components/application_manager/include/application_manager/commands/mobile/set_app_icon_response.h index af5b9b69db..6061cf5702 100644 --- a/src/components/application_manager/include/application_manager/commands/mobile/set_app_icon_response.h +++ b/src/components/application_manager/include/application_manager/commands/mobile/set_app_icon_response.h @@ -51,7 +51,8 @@ class SetAppIconResponse : public CommandResponseImpl { * * @param message Incoming SmartObject message **/ - SetAppIconResponse(const MessageSharedPtr& message, ApplicationManager& application_manager); + SetAppIconResponse(const MessageSharedPtr& message, + ApplicationManager& application_manager); /** * @brief SetIconResponse class destructor diff --git a/src/components/application_manager/include/application_manager/commands/mobile/set_display_layout_request.h b/src/components/application_manager/include/application_manager/commands/mobile/set_display_layout_request.h index d847420b16..06e8d70f79 100644 --- a/src/components/application_manager/include/application_manager/commands/mobile/set_display_layout_request.h +++ b/src/components/application_manager/include/application_manager/commands/mobile/set_display_layout_request.h @@ -51,7 +51,8 @@ class SetDisplayLayoutRequest : public CommandRequestImpl { * * @param message Incoming SmartObject message **/ - SetDisplayLayoutRequest(const MessageSharedPtr& message, ApplicationManager& application_manager); + SetDisplayLayoutRequest(const MessageSharedPtr& message, + ApplicationManager& application_manager); /** * @brief SetDisplayLayoutRequest class destructor diff --git a/src/components/application_manager/include/application_manager/commands/mobile/set_display_layout_response.h b/src/components/application_manager/include/application_manager/commands/mobile/set_display_layout_response.h index 8b621ad9fe..a2040307b0 100644 --- a/src/components/application_manager/include/application_manager/commands/mobile/set_display_layout_response.h +++ b/src/components/application_manager/include/application_manager/commands/mobile/set_display_layout_response.h @@ -51,7 +51,8 @@ class SetDisplayLayoutResponse : public CommandResponseImpl { * * @param message Incoming SmartObject message **/ - SetDisplayLayoutResponse(const MessageSharedPtr& message, ApplicationManager& application_manager); + SetDisplayLayoutResponse(const MessageSharedPtr& message, + ApplicationManager& application_manager); /** * @brief SetDisplayLayoutResponse class destructor diff --git a/src/components/application_manager/include/application_manager/commands/mobile/set_global_properties_request.h b/src/components/application_manager/include/application_manager/commands/mobile/set_global_properties_request.h index b6ecf53dc5..aa26a70393 100644 --- a/src/components/application_manager/include/application_manager/commands/mobile/set_global_properties_request.h +++ b/src/components/application_manager/include/application_manager/commands/mobile/set_global_properties_request.h @@ -51,7 +51,8 @@ class SetGlobalPropertiesRequest : public CommandRequestImpl { * * @param message Incoming SmartObject message **/ - SetGlobalPropertiesRequest(const MessageSharedPtr& message, ApplicationManager& application_manager); + SetGlobalPropertiesRequest(const MessageSharedPtr& message, + ApplicationManager& application_manager); /** * @brief SetGlobalPropertiesRequest class destructor @@ -72,22 +73,26 @@ class SetGlobalPropertiesRequest : public CommandRequestImpl { private: // Verify correctness VrHelptitle value - static bool ValidateVRHelpTitle(const smart_objects::SmartObject* const vr_help_so_ptr); + static bool ValidateVRHelpTitle( + const smart_objects::SmartObject* const vr_help_so_ptr); // prepare UI sending data (VrHelps, Menus, Keyboard) to SmartObject - static void PrepareUIRequestVRHelpData(const ApplicationSharedPtr app, - const smart_objects::SmartObject& msg_params, - smart_objects::SmartObject& out_params); + static void PrepareUIRequestVRHelpData( + const ApplicationSharedPtr app, + const smart_objects::SmartObject& msg_params, + smart_objects::SmartObject& out_params); - static bool PrepareUIRequestDefaultVRHelpData(const ApplicationSharedPtr app, - smart_objects::SmartObject& out_params); + static bool PrepareUIRequestDefaultVRHelpData( + const ApplicationSharedPtr app, smart_objects::SmartObject& out_params); - static void PrepareUIRequestMenuAndKeyboardData(const ApplicationSharedPtr app, - const smart_objects::SmartObject& msg_params, - smart_objects::SmartObject& out_params); + static void PrepareUIRequestMenuAndKeyboardData( + const ApplicationSharedPtr app, + const smart_objects::SmartObject& msg_params, + smart_objects::SmartObject& out_params); // Send TTS request to HMI - void SendTTSRequest(const smart_objects::SmartObject& params, bool use_events); + void SendTTSRequest(const smart_objects::SmartObject& params, + bool use_events); // Send UI request to HMI void SendUIRequest(const smart_objects::SmartObject& params, bool use_events); diff --git a/src/components/application_manager/include/application_manager/commands/mobile/set_global_properties_response.h b/src/components/application_manager/include/application_manager/commands/mobile/set_global_properties_response.h index ca70397c81..c5beda084d 100644 --- a/src/components/application_manager/include/application_manager/commands/mobile/set_global_properties_response.h +++ b/src/components/application_manager/include/application_manager/commands/mobile/set_global_properties_response.h @@ -51,7 +51,8 @@ class SetGlobalPropertiesResponse : public CommandResponseImpl { * * @param message Incoming SmartObject message **/ - SetGlobalPropertiesResponse(const MessageSharedPtr& message, ApplicationManager& application_manager); + SetGlobalPropertiesResponse(const MessageSharedPtr& message, + ApplicationManager& application_manager); /** * @brief SetGlobalPropertiesResponse class destructor diff --git a/src/components/application_manager/include/application_manager/commands/mobile/set_icon_request.h b/src/components/application_manager/include/application_manager/commands/mobile/set_icon_request.h index d1866d4080..96d4ac6f1e 100644 --- a/src/components/application_manager/include/application_manager/commands/mobile/set_icon_request.h +++ b/src/components/application_manager/include/application_manager/commands/mobile/set_icon_request.h @@ -50,17 +50,15 @@ class SetIconRequest : public CommandRequestImpl { /** * @brief Contains information about the type of image */ - typedef enum { - STATIC = 0, - DYNAMIC - } ImageType; + typedef enum { STATIC = 0, DYNAMIC } ImageType; /** * @brief SetIconRequest class constructor * * @param message Incoming SmartObject message **/ - SetIconRequest(const MessageSharedPtr& message, ApplicationManager& application_manager); + SetIconRequest(const MessageSharedPtr& message, + ApplicationManager& application_manager); /** * @brief SetIconRequest class destructor diff --git a/src/components/application_manager/include/application_manager/commands/mobile/set_icon_response.h b/src/components/application_manager/include/application_manager/commands/mobile/set_icon_response.h index 4915664483..83be0d4a4b 100644 --- a/src/components/application_manager/include/application_manager/commands/mobile/set_icon_response.h +++ b/src/components/application_manager/include/application_manager/commands/mobile/set_icon_response.h @@ -52,8 +52,7 @@ class SetIconResponse : public CommandResponseImpl { * * @param message Incoming SmartObject message **/ - SetIconResponse(const MessageSharedPtr& message, - ApplicationManager& app_man); + SetIconResponse(const MessageSharedPtr& message, ApplicationManager& app_man); /** * @brief SetIconResponse class destructor diff --git a/src/components/application_manager/include/application_manager/commands/mobile/set_media_clock_timer_request.h b/src/components/application_manager/include/application_manager/commands/mobile/set_media_clock_timer_request.h index ae25e2a9e4..283dd41622 100644 --- a/src/components/application_manager/include/application_manager/commands/mobile/set_media_clock_timer_request.h +++ b/src/components/application_manager/include/application_manager/commands/mobile/set_media_clock_timer_request.h @@ -49,7 +49,8 @@ class SetMediaClockRequest : public CommandRequestImpl { /** * \brief SetMediaClockRequest class constructor **/ - SetMediaClockRequest(const MessageSharedPtr& message, ApplicationManager& application_manager); + SetMediaClockRequest(const MessageSharedPtr& message, + ApplicationManager& application_manager); /** * \brief ShowCommand class destructor diff --git a/src/components/application_manager/include/application_manager/commands/mobile/set_media_clock_timer_response.h b/src/components/application_manager/include/application_manager/commands/mobile/set_media_clock_timer_response.h index 5641531391..3f41ae2dab 100644 --- a/src/components/application_manager/include/application_manager/commands/mobile/set_media_clock_timer_response.h +++ b/src/components/application_manager/include/application_manager/commands/mobile/set_media_clock_timer_response.h @@ -45,7 +45,8 @@ class SetMediaClockTimerResponse : public CommandResponseImpl { /** * \brief SetMediaClockTimerResponse class constructor **/ - SetMediaClockTimerResponse(const MessageSharedPtr& message, ApplicationManager& application_manager); + SetMediaClockTimerResponse(const MessageSharedPtr& message, + ApplicationManager& application_manager); /** * \brief SetMediaClockTimerResponse class destructor diff --git a/src/components/application_manager/include/application_manager/commands/mobile/show_constant_tbt_request.h b/src/components/application_manager/include/application_manager/commands/mobile/show_constant_tbt_request.h index 279d031eaa..f015d740df 100644 --- a/src/components/application_manager/include/application_manager/commands/mobile/show_constant_tbt_request.h +++ b/src/components/application_manager/include/application_manager/commands/mobile/show_constant_tbt_request.h @@ -52,7 +52,8 @@ class ShowConstantTBTRequest : public CommandRequestImpl { * * @param message Incoming SmartObject message **/ - ShowConstantTBTRequest(const MessageSharedPtr& message, ApplicationManager& application_manager); + ShowConstantTBTRequest(const MessageSharedPtr& message, + ApplicationManager& application_manager); /** * @brief ShowConstantTBTRequest class destructor diff --git a/src/components/application_manager/include/application_manager/commands/mobile/show_constant_tbt_response.h b/src/components/application_manager/include/application_manager/commands/mobile/show_constant_tbt_response.h index 82d19d6b49..73aad5de89 100644 --- a/src/components/application_manager/include/application_manager/commands/mobile/show_constant_tbt_response.h +++ b/src/components/application_manager/include/application_manager/commands/mobile/show_constant_tbt_response.h @@ -51,7 +51,8 @@ class ShowConstantTBTResponse : public CommandResponseImpl { * * @param message Incoming SmartObject message **/ - ShowConstantTBTResponse(const MessageSharedPtr& message, ApplicationManager& application_manager); + ShowConstantTBTResponse(const MessageSharedPtr& message, + ApplicationManager& application_manager); /** * @brief ShowConstantTBTResponse class destructor diff --git a/src/components/application_manager/include/application_manager/commands/mobile/show_request.h b/src/components/application_manager/include/application_manager/commands/mobile/show_request.h index 3a85d007ad..cbe2ca396a 100644 --- a/src/components/application_manager/include/application_manager/commands/mobile/show_request.h +++ b/src/components/application_manager/include/application_manager/commands/mobile/show_request.h @@ -50,7 +50,8 @@ class ShowRequest : public CommandRequestImpl { /** * \brief ShowRequest class constructor **/ - ShowRequest(const MessageSharedPtr& message, ApplicationManager& application_manager); + ShowRequest(const MessageSharedPtr& message, + ApplicationManager& application_manager); /** * \brief ShowRequest class destructor @@ -70,7 +71,6 @@ class ShowRequest : public CommandRequestImpl { virtual void on_event(const event_engine::Event& event); private: - /* * @brief Check if all strings have valid syntax in request * diff --git a/src/components/application_manager/include/application_manager/commands/mobile/show_response.h b/src/components/application_manager/include/application_manager/commands/mobile/show_response.h index 3f13fc8dd1..0a54fb9cde 100644 --- a/src/components/application_manager/include/application_manager/commands/mobile/show_response.h +++ b/src/components/application_manager/include/application_manager/commands/mobile/show_response.h @@ -45,7 +45,8 @@ class ShowResponse : public CommandResponseImpl { /** * \brief ShowResponse class constructor **/ - ShowResponse(const MessageSharedPtr& message, ApplicationManager& application_manager); + ShowResponse(const MessageSharedPtr& message, + ApplicationManager& application_manager); /** * \brief ShowResponse class destructor diff --git a/src/components/application_manager/include/application_manager/commands/mobile/slider_request.h b/src/components/application_manager/include/application_manager/commands/mobile/slider_request.h index 5231623c19..2446c9ff20 100644 --- a/src/components/application_manager/include/application_manager/commands/mobile/slider_request.h +++ b/src/components/application_manager/include/application_manager/commands/mobile/slider_request.h @@ -49,7 +49,8 @@ class SliderRequest : public CommandRequestImpl { /** * \brief SliderRequest class constructor **/ - SliderRequest(const MessageSharedPtr& message, ApplicationManager& application_manager); + SliderRequest(const MessageSharedPtr& message, + ApplicationManager& application_manager); /** * \brief SliderRequest class destructor diff --git a/src/components/application_manager/include/application_manager/commands/mobile/slider_response.h b/src/components/application_manager/include/application_manager/commands/mobile/slider_response.h index aca486ea40..bc0efaadd0 100644 --- a/src/components/application_manager/include/application_manager/commands/mobile/slider_response.h +++ b/src/components/application_manager/include/application_manager/commands/mobile/slider_response.h @@ -45,7 +45,8 @@ class SliderResponse : public CommandResponseImpl { /** * \brief SliderResponse class constructor **/ - SliderResponse(const MessageSharedPtr& message, ApplicationManager& application_manager); + SliderResponse(const MessageSharedPtr& message, + ApplicationManager& application_manager); /** * \brief SpeakResponseCommand class destructor diff --git a/src/components/application_manager/include/application_manager/commands/mobile/speak_request.h b/src/components/application_manager/include/application_manager/commands/mobile/speak_request.h index 8147a871fe..dc22652b27 100644 --- a/src/components/application_manager/include/application_manager/commands/mobile/speak_request.h +++ b/src/components/application_manager/include/application_manager/commands/mobile/speak_request.h @@ -49,7 +49,8 @@ class SpeakRequest : public CommandRequestImpl { /** * \brief SpeakRequest class constructor **/ - SpeakRequest(const MessageSharedPtr& message, ApplicationManager& application_manager); + SpeakRequest(const MessageSharedPtr& message, + ApplicationManager& application_manager); /** * \brief SpeakRequest class destructor diff --git a/src/components/application_manager/include/application_manager/commands/mobile/speak_response.h b/src/components/application_manager/include/application_manager/commands/mobile/speak_response.h index c2d0bff9af..2808526603 100644 --- a/src/components/application_manager/include/application_manager/commands/mobile/speak_response.h +++ b/src/components/application_manager/include/application_manager/commands/mobile/speak_response.h @@ -45,7 +45,8 @@ class SpeakResponse : public CommandResponseImpl { /** * \brief SpeakResponse class constructor **/ - SpeakResponse(const MessageSharedPtr& message, ApplicationManager& application_manager); + SpeakResponse(const MessageSharedPtr& message, + ApplicationManager& application_manager); /** * \brief SpeakResponse class destructor diff --git a/src/components/application_manager/include/application_manager/commands/mobile/subscribe_button_request.h b/src/components/application_manager/include/application_manager/commands/mobile/subscribe_button_request.h index 44d2509e70..b5a22d40a9 100644 --- a/src/components/application_manager/include/application_manager/commands/mobile/subscribe_button_request.h +++ b/src/components/application_manager/include/application_manager/commands/mobile/subscribe_button_request.h @@ -52,7 +52,8 @@ class SubscribeButtonRequest : public CommandRequestImpl { * * @param message Incoming SmartObject message **/ - SubscribeButtonRequest(const MessageSharedPtr& message, ApplicationManager& application_manager); + SubscribeButtonRequest(const MessageSharedPtr& message, + ApplicationManager& application_manager); /** * @brief SubscribeButtonRequest class destructor @@ -65,7 +66,6 @@ class SubscribeButtonRequest : public CommandRequestImpl { virtual void Run(); private: - /** * @brief Checks if button subscription allowed. In case non-media * application trying to subscribe on buttons(tune, seek) negative result will diff --git a/src/components/application_manager/include/application_manager/commands/mobile/subscribe_button_response.h b/src/components/application_manager/include/application_manager/commands/mobile/subscribe_button_response.h index 8b7651b426..38e0dd2dc6 100644 --- a/src/components/application_manager/include/application_manager/commands/mobile/subscribe_button_response.h +++ b/src/components/application_manager/include/application_manager/commands/mobile/subscribe_button_response.h @@ -51,7 +51,8 @@ class SubscribeButtonResponse : public CommandResponseImpl { * * @param message Incoming SmartObject message **/ - SubscribeButtonResponse(const MessageSharedPtr& message, ApplicationManager& application_manager); + SubscribeButtonResponse(const MessageSharedPtr& message, + ApplicationManager& application_manager); /** * @brief SubscribeButtonResponse class destructor diff --git a/src/components/application_manager/include/application_manager/commands/mobile/subscribe_vehicle_data_request.h b/src/components/application_manager/include/application_manager/commands/mobile/subscribe_vehicle_data_request.h index bd11b1772b..6b2c2bb616 100644 --- a/src/components/application_manager/include/application_manager/commands/mobile/subscribe_vehicle_data_request.h +++ b/src/components/application_manager/include/application_manager/commands/mobile/subscribe_vehicle_data_request.h @@ -52,7 +52,8 @@ class SubscribeVehicleDataRequest : public CommandRequestImpl { * * @param message Incoming SmartObject message **/ - SubscribeVehicleDataRequest(const MessageSharedPtr& message, ApplicationManager& application_manager); + SubscribeVehicleDataRequest(const MessageSharedPtr& message, + ApplicationManager& application_manager); /** * @brief SubscribeButtonCommandRequest class destructor @@ -83,7 +84,7 @@ class SubscribeVehicleDataRequest : public CommandRequestImpl { typedef std::vector<HmiRequest> HmiRequests; HmiRequests hmi_requests_; -#endif // #ifdef HMI_DBUS_API +#endif // #ifdef HMI_DBUS_API private: /** diff --git a/src/components/application_manager/include/application_manager/commands/mobile/subscribe_vehicle_data_response.h b/src/components/application_manager/include/application_manager/commands/mobile/subscribe_vehicle_data_response.h index ac188be74d..7e3cffc387 100644 --- a/src/components/application_manager/include/application_manager/commands/mobile/subscribe_vehicle_data_response.h +++ b/src/components/application_manager/include/application_manager/commands/mobile/subscribe_vehicle_data_response.h @@ -51,7 +51,8 @@ class SubscribeVehicleDataResponse : public CommandResponseImpl { * * @param message Incoming SmartObject message **/ - SubscribeVehicleDataResponse(const MessageSharedPtr& message, ApplicationManager& application_manager); + SubscribeVehicleDataResponse(const MessageSharedPtr& message, + ApplicationManager& application_manager); /** * @brief UnsubscribeVehicleDataCommandRequest class destructor diff --git a/src/components/application_manager/include/application_manager/commands/mobile/subscribe_way_points_request.h b/src/components/application_manager/include/application_manager/commands/mobile/subscribe_way_points_request.h index 166835c1ce..50b3a6f2cb 100644 --- a/src/components/application_manager/include/application_manager/commands/mobile/subscribe_way_points_request.h +++ b/src/components/application_manager/include/application_manager/commands/mobile/subscribe_way_points_request.h @@ -43,7 +43,7 @@ namespace commands { * @brief SubsribeWayPointsRequest command class **/ class SubscribeWayPointsRequest : public CommandRequestImpl { -public: + public: /** * \brief SubscribeWayPointsRequest class constructor **/ @@ -65,12 +65,13 @@ public: * @param event The received event */ virtual void on_event(const event_engine::Event& event); -private: + + private: DISALLOW_COPY_AND_ASSIGN(SubscribeWayPointsRequest); }; -} // commands +} // commands -} // application_manager +} // application_manager -#endif // SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_MOBILE_SUBSCRIBE_WAY_POINTS_REQUEST_H_ +#endif // SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_MOBILE_SUBSCRIBE_WAY_POINTS_REQUEST_H_ diff --git a/src/components/application_manager/include/application_manager/commands/mobile/subscribe_way_points_response.h b/src/components/application_manager/include/application_manager/commands/mobile/subscribe_way_points_response.h index fc2a06ea69..cfdc0eede7 100644 --- a/src/components/application_manager/include/application_manager/commands/mobile/subscribe_way_points_response.h +++ b/src/components/application_manager/include/application_manager/commands/mobile/subscribe_way_points_response.h @@ -44,7 +44,7 @@ namespace commands { * @brief SubscribeWayPointsResponse command class **/ class SubscribeWayPointsResponse : public CommandResponseImpl { -public: + public: /** * \brief SubscribeWayPointsResponse class constructor **/ @@ -60,12 +60,13 @@ public: * @brief Execute command **/ virtual void Run() OVERRIDE; -private: + + private: DISALLOW_COPY_AND_ASSIGN(SubscribeWayPointsResponse); }; -} // commands +} // commands -} // application_manager +} // application_manager -#endif // SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_MOBILE_SUBSCRIBE_WAY_POINTS_RESPONSE_H_ +#endif // SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_MOBILE_SUBSCRIBE_WAY_POINTS_RESPONSE_H_ diff --git a/src/components/application_manager/include/application_manager/commands/mobile/system_request.h b/src/components/application_manager/include/application_manager/commands/mobile/system_request.h index 013c74eb86..76447b4753 100644 --- a/src/components/application_manager/include/application_manager/commands/mobile/system_request.h +++ b/src/components/application_manager/include/application_manager/commands/mobile/system_request.h @@ -60,7 +60,8 @@ class SystemRequest : public CommandRequestImpl { * * @param message Incoming SmartObject message **/ - SystemRequest(const MessageSharedPtr& message, ApplicationManager& application_manager); + SystemRequest(const MessageSharedPtr& message, + ApplicationManager& application_manager); /** * @brief SystemRequest class destructor @@ -79,7 +80,7 @@ class SystemRequest : public CommandRequestImpl { */ virtual void on_event(const event_engine::Event& event); -private: + private: /** * @brief Validates data coming within QueryApps response * @param data Data @@ -89,7 +90,7 @@ private: private: static uint32_t index; - std::string processing_file_; + std::string processing_file_; DISALLOW_COPY_AND_ASSIGN(SystemRequest); }; diff --git a/src/components/application_manager/include/application_manager/commands/mobile/system_response.h b/src/components/application_manager/include/application_manager/commands/mobile/system_response.h index 09e8bf624f..3f48db7f0e 100644 --- a/src/components/application_manager/include/application_manager/commands/mobile/system_response.h +++ b/src/components/application_manager/include/application_manager/commands/mobile/system_response.h @@ -36,7 +36,6 @@ #include "application_manager/commands/command_response_impl.h" - namespace application_manager { namespace commands { @@ -51,7 +50,8 @@ class SystemResponse : public CommandResponseImpl { * * @param message Incoming SmartObject message **/ - SystemResponse(const MessageSharedPtr& message, ApplicationManager& application_manager); + SystemResponse(const MessageSharedPtr& message, + ApplicationManager& application_manager); /** * @brief SystemResponse class destructor diff --git a/src/components/application_manager/include/application_manager/commands/mobile/unregister_app_interface_request.h b/src/components/application_manager/include/application_manager/commands/mobile/unregister_app_interface_request.h index a03dcef06f..acc7374e18 100644 --- a/src/components/application_manager/include/application_manager/commands/mobile/unregister_app_interface_request.h +++ b/src/components/application_manager/include/application_manager/commands/mobile/unregister_app_interface_request.h @@ -49,15 +49,14 @@ class UnregisterAppInterfaceRequest : public CommandRequestImpl { /** * \brief UnregisterAppInterfaceRequest class constructor **/ - UnregisterAppInterfaceRequest(const MessageSharedPtr& message, ApplicationManager& application_manager) - : CommandRequestImpl(message, application_manager) { - } + UnregisterAppInterfaceRequest(const MessageSharedPtr& message, + ApplicationManager& application_manager) + : CommandRequestImpl(message, application_manager) {} /** * \brief UnregisterAppInterfaceRequest class destructor **/ - virtual ~UnregisterAppInterfaceRequest() { - } + virtual ~UnregisterAppInterfaceRequest() {} /** * @brief Execute command diff --git a/src/components/application_manager/include/application_manager/commands/mobile/unregister_app_interface_response.h b/src/components/application_manager/include/application_manager/commands/mobile/unregister_app_interface_response.h index ba36342086..1a459e109c 100644 --- a/src/components/application_manager/include/application_manager/commands/mobile/unregister_app_interface_response.h +++ b/src/components/application_manager/include/application_manager/commands/mobile/unregister_app_interface_response.h @@ -47,15 +47,14 @@ class UnregisterAppInterfaceResponse : public CommandResponseImpl { /** * \brief UnregisterAppInterfaceResponse class constructor **/ - UnregisterAppInterfaceResponse( - const MessageSharedPtr& response, ApplicationManager& application_manager) + UnregisterAppInterfaceResponse(const MessageSharedPtr& response, + ApplicationManager& application_manager) : CommandResponseImpl(response, application_manager) {} /** * \brief UnregisterAppInterfaceResponse class destructor **/ - virtual ~UnregisterAppInterfaceResponse() { - } + virtual ~UnregisterAppInterfaceResponse() {} /** * @brief Execute command diff --git a/src/components/application_manager/include/application_manager/commands/mobile/unsubscribe_button_request.h b/src/components/application_manager/include/application_manager/commands/mobile/unsubscribe_button_request.h index 02610f813d..62600d51d7 100644 --- a/src/components/application_manager/include/application_manager/commands/mobile/unsubscribe_button_request.h +++ b/src/components/application_manager/include/application_manager/commands/mobile/unsubscribe_button_request.h @@ -51,7 +51,8 @@ class UnsubscribeButtonRequest : public CommandRequestImpl { * * @param message Incoming SmartObject message **/ - UnsubscribeButtonRequest(const MessageSharedPtr& message, ApplicationManager& application_manager); + UnsubscribeButtonRequest(const MessageSharedPtr& message, + ApplicationManager& application_manager); /** * @brief UnsubscribeButtonRequest class destructor diff --git a/src/components/application_manager/include/application_manager/commands/mobile/unsubscribe_button_response.h b/src/components/application_manager/include/application_manager/commands/mobile/unsubscribe_button_response.h index c8b8314017..06dbe84578 100644 --- a/src/components/application_manager/include/application_manager/commands/mobile/unsubscribe_button_response.h +++ b/src/components/application_manager/include/application_manager/commands/mobile/unsubscribe_button_response.h @@ -51,7 +51,8 @@ class UnsubscribeButtonResponse : public CommandResponseImpl { * * @param message Incoming SmartObject message **/ - UnsubscribeButtonResponse(const MessageSharedPtr& message, ApplicationManager& application_manager); + UnsubscribeButtonResponse(const MessageSharedPtr& message, + ApplicationManager& application_manager); /** * @brief UnsubscribeButtonResponse class destructor diff --git a/src/components/application_manager/include/application_manager/commands/mobile/unsubscribe_vehicle_data_request.h b/src/components/application_manager/include/application_manager/commands/mobile/unsubscribe_vehicle_data_request.h index bd381ba85d..a6bade2fd6 100644 --- a/src/components/application_manager/include/application_manager/commands/mobile/unsubscribe_vehicle_data_request.h +++ b/src/components/application_manager/include/application_manager/commands/mobile/unsubscribe_vehicle_data_request.h @@ -52,7 +52,8 @@ class UnsubscribeVehicleDataRequest : public CommandRequestImpl { * * @param message Incoming SmartObject message **/ - UnsubscribeVehicleDataRequest(const MessageSharedPtr& message, ApplicationManager& application_manager); + UnsubscribeVehicleDataRequest(const MessageSharedPtr& message, + ApplicationManager& application_manager); /** * @brief UnsubscribeVehicleDataRequest class destructor @@ -83,7 +84,7 @@ class UnsubscribeVehicleDataRequest : public CommandRequestImpl { typedef std::vector<HmiRequest> HmiRequests; HmiRequests hmi_requests_; -#endif // #ifdef HMI_DBUS_API +#endif // #ifdef HMI_DBUS_API private: /** diff --git a/src/components/application_manager/include/application_manager/commands/mobile/unsubscribe_vehicle_data_response.h b/src/components/application_manager/include/application_manager/commands/mobile/unsubscribe_vehicle_data_response.h index 7f29fd07f6..a34a36688c 100644 --- a/src/components/application_manager/include/application_manager/commands/mobile/unsubscribe_vehicle_data_response.h +++ b/src/components/application_manager/include/application_manager/commands/mobile/unsubscribe_vehicle_data_response.h @@ -51,7 +51,8 @@ class UnsubscribeVehicleDataResponse : public CommandResponseImpl { * * @param message Incoming SmartObject message **/ - UnsubscribeVehicleDataResponse(const MessageSharedPtr& message, ApplicationManager& application_manager); + UnsubscribeVehicleDataResponse(const MessageSharedPtr& message, + ApplicationManager& application_manager); /** * @brief UnsubscribeVehicleDataResponse class destructor diff --git a/src/components/application_manager/include/application_manager/commands/mobile/unsubscribe_way_points_request.h b/src/components/application_manager/include/application_manager/commands/mobile/unsubscribe_way_points_request.h index fc0cc7a982..2831551667 100644 --- a/src/components/application_manager/include/application_manager/commands/mobile/unsubscribe_way_points_request.h +++ b/src/components/application_manager/include/application_manager/commands/mobile/unsubscribe_way_points_request.h @@ -40,7 +40,7 @@ namespace application_manager { namespace commands { class UnSubscribeWayPointsRequest : public CommandRequestImpl { -public: + public: /** * \brief UnSubscribeWayPointsRequest class constructor **/ @@ -62,12 +62,13 @@ public: * @param event The received event */ virtual void on_event(const event_engine::Event& event); -private: + + private: DISALLOW_COPY_AND_ASSIGN(UnSubscribeWayPointsRequest); }; -} // commands +} // commands -} // application_manager +} // application_manager -#endif // SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_MOBILE_UNSUBSCRIBE_WAY_POINTS_REQUEST_H_ +#endif // SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_MOBILE_UNSUBSCRIBE_WAY_POINTS_REQUEST_H_ diff --git a/src/components/application_manager/include/application_manager/commands/mobile/unsubscribe_way_points_response.h b/src/components/application_manager/include/application_manager/commands/mobile/unsubscribe_way_points_response.h index d8b46e4dda..70211330a9 100644 --- a/src/components/application_manager/include/application_manager/commands/mobile/unsubscribe_way_points_response.h +++ b/src/components/application_manager/include/application_manager/commands/mobile/unsubscribe_way_points_response.h @@ -44,7 +44,7 @@ namespace commands { * @brief UnsubscribeWayPointsResponse command class **/ class UnsubscribeWayPointsResponse : public CommandResponseImpl { -public: + public: /** * \brief UnsubscribeWayPointsResponse class constructor **/ @@ -60,12 +60,13 @@ public: * @brief Execute command **/ virtual void Run() OVERRIDE; -private: + + private: DISALLOW_COPY_AND_ASSIGN(UnsubscribeWayPointsResponse); }; -} // commands +} // commands -} // application_manager +} // application_manager -#endif // SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_MOBILE_UNSUBSCRIBE_WAY_POINTS_RESPONSE_H_ +#endif // SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_MOBILE_UNSUBSCRIBE_WAY_POINTS_RESPONSE_H_ diff --git a/src/components/application_manager/include/application_manager/commands/mobile/update_turn_list_request.h b/src/components/application_manager/include/application_manager/commands/mobile/update_turn_list_request.h index ee68d9e3af..e15e81caf5 100644 --- a/src/components/application_manager/include/application_manager/commands/mobile/update_turn_list_request.h +++ b/src/components/application_manager/include/application_manager/commands/mobile/update_turn_list_request.h @@ -52,7 +52,8 @@ class UpdateTurnListRequest : public CommandRequestImpl { * * @param message Incoming SmartObject message **/ - UpdateTurnListRequest(const MessageSharedPtr& message, ApplicationManager& application_manager); + UpdateTurnListRequest(const MessageSharedPtr& message, + ApplicationManager& application_manager); /** * @brief UpdateTurnListRequest class destructor diff --git a/src/components/application_manager/include/application_manager/commands/mobile/update_turn_list_response.h b/src/components/application_manager/include/application_manager/commands/mobile/update_turn_list_response.h index 17f81d6742..481ad9f219 100644 --- a/src/components/application_manager/include/application_manager/commands/mobile/update_turn_list_response.h +++ b/src/components/application_manager/include/application_manager/commands/mobile/update_turn_list_response.h @@ -51,7 +51,8 @@ class UpdateTurnListResponse : public CommandResponseImpl { * * @param message Incoming SmartObject message **/ - UpdateTurnListResponse(const MessageSharedPtr& message, ApplicationManager& application_manager); + UpdateTurnListResponse(const MessageSharedPtr& message, + ApplicationManager& application_manager); /** * @brief UpdateTurnListResponse class destructor diff --git a/src/components/application_manager/include/application_manager/event_engine/event.h b/src/components/application_manager/include/application_manager/event_engine/event.h index 7e90227bd7..4b8a4088bf 100644 --- a/src/components/application_manager/include/application_manager/event_engine/event.h +++ b/src/components/application_manager/include/application_manager/event_engine/event.h @@ -47,7 +47,6 @@ namespace smart_objects = NsSmartDeviceLink::NsSmartObjects; class Event { public: - // Typedef for possible Event ID's from mobile_apis functionID enum typedef hmi_apis::FunctionID::eType EventID; @@ -104,11 +103,9 @@ class Event { inline int32_t smart_object_type() const; protected: - private: - - EventID id_; - smart_objects::SmartObject response_so_; + EventID id_; + smart_objects::SmartObject response_so_; /* * @brief Default constructor @@ -129,18 +126,21 @@ const smart_objects::SmartObject& Event::smart_object() const { } int32_t Event::smart_object_function_id() const { - return response_so_.getElement( - strings::params).getElement(strings::function_id).asInt(); + return response_so_.getElement(strings::params) + .getElement(strings::function_id) + .asInt(); } int32_t Event::smart_object_correlation_id() const { - return response_so_.getElement( - strings::params).getElement(strings::correlation_id).asInt(); + return response_so_.getElement(strings::params) + .getElement(strings::correlation_id) + .asInt(); } int32_t Event::smart_object_type() const { - return response_so_.getElement( - strings::params).getElement(strings::message_type).asInt(); + return response_so_.getElement(strings::params) + .getElement(strings::message_type) + .asInt(); } } // namespace event_engine diff --git a/src/components/application_manager/include/application_manager/event_engine/event_dispatcher.h b/src/components/application_manager/include/application_manager/event_engine/event_dispatcher.h index 89e1fd3daf..3d236b9c0f 100644 --- a/src/components/application_manager/include/application_manager/event_engine/event_dispatcher.h +++ b/src/components/application_manager/include/application_manager/event_engine/event_dispatcher.h @@ -43,7 +43,6 @@ class EventObserver; class EventDispatcher { public: - /* * @brief Delivers the event to all subscribers * @@ -59,8 +58,8 @@ class EventDispatcher { * @param observer The observer to subscribe for event */ virtual void add_observer(const Event::EventID& event_id, - int32_t hmi_correlation_id, - EventObserver& observer) = 0; + int32_t hmi_correlation_id, + EventObserver& observer) = 0; /* * @brief Unsubscribes the observer from specific event @@ -69,7 +68,7 @@ class EventDispatcher { * @param observer The observer to be unsubscribed */ virtual void remove_observer(const Event::EventID& event_id, - EventObserver& observer) = 0; + EventObserver& observer) = 0; /* * @brief Unsubscribes the observer from all events @@ -81,8 +80,7 @@ class EventDispatcher { /* * @brief Destructor */ - virtual ~EventDispatcher() { - }; + virtual ~EventDispatcher(){}; }; } // namespace event_engine diff --git a/src/components/application_manager/include/application_manager/event_engine/event_dispatcher_impl.h b/src/components/application_manager/include/application_manager/event_engine/event_dispatcher_impl.h index a36544c945..9a13ad608b 100644 --- a/src/components/application_manager/include/application_manager/event_engine/event_dispatcher_impl.h +++ b/src/components/application_manager/include/application_manager/event_engine/event_dispatcher_impl.h @@ -63,8 +63,12 @@ class EventDispatcherImpl : public EventDispatcher { EventDispatcherImpl(); #ifdef BUILD_TESTS - EventObserverMap get_observers() const { return observers_event_; } - ObserverVector get_observers_list() const { return observers_; } + EventObserverMap get_observers() const { + return observers_event_; + } + ObserverVector get_observers_list() const { + return observers_; + } #endif // BUILD_TESTS /* @@ -82,8 +86,8 @@ class EventDispatcherImpl : public EventDispatcher { * @param observer The observer to subscribe for event */ void add_observer(const Event::EventID& event_id, - int32_t hmi_correlation_id, - EventObserver& observer) OVERRIDE; + int32_t hmi_correlation_id, + EventObserver& observer) OVERRIDE; /* * @brief Unsubscribes the observer from specific event @@ -92,7 +96,7 @@ class EventDispatcherImpl : public EventDispatcher { * @param observer The observer to be unsubscribed */ void remove_observer(const Event::EventID& event_id, - EventObserver& observer) OVERRIDE; + EventObserver& observer) OVERRIDE; /* * @brief Unsubscribes the observer from all events @@ -102,7 +106,6 @@ class EventDispatcherImpl : public EventDispatcher { void remove_observer(EventObserver& observer) OVERRIDE; private: - /* * @brief removes observer * when occurs unsubscribe from event diff --git a/src/components/application_manager/include/application_manager/event_engine/event_observer.h b/src/components/application_manager/include/application_manager/event_engine/event_observer.h index d11591b587..3e910edfa9 100644 --- a/src/components/application_manager/include/application_manager/event_engine/event_observer.h +++ b/src/components/application_manager/include/application_manager/event_engine/event_observer.h @@ -110,4 +110,4 @@ const EventObserver::ObserverID& EventObserver::id() const { } // namespace event_engine } // namespace application_manager -#endif // SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_EVENT_OBSERVER_H_ +#endif // SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_EVENT_OBSERVER_H_ diff --git a/src/components/application_manager/include/application_manager/hmi_capabilities.h b/src/components/application_manager/include/application_manager/hmi_capabilities.h index 70f7987cf4..db76e22fd6 100644 --- a/src/components/application_manager/include/application_manager/hmi_capabilities.h +++ b/src/components/application_manager/include/application_manager/hmi_capabilities.h @@ -54,9 +54,7 @@ namespace application_manager { class ApplicationManager; class HMICapabilities { - public: - /* * @ Class constructor * @@ -139,8 +137,7 @@ class HMICapabilities { * * @return Currently supported UI languages */ - inline const smart_objects::SmartObject* - ui_supported_languages() const; + inline const smart_objects::SmartObject* ui_supported_languages() const; /* * @brief Sets supported UI languages @@ -169,8 +166,7 @@ class HMICapabilities { * * @return Currently supported VR languages */ - inline const smart_objects::SmartObject* - vr_supported_languages() const; + inline const smart_objects::SmartObject* vr_supported_languages() const; /* * @brief Sets supported VR languages @@ -193,15 +189,14 @@ class HMICapabilities { * @param language Currently active TTS language */ void set_active_tts_language( - const hmi_apis::Common_Language::eType& language); + const hmi_apis::Common_Language::eType& language); /* * @brief Retrieves TTS supported languages * * @return Currently supported TTS languages */ - inline const smart_objects::SmartObject* - tts_supported_languages() const; + inline const smart_objects::SmartObject* tts_supported_languages() const; /* * @brief Sets supported TTS languages @@ -216,8 +211,7 @@ class HMICapabilities { * * @return Currently supported display capabilities */ - inline const smart_objects::SmartObject* - display_capabilities() const; + inline const smart_objects::SmartObject* display_capabilities() const; /* * @brief Sets supported display capabilities @@ -232,8 +226,7 @@ class HMICapabilities { * * @return Currently supported HMI zone capabilities */ - inline const smart_objects::SmartObject* - hmi_zone_capabilities() const; + inline const smart_objects::SmartObject* hmi_zone_capabilities() const; /* * @brief Sets supported HMI zone capabilities @@ -248,8 +241,7 @@ class HMICapabilities { * * @return Currently supported SoftButton's capabilities */ - inline const smart_objects::SmartObject* - soft_button_capabilities() const; + inline const smart_objects::SmartObject* soft_button_capabilities() const; /* * @brief Sets supported SoftButton's capabilities @@ -316,8 +308,7 @@ class HMICapabilities { * * @return Currently supported audio_pass_thru capabilities */ - inline const smart_objects::SmartObject* - audio_pass_thru_capabilities() const; + inline const smart_objects::SmartObject* audio_pass_thru_capabilities() const; /* * @brief Retrieves information about the preset bank capabilities @@ -361,7 +352,7 @@ class HMICapabilities { * @param prerecorded_speech supported prerecorded speech */ void set_prerecorded_speech( - const smart_objects::SmartObject& prerecorded_speech); + const smart_objects::SmartObject& prerecorded_speech); /* * @brief Interface used to store information if navigation @@ -394,7 +385,8 @@ class HMICapabilities { inline bool phone_call_supported() const; /* - * @brief Interface used to store information about software version of the target + * @brief Interface used to store information about software version of the + *target * * @param ccpu_version Received system/hmi software version */ @@ -410,7 +402,6 @@ class HMICapabilities { void Init(resumption::LastState* last_state); protected: - /* * @brief Loads capabilities from local file in case SDL was launched * without HMI @@ -429,8 +420,8 @@ class HMICapabilities { * @returns TRUE if member exists and returns FALSE if * member does not exist. */ - bool check_existing_json_member( - const Json::Value& json_member, const char* name_of_member); + bool check_existing_json_member(const Json::Value& json_member, + const char* name_of_member); /* * @brief function converts json object "languages" to smart object @@ -443,42 +434,42 @@ class HMICapabilities { smart_objects::SmartObject& languages); private: - bool is_vr_cooperating_; - bool is_tts_cooperating_; - bool is_ui_cooperating_; - bool is_navi_cooperating_; - bool is_ivi_cooperating_; + bool is_vr_cooperating_; + bool is_tts_cooperating_; + bool is_ui_cooperating_; + bool is_navi_cooperating_; + bool is_ivi_cooperating_; // to check if IsReady response for corresponding interface received - bool is_vr_ready_response_recieved_; - bool is_tts_ready_response_recieved_; - bool is_ui_ready_response_recieved_; - bool is_navi_ready_response_recieved_; - bool is_ivi_ready_response_recieved_; + bool is_vr_ready_response_recieved_; + bool is_tts_ready_response_recieved_; + bool is_ui_ready_response_recieved_; + bool is_navi_ready_response_recieved_; + bool is_ivi_ready_response_recieved_; - bool attenuated_supported_; + bool attenuated_supported_; hmi_apis::Common_Language::eType ui_language_; hmi_apis::Common_Language::eType vr_language_; hmi_apis::Common_Language::eType tts_language_; - smart_objects::SmartObject* vehicle_type_; - smart_objects::SmartObject* ui_supported_languages_; - smart_objects::SmartObject* tts_supported_languages_; - smart_objects::SmartObject* vr_supported_languages_; - smart_objects::SmartObject* display_capabilities_; - smart_objects::SmartObject* hmi_zone_capabilities_; - smart_objects::SmartObject* soft_buttons_capabilities_; - smart_objects::SmartObject* button_capabilities_; - smart_objects::SmartObject* preset_bank_capabilities_; - smart_objects::SmartObject* vr_capabilities_; - smart_objects::SmartObject* speech_capabilities_; - smart_objects::SmartObject* audio_pass_thru_capabilities_; - smart_objects::SmartObject* prerecorded_speech_; - std::string ccpu_version_; - bool is_navigation_supported_; - bool is_phone_call_supported_; - - ApplicationManager& app_mngr_; - HMILanguageHandler hmi_language_handler_; + smart_objects::SmartObject* vehicle_type_; + smart_objects::SmartObject* ui_supported_languages_; + smart_objects::SmartObject* tts_supported_languages_; + smart_objects::SmartObject* vr_supported_languages_; + smart_objects::SmartObject* display_capabilities_; + smart_objects::SmartObject* hmi_zone_capabilities_; + smart_objects::SmartObject* soft_buttons_capabilities_; + smart_objects::SmartObject* button_capabilities_; + smart_objects::SmartObject* preset_bank_capabilities_; + smart_objects::SmartObject* vr_capabilities_; + smart_objects::SmartObject* speech_capabilities_; + smart_objects::SmartObject* audio_pass_thru_capabilities_; + smart_objects::SmartObject* prerecorded_speech_; + std::string ccpu_version_; + bool is_navigation_supported_; + bool is_phone_call_supported_; + + ApplicationManager& app_mngr_; + HMILanguageHandler hmi_language_handler_; DISALLOW_COPY_AND_ASSIGN(HMICapabilities); }; @@ -503,33 +494,33 @@ bool HMICapabilities::is_ivi_cooperating() const { return is_ivi_cooperating_; } -const smart_objects::SmartObject* -HMICapabilities::ui_supported_languages() const { +const smart_objects::SmartObject* HMICapabilities::ui_supported_languages() + const { return ui_supported_languages_; } -const smart_objects::SmartObject* -HMICapabilities::vr_supported_languages() const { +const smart_objects::SmartObject* HMICapabilities::vr_supported_languages() + const { return vr_supported_languages_; } -const smart_objects::SmartObject* -HMICapabilities::tts_supported_languages() const { +const smart_objects::SmartObject* HMICapabilities::tts_supported_languages() + const { return tts_supported_languages_; } -const smart_objects::SmartObject* -HMICapabilities::display_capabilities() const { +const smart_objects::SmartObject* HMICapabilities::display_capabilities() + const { return display_capabilities_; } -const smart_objects::SmartObject* -HMICapabilities::hmi_zone_capabilities() const { +const smart_objects::SmartObject* HMICapabilities::hmi_zone_capabilities() + const { return hmi_zone_capabilities_; } -const smart_objects::SmartObject* -HMICapabilities::soft_button_capabilities() const { +const smart_objects::SmartObject* HMICapabilities::soft_button_capabilities() + const { return soft_buttons_capabilities_; } @@ -537,8 +528,7 @@ const smart_objects::SmartObject* HMICapabilities::button_capabilities() const { return button_capabilities_; } -const smart_objects::SmartObject* -HMICapabilities::speech_capabilities() const { +const smart_objects::SmartObject* HMICapabilities::speech_capabilities() const { return speech_capabilities_; } @@ -551,8 +541,8 @@ HMICapabilities::audio_pass_thru_capabilities() const { return audio_pass_thru_capabilities_; } -const smart_objects::SmartObject* -HMICapabilities::preset_bank_capabilities() const { +const smart_objects::SmartObject* HMICapabilities::preset_bank_capabilities() + const { return preset_bank_capabilities_; } @@ -564,8 +554,7 @@ const smart_objects::SmartObject* HMICapabilities::vehicle_type() const { return vehicle_type_; } -const smart_objects::SmartObject* -HMICapabilities::prerecorded_speech() const { +const smart_objects::SmartObject* HMICapabilities::prerecorded_speech() const { return prerecorded_speech_; } diff --git a/src/components/application_manager/include/application_manager/hmi_language_handler.h b/src/components/application_manager/include/application_manager/hmi_language_handler.h index fe5d480c79..6e4d9785f6 100644 --- a/src/components/application_manager/include/application_manager/hmi_language_handler.h +++ b/src/components/application_manager/include/application_manager/hmi_language_handler.h @@ -41,7 +41,6 @@ class LastState; } namespace application_manager { - class ApplicationManager; /** * Class is used to handle edge case with slow HMI responses for current @@ -50,18 +49,14 @@ class ApplicationManager; * responses are gotten and after responses were received their language(s) * mismatch to current on HMI - apps have to be unregistered. **/ -class HMILanguageHandler: public event_engine::EventObserver { -public: +class HMILanguageHandler : public event_engine::EventObserver { + public: typedef std::map<uint32_t, bool> Apps; /** * @brief System interfaces */ - enum Interface { - INTERFACE_UI, - INTERFACE_VR, - INTERFACE_TTS - }; + enum Interface { INTERFACE_UI, INTERFACE_VR, INTERFACE_TTS }; /** * @brief Class constructor @@ -90,7 +85,7 @@ public: * @param request Request object */ void set_handle_response_for( - const event_engine::smart_objects::SmartObject& request); + const event_engine::smart_objects::SmartObject& request); /** * @brief Sets default languages from HMI capabilities @@ -103,7 +98,7 @@ public: hmi_apis::Common_Language::eType tts); void Init(resumption::LastState* value); -private: + private: void SendOnLanguageChangeToMobile(uint32_t connection_key); /** @@ -180,7 +175,6 @@ private: ApplicationManager& application_manager_; }; -} // namespace application_manager - -#endif // SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_HMI_LANGUAGE_HANDLER_H_ +} // namespace application_manager +#endif // SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_HMI_LANGUAGE_HANDLER_H_ diff --git a/src/components/application_manager/include/application_manager/hmi_state.h b/src/components/application_manager/include/application_manager/hmi_state.h index ffdb183149..93784e9671 100644 --- a/src/components/application_manager/include/application_manager/hmi_state.h +++ b/src/components/application_manager/include/application_manager/hmi_state.h @@ -71,7 +71,9 @@ class HmiState { }; HmiState(uint32_t app_id, const ApplicationManager& app_mngr); - HmiState(uint32_t app_id, const ApplicationManager& app_mngr, StateID state_id); + HmiState(uint32_t app_id, + const ApplicationManager& app_mngr, + StateID state_id); virtual ~HmiState() {} @@ -203,7 +205,8 @@ class HmiState { */ class VRHmiState : public HmiState { public: - virtual mobile_apis::AudioStreamingState::eType audio_streaming_state() const OVERRIDE; + virtual mobile_apis::AudioStreamingState::eType audio_streaming_state() + const OVERRIDE; VRHmiState(uint32_t app_id, const ApplicationManager& app_mngr); }; @@ -213,7 +216,8 @@ class VRHmiState : public HmiState { class TTSHmiState : public HmiState { public: TTSHmiState(uint32_t app_id, const ApplicationManager& app_mngr); - virtual mobile_apis::AudioStreamingState::eType audio_streaming_state() const OVERRIDE; + virtual mobile_apis::AudioStreamingState::eType audio_streaming_state() + const OVERRIDE; }; /** @@ -223,11 +227,13 @@ class TTSHmiState : public HmiState { class NaviStreamingHmiState : public HmiState { public: NaviStreamingHmiState(uint32_t app_id, const ApplicationManager& app_mngr); - mobile_apis::AudioStreamingState::eType audio_streaming_state() const OVERRIDE; + mobile_apis::AudioStreamingState::eType audio_streaming_state() + const OVERRIDE; }; /** - * @brief The PhoneCallHmiState class implements logic of PhoneCall temporary state + * @brief The PhoneCallHmiState class implements logic of PhoneCall temporary + * state */ class PhoneCallHmiState : public HmiState { public: @@ -281,7 +287,8 @@ class AudioSource : public HmiState { }; /** - * @brief The EmbeddedNavi class implements logic of OnEventChanged(EMBEDDED_NAVI) + * @brief The EmbeddedNavi class implements logic of + * OnEventChanged(EMBEDDED_NAVI) * temporary state */ class EmbeddedNavi : public HmiState { @@ -293,6 +300,5 @@ class EmbeddedNavi : public HmiState { return mobile_apis::AudioStreamingState::NOT_AUDIBLE; } }; - } #endif // SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_HMISTATE_H diff --git a/src/components/application_manager/include/application_manager/message_helper.h b/src/components/application_manager/include/application_manager/message_helper.h index 0b91bcf257..ab89883ad2 100644 --- a/src/components/application_manager/include/application_manager/message_helper.h +++ b/src/components/application_manager/include/application_manager/message_helper.h @@ -81,9 +81,9 @@ class MessageHelper { * (e.g. gps, odometer, fuel_level) */ static void CreateGetVehicleDataRequest( - const uint32_t correlation_id, - const std::vector<std::string>& params, - ApplicationManager &app_mngr); + const uint32_t correlation_id, + const std::vector<std::string>& params, + ApplicationManager& app_mngr); /** * @brief Create mobile HashUpdateNotification @@ -94,7 +94,8 @@ class MessageHelper { /** * @brief Sends to mobile HashUpdateNotification */ - static void SendHashUpdateNotification(const uint32_t app_id, ApplicationManager &app_mngr); + static void SendHashUpdateNotification(const uint32_t app_id, + ApplicationManager& app_mngr); /** * @brief Sends OnLanguageChange notification to application @@ -198,9 +199,10 @@ class MessageHelper { * @param devices Devices list * */ - static smart_objects::SmartObjectSPtr CreateDeviceListSO(const connection_handler::DeviceMap& devices, - const policy::PolicyHandlerInterface& policy_handler, - ApplicationManager &app_mngr); + static smart_objects::SmartObjectSPtr CreateDeviceListSO( + const connection_handler::DeviceMap& devices, + const policy::PolicyHandlerInterface& policy_handler, + ApplicationManager& app_mngr); static smart_objects::SmartObjectSPtr CreateModuleInfoSO( uint32_t function_id, ApplicationManager& app_mngr); @@ -211,30 +213,35 @@ class MessageHelper { /** * @brief Sends IVI subscription requests */ - static bool SendIVISubscribtions(const uint32_t app_id, ApplicationManager &app_mngr); + static bool SendIVISubscribtions(const uint32_t app_id, + ApplicationManager& app_mngr); /** * @brief Returns IVI subscription requests */ - static smart_objects::SmartObjectList GetIVISubscriptionRequests(ApplicationSharedPtr app, ApplicationManager& app_mngr); + static smart_objects::SmartObjectList GetIVISubscriptionRequests( + ApplicationSharedPtr app, ApplicationManager& app_mngr); /** * @brief Sends button subscription notification */ static void SendOnButtonSubscriptionNotification( - const uint32_t app_id, - const hmi_apis::Common_ButtonName::eType button, - const bool is_subscribed, - ApplicationManager &app_mngr); + const uint32_t app_id, + const hmi_apis::Common_ButtonName::eType button, + const bool is_subscribed, + ApplicationManager& app_mngr); /** * @brief Sends button subscription notifications for all buttons * that application is subscribed on */ - static void SendAllOnButtonSubscriptionNotificationsForApp(ApplicationConstSharedPtr app, ApplicationManager &app_mngr); + static void SendAllOnButtonSubscriptionNotificationsForApp( + ApplicationConstSharedPtr app, ApplicationManager& app_mngr); - static void SendAppDataToHMI(ApplicationConstSharedPtr app, ApplicationManager& app_man); - static void SendGlobalPropertiesToHMI(ApplicationConstSharedPtr app, ApplicationManager &app_mngr); + static void SendAppDataToHMI(ApplicationConstSharedPtr app, + ApplicationManager& app_man); + static void SendGlobalPropertiesToHMI(ApplicationConstSharedPtr app, + ApplicationManager& app_mngr); static smart_objects::SmartObjectList CreateGlobalPropertiesRequestsToHMI( ApplicationConstSharedPtr app, const uint32_t correlation_id); @@ -243,9 +250,12 @@ class MessageHelper { static smart_objects::SmartObjectList CreateShowRequestToHMI( ApplicationConstSharedPtr app, const uint32_t correlation_id); - static void SendShowRequestToHMI(ApplicationConstSharedPtr app, ApplicationManager &app_mngr); - static void SendShowConstantTBTRequestToHMI(ApplicationConstSharedPtr app, ApplicationManager& app_man); - static void SendAddCommandRequestToHMI(ApplicationConstSharedPtr app, ApplicationManager &app_man); + static void SendShowRequestToHMI(ApplicationConstSharedPtr app, + ApplicationManager& app_mngr); + static void SendShowConstantTBTRequestToHMI(ApplicationConstSharedPtr app, + ApplicationManager& app_man); + static void SendAddCommandRequestToHMI(ApplicationConstSharedPtr app, + ApplicationManager& app_man); static smart_objects::SmartObjectList CreateAddCommandRequestToHMI( ApplicationConstSharedPtr app, ApplicationManager& app_mngr); @@ -257,15 +267,21 @@ class MessageHelper { * @brief Sends UI_ChangeRegistration to HMI with list of AppHMIType * @param app applicaton instace */ - static void SendUIChangeRegistrationRequestToHMI(ApplicationConstSharedPtr app, ApplicationManager &app_mngr); - static void SendChangeRegistrationRequestToHMI(ApplicationConstSharedPtr app, ApplicationManager &app_mngr); - static void SendAddVRCommandToHMI(uint32_t cmd_id, + static void SendUIChangeRegistrationRequestToHMI( + ApplicationConstSharedPtr app, ApplicationManager& app_mngr); + static void SendChangeRegistrationRequestToHMI(ApplicationConstSharedPtr app, + ApplicationManager& app_mngr); + static void SendAddVRCommandToHMI( + uint32_t cmd_id, const smart_objects::SmartObject& vr_commands, - const uint32_t app_id, ApplicationManager &app_mngr); + const uint32_t app_id, + ApplicationManager& app_mngr); - static smart_objects::SmartObjectSPtr CreateAddVRCommandToHMI(uint32_t cmd_id, + static smart_objects::SmartObjectSPtr CreateAddVRCommandToHMI( + uint32_t cmd_id, const smart_objects::SmartObject& vr_commands, - const uint32_t app_id, ApplicationManager &app_mngr); + const uint32_t app_id, + ApplicationManager& app_mngr); /* * @brief Create Common.HMIApplication struct application instance @@ -273,13 +289,17 @@ class MessageHelper { * @param output smart object to store Common.HMIApplication struct * @return true on succes, otherwise return false; */ - static bool CreateHMIApplicationStruct(ApplicationConstSharedPtr app, + static bool CreateHMIApplicationStruct( + ApplicationConstSharedPtr app, const protocol_handler::SessionObserver& session_observer, - const policy::PolicyHandlerInterface &policy_handler, - smart_objects::SmartObject* output, ApplicationManager &app_mngr); + const policy::PolicyHandlerInterface& policy_handler, + smart_objects::SmartObject* output, + ApplicationManager& app_mngr); - static void SendAddSubMenuRequestToHMI(ApplicationConstSharedPtr app, ApplicationManager &app_mngr); - static smart_objects::SmartObjectList CreateAddSubMenuRequestToHMI(ApplicationConstSharedPtr app, const uint32_t correlation_id); + static void SendAddSubMenuRequestToHMI(ApplicationConstSharedPtr app, + ApplicationManager& app_mngr); + static smart_objects::SmartObjectList CreateAddSubMenuRequestToHMI( + ApplicationConstSharedPtr app, const uint32_t correlation_id); /* * @brief Creates BasicCommunication.OnAppUnregistered notification @@ -287,29 +307,36 @@ class MessageHelper { * @param is_unexpected_disconnect * Indicates if connection was unexpectedly lost by TM or HB */ - static void SendOnAppUnregNotificationToHMI(ApplicationConstSharedPtr app, bool is_unexpected_disconnect, ApplicationManager &app_mngr); + static void SendOnAppUnregNotificationToHMI(ApplicationConstSharedPtr app, + bool is_unexpected_disconnect, + ApplicationManager& app_mngr); static NsSmartDeviceLink::NsSmartObjects::SmartObjectSPtr - GetBCActivateAppRequestToHMI(ApplicationConstSharedPtr app, + GetBCActivateAppRequestToHMI( + ApplicationConstSharedPtr app, const protocol_handler::SessionObserver& session_observer, const policy::PolicyHandlerInterface& policy_handler, hmi_apis::Common_HMILevel::eType level, - bool send_policy_priority, ApplicationManager &app_mngr); + bool send_policy_priority, + ApplicationManager& app_mngr); - static void SendOnResumeAudioSourceToHMI(const uint32_t app_id, ApplicationManager &app_mngr); + static void SendOnResumeAudioSourceToHMI(const uint32_t app_id, + ApplicationManager& app_mngr); /** * @brief Send SDL_ActivateApp response to HMI * @param permissions response parameters */ - static void SendSDLActivateAppResponse(policy::AppPermissions& permissions, uint32_t correlation_id, - ApplicationManager &app_mngr); + static void SendSDLActivateAppResponse(policy::AppPermissions& permissions, + uint32_t correlation_id, + ApplicationManager& app_mngr); /** * @brief Send OnSDLConsentNeeded to HMI for device data consent by user * @param device_info Device info, e.g. mac, handle, name */ - static void SendOnSDLConsentNeeded(const policy::DeviceParams& device_info, ApplicationManager& app_man); + static void SendOnSDLConsentNeeded(const policy::DeviceParams& device_info, + ApplicationManager& app_man); /** * @brief Send request to SyncP process to read file and send @@ -321,15 +348,17 @@ class MessageHelper { static void SendPolicyUpdate(const std::string& file_path, int timeout, const std::vector<int>& retries, - ApplicationManager &app_mngr); + ApplicationManager& app_mngr); /** * @brief Send GetUserFriendlyMessage response to HMI * @param msg Appopriate messages params * @param correlation_id Correlation id of request */ - static void SendGetUserFriendlyMessageResponse(const std::vector<policy::UserFriendlyMessage>& msg, - uint32_t correlation_id, ApplicationManager &app_mngr); + static void SendGetUserFriendlyMessageResponse( + const std::vector<policy::UserFriendlyMessage>& msg, + uint32_t correlation_id, + ApplicationManager& app_mngr); /** * @brief Send GetListOfPermissions response to HMI @@ -347,7 +376,7 @@ class MessageHelper { * @param connection_key Application connection key * */ - static void SendNaviStartStream(int32_t app_id, ApplicationManager &app_mngr); + static void SendNaviStartStream(int32_t app_id, ApplicationManager& app_mngr); /* * @brief Sends notification to HMI to stop video streaming @@ -355,7 +384,7 @@ class MessageHelper { * @param connection_key Application connection key * */ - static void SendNaviStopStream(int32_t app_id, ApplicationManager &app_mngr); + static void SendNaviStopStream(int32_t app_id, ApplicationManager& app_mngr); /* * @brief Send notification for Update of Policy Table @@ -365,13 +394,16 @@ class MessageHelper { * @param url If empty string, no URL is provided * @param timeout If -1 no timeout is provdied */ - static void SendPolicySnapshotNotification(uint32_t connection_key, + static void SendPolicySnapshotNotification( + uint32_t connection_key, const std::vector<uint8_t>& policy_data, const std::string& url, ApplicationManager& app_mngr); - static void SendSystemRequestNotification(uint32_t connection_key, - NsSmartDeviceLink::NsSmartObjects::SmartObject& content, ApplicationManager &app_mngr); + static void SendSystemRequestNotification( + uint32_t connection_key, + NsSmartDeviceLink::NsSmartObjects::SmartObject& content, + ApplicationManager& app_mngr); /** * @brief SendLaunchApp allows to send OnSystemRequest with LAUNCH_UP. @@ -399,7 +431,10 @@ class MessageHelper { * @param connection_key Id of application to send message to * @param permissions updated permissions for application */ - static void SendOnPermissionsChangeNotification(uint32_t connection_key, const policy::Permissions& permissions, ApplicationManager &app_mngr); + static void SendOnPermissionsChangeNotification( + uint32_t connection_key, + const policy::Permissions& permissions, + ApplicationManager& app_mngr); /* * @brief Send notification to HMI on application permissions update @@ -407,7 +442,9 @@ class MessageHelper { * @param permissions updated permissions for application */ static void SendOnAppPermissionsChangedNotification( - uint32_t connection_key, const policy::AppPermissions& permissions, ApplicationManager& app_mngr); + uint32_t connection_key, + const policy::AppPermissions& permissions, + ApplicationManager& app_mngr); /** * @brief Send GetStatusUpdate response to HMI with current policy update @@ -416,7 +453,8 @@ class MessageHelper { * @param correlation_id Correlation id from request */ static void SendGetStatusUpdateResponse(const std::string& status, - const uint32_t correlation_id, ApplicationManager &app_mngr); + const uint32_t correlation_id, + ApplicationManager& app_mngr); /** * @brief Send UpdateSDL response to HMI with policy update result @@ -424,18 +462,20 @@ class MessageHelper { * @param correlation_id Correlation id from request */ static void SendUpdateSDLResponse(const std::string& result, - const uint32_t correlation_id, ApplicationManager &app_mngr); + const uint32_t correlation_id, + ApplicationManager& app_mngr); /** * @brief Send OnStatusUpdate to HMI on policy update status change * @param status Policy table update status */ - static void SendOnStatusUpdate(const std::string& status, ApplicationManager& app_mngr); + static void SendOnStatusUpdate(const std::string& status, + ApplicationManager& app_mngr); /** * @brief Send GetSystemInfo request to HMI */ - static void SendGetSystemInfoRequest(ApplicationManager &app_mngr); + static void SendGetSystemInfoRequest(ApplicationManager& app_mngr); /* * @brief Sends notification to HMI to start audio streaming @@ -443,7 +483,8 @@ class MessageHelper { * @param connection_key Application connection key * */ - static void SendAudioStartStream(int32_t app_id, ApplicationManager &app_mngr); + static void SendAudioStartStream(int32_t app_id, + ApplicationManager& app_mngr); /* * @brief Sends notification to HMI to stop audio streaming @@ -451,10 +492,12 @@ class MessageHelper { * @param connection_key Application connection key * */ - static void SendAudioStopStream(int32_t connection_key, ApplicationManager &app_mngr); + static void SendAudioStopStream(int32_t connection_key, + ApplicationManager& app_mngr); static void SendOnDataStreaming(protocol_handler::ServiceType service, - bool available, ApplicationManager &app_mngr); + bool available, + ApplicationManager& app_mngr); /* * @brief Sends notification to HMI to stop audioPathThru @@ -463,7 +506,7 @@ class MessageHelper { * * @return TRUE on SUCCES otherwise return FALSE */ - static bool SendStopAudioPathThru(ApplicationManager &app_mngr); + static bool SendStopAudioPathThru(ApplicationManager& app_mngr); /** * @brief Sends UnsubscribeWayPoints request @@ -504,9 +547,14 @@ class MessageHelper { * */ static mobile_apis::Result::eType VerifyImageFiles( - smart_objects::SmartObject& message, ApplicationConstSharedPtr app, ApplicationManager& app_mngr); + smart_objects::SmartObject& message, + ApplicationConstSharedPtr app, + ApplicationManager& app_mngr); - static mobile_apis::Result::eType VerifyImageVrHelpItems(smart_objects::SmartObject& message, ApplicationConstSharedPtr app, ApplicationManager &app_mngr); + static mobile_apis::Result::eType VerifyImageVrHelpItems( + smart_objects::SmartObject& message, + ApplicationConstSharedPtr app, + ApplicationManager& app_mngr); /** * @brief Checks string if it contains incorrect character \t\n \\t \\n @@ -553,76 +601,80 @@ class MessageHelper { static std::string CommonLanguageToString( hmi_apis::Common_Language::eType language); - /** - * @brief Converts string to mobile language enum value - * @param language language as string - * @return Mobile language enum value - */ - static mobile_apis::Language::eType MobileLanguageFromString( - const std::string& language); - - /** - * @brief Converts mobile language enum to HMI language enum - * @param language Mobile language enum - * @return HMI language enum - */ - static hmi_apis::Common_Language::eType MobileToCommonLanguage( - const mobile_apis::Language::eType language); - - /** - * @brief Converts HMI language enum to mobile language enum - * @param language HMI language enum - * @return Mobile language enum - */ - static mobile_apis::Language::eType CommonToMobileLanguage( - const hmi_apis::Common_Language::eType language); - - /** - * @brief Gets command limit number per minute for specific application - * @param policy_app_id Unique application id - * @return Limit for number of command per minute - */ - static uint32_t GetAppCommandLimit(const std::string& policy_app_id); - - /** - * @brief Creates TTS.SetGlobalProperties request and sends - * to HMI for VCA module. - * @param app contains application which sends TTS GlobalProperties to HMI - * after timeout or first time when application register with level NONE or - * BACKGROUND - * @param default_help_prompt - * if default_help_prompt=TRUE->TTSGlobalProperties request will be created with - * default helpPrompt array, otherwise TTSGlobalProperties request will be created - * with empty helpPrompt array. - */ - static void SendTTSGlobalProperties( - ApplicationSharedPtr app, const bool default_help_prompt, ApplicationManager& app_man); - - /** - * @brief SendSetAppIcon allows to send SetAppIcon request. - * - * @param app_id application for which icon request should be sent. - * - * @param icon_path path to the icon. - */ - static void SendSetAppIcon(const uint32_t app_id, - const std::string& icon_path, - ApplicationManager& application_manager); - - static hmi_apis::Common_Language::eType CommonLanguageFromString( - const std::string& language); - - static smart_objects::SmartObjectSPtr - GetOnAppInterfaceUnregisteredNotificationToMobile( - int32_t connection_key, - mobile_api::AppInterfaceUnregisteredReason::eType reason); - - private: + /** + * @brief Converts string to mobile language enum value + * @param language language as string + * @return Mobile language enum value + */ + static mobile_apis::Language::eType MobileLanguageFromString( + const std::string& language); + + /** + * @brief Converts mobile language enum to HMI language enum + * @param language Mobile language enum + * @return HMI language enum + */ + static hmi_apis::Common_Language::eType MobileToCommonLanguage( + const mobile_apis::Language::eType language); + + /** + * @brief Converts HMI language enum to mobile language enum + * @param language HMI language enum + * @return Mobile language enum + */ + static mobile_apis::Language::eType CommonToMobileLanguage( + const hmi_apis::Common_Language::eType language); + + /** + * @brief Gets command limit number per minute for specific application + * @param policy_app_id Unique application id + * @return Limit for number of command per minute + */ + static uint32_t GetAppCommandLimit(const std::string& policy_app_id); + + /** + * @brief Creates TTS.SetGlobalProperties request and sends + * to HMI for VCA module. + * @param app contains application which sends TTS GlobalProperties to HMI + * after timeout or first time when application register with level NONE or + * BACKGROUND + * @param default_help_prompt + * if default_help_prompt=TRUE->TTSGlobalProperties request will be created + * with + * default helpPrompt array, otherwise TTSGlobalProperties request will be + * created + * with empty helpPrompt array. + */ + static void SendTTSGlobalProperties(ApplicationSharedPtr app, + const bool default_help_prompt, + ApplicationManager& app_man); + + /** + * @brief SendSetAppIcon allows to send SetAppIcon request. + * + * @param app_id application for which icon request should be sent. + * + * @param icon_path path to the icon. + */ + static void SendSetAppIcon(const uint32_t app_id, + const std::string& icon_path, + ApplicationManager& application_manager); + + static hmi_apis::Common_Language::eType CommonLanguageFromString( + const std::string& language); + + static smart_objects::SmartObjectSPtr + GetOnAppInterfaceUnregisteredNotificationToMobile( + int32_t connection_key, + mobile_api::AppInterfaceUnregisteredReason::eType reason); + + private: /** * @brief Creates new request object and fill its header * @return New request object */ - static smart_objects::SmartObjectSPtr CreateRequestObject(const uint32_t correlation_id); + static smart_objects::SmartObjectSPtr CreateRequestObject( + const uint32_t correlation_id); /** * @brief Allows to fill SO according to the current permissions. @@ -633,12 +685,12 @@ class MessageHelper { const policy::AppPermissions& permissions, smart_objects::SmartObject& message); - static smart_objects::SmartObjectSPtr CreateChangeRegistration( - const int32_t function_id, - const int32_t language, - const uint32_t app_id, - const smart_objects::SmartObject* app_types, - ApplicationManager& app_mngr); + static smart_objects::SmartObjectSPtr CreateChangeRegistration( + const int32_t function_id, + const int32_t language, + const uint32_t app_id, + const smart_objects::SmartObject* app_types, + ApplicationManager& app_mngr); MessageHelper(); diff --git a/src/components/application_manager/include/application_manager/policies/delegates/app_permission_delegate.h b/src/components/application_manager/include/application_manager/policies/delegates/app_permission_delegate.h index 9acd258b67..6913f5038e 100644 --- a/src/components/application_manager/include/application_manager/policies/delegates/app_permission_delegate.h +++ b/src/components/application_manager/include/application_manager/policies/delegates/app_permission_delegate.h @@ -33,7 +33,6 @@ #ifndef SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_DELEGATES_APP_PERMISSION_DELEGATE_H_ #define SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_DELEGATES_APP_PERMISSION_DELEGATE_H_ - #include "utils/threads/thread.h" #include "utils/threads/thread_delegate.h" #include "utils/conditional_variable.h" @@ -42,42 +41,42 @@ #include "application_manager/policies/policy_handler_interface.h" namespace policy { +/** +*@brief The AppPermissionDelegate class allows to call OnAppPermissionConsent +*in async way. +*/ +class AppPermissionDelegate : public threads::ThreadDelegate { + public: /** - * @brief The AppPermissionDelegate class allows to call OnAppPermissionConsent - * in async way. - */ -class AppPermissionDelegate: public threads::ThreadDelegate { - public: - /** - * @brief AppPermissionDelegate constructor, contains parameters - * which will be pass to the called function. - * - * @param connection_key connection key. - * - * @param permissions new permissions - */ - AppPermissionDelegate(const uint32_t connection_key, - const PermissionConsent& permissions, - policy::PolicyHandlerInterface& policy_handler); + * @brief AppPermissionDelegate constructor, contains parameters + * which will be pass to the called function. + * + * @param connection_key connection key. + * + * @param permissions new permissions + */ + AppPermissionDelegate(const uint32_t connection_key, + const PermissionConsent& permissions, + policy::PolicyHandlerInterface& policy_handler); - /** - * @brief threadMain run the needed function. - */ - virtual void threadMain(); + /** + * @brief threadMain run the needed function. + */ + virtual void threadMain(); - /** - * @brief exitThreadMain do some stuff before exit from thread - * - * @return true in case when thread has been finished properly - */ - virtual void exitThreadMain(); + /** + * @brief exitThreadMain do some stuff before exit from thread + * + * @return true in case when thread has been finished properly + */ + virtual void exitThreadMain(); - private: - uint32_t connection_key_; - PermissionConsent permissions_; - policy::PolicyHandlerInterface& policy_handler_; + private: + uint32_t connection_key_; + PermissionConsent permissions_; + policy::PolicyHandlerInterface& policy_handler_; }; -} // namespace policy +} // namespace policy -#endif // SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_DELEGATES_APP_PERMISSION_DELEGATE_H_ +#endif // SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_DELEGATES_APP_PERMISSION_DELEGATE_H_ diff --git a/src/components/application_manager/include/application_manager/policies/policy_event_observer.h b/src/components/application_manager/include/application_manager/policies/policy_event_observer.h index b2de2fde36..13f070a1ec 100644 --- a/src/components/application_manager/include/application_manager/policies/policy_event_observer.h +++ b/src/components/application_manager/include/application_manager/policies/policy_event_observer.h @@ -41,8 +41,8 @@ namespace smart_objects = NsSmartDeviceLink::NsSmartObjects; class PolicyHandlerInterface; -class PolicyEventObserver : - public application_manager::event_engine::EventObserver { +class PolicyEventObserver + : public application_manager::event_engine::EventObserver { public: PolicyEventObserver( policy::PolicyHandlerInterface* const policy_handler, @@ -52,6 +52,7 @@ class PolicyEventObserver : void subscribe_on_event( const application_manager::event_engine::Event::EventID& event_id, int32_t hmi_correlation_id = 0); + private: sync_primitives::Lock policy_handler_lock_; PolicyHandlerInterface* policy_handler_; diff --git a/src/components/application_manager/include/application_manager/policies/policy_handler.h b/src/components/application_manager/include/application_manager/policies/policy_handler.h index 26872a5af5..993462ecb8 100644 --- a/src/components/application_manager/include/application_manager/policies/policy_handler.h +++ b/src/components/application_manager/include/application_manager/policies/policy_handler.h @@ -68,10 +68,9 @@ typedef std::vector<uint32_t> AppIds; typedef std::vector<uint32_t> DeviceHandles; namespace custom_str = utils::custom_string; -class PolicyHandler - : public PolicyHandlerInterface, - public PolicyListener, - public threads::AsyncRunner { +class PolicyHandler : public PolicyHandlerInterface, + public PolicyListener, + public threads::AsyncRunner { public: PolicyHandler(const policy::PolicySettings& get_settings, application_manager::ApplicationManager& application_manager); @@ -81,7 +80,8 @@ class PolicyHandler bool InitPolicyTable() OVERRIDE; bool ResetPolicyTable() OVERRIDE; bool ClearUserConsent() OVERRIDE; - bool SendMessageToSDK(const BinaryMessage& pt_string, const std::string& url) OVERRIDE; + bool SendMessageToSDK(const BinaryMessage& pt_string, + const std::string& url) OVERRIDE; bool ReceiveMessageFromSDK(const std::string& file, const BinaryMessage& pt_string) OVERRIDE; bool UnloadPolicyLibrary() OVERRIDE; @@ -94,7 +94,8 @@ class PolicyHandler virtual void OnSnapshotCreated(const BinaryMessage& pt_string) OVERRIDE; - virtual bool GetPriority(const std::string& policy_app_id, std::string* priority) const OVERRIDE; + virtual bool GetPriority(const std::string& policy_app_id, + std::string* priority) const OVERRIDE; void CheckPermissions(const PTString& app_id, const PTString& hmi_level, const PTString& rpc, @@ -102,7 +103,8 @@ class PolicyHandler CheckPermissionResult& result) OVERRIDE; uint32_t GetNotificationsNumber(const std::string& priority) const OVERRIDE; - virtual DeviceConsent GetUserConsentForDevice(const std::string& device_id) const OVERRIDE; + virtual DeviceConsent GetUserConsentForDevice( + const std::string& device_id) const OVERRIDE; bool GetDefaultHmi(const std::string& policy_app_id, std::string* default_hmi) const OVERRIDE; bool GetInitialAppData(const std::string& application_id, @@ -119,7 +121,8 @@ class PolicyHandler void add_listener(PolicyHandlerObserver* listener) OVERRIDE; void remove_listener(PolicyHandlerObserver* listener) OVERRIDE; - utils::SharedPtr<usage_statistics::StatisticsManager> GetStatisticManager() const OVERRIDE; + utils::SharedPtr<usage_statistics::StatisticsManager> GetStatisticManager() + const OVERRIDE; /** * @brief CheckSystemAction allows to check whether certain system @@ -149,8 +152,8 @@ class PolicyHandler * @param Device id or empty string, if concern to all SDL functionality * @param User consent from response */ - void OnAllowSDLFunctionalityNotification(bool is_allowed, - const std::string& device_id) OVERRIDE; + void OnAllowSDLFunctionalityNotification( + bool is_allowed, const std::string& device_id) OVERRIDE; /** * @brief Increment counter for ignition cycles @@ -228,7 +231,8 @@ class PolicyHandler * application * @param policy_app_id Application id */ - std::string OnCurrentDeviceIdUpdateRequired(const std::string& policy_app_id) OVERRIDE; + std::string OnCurrentDeviceIdUpdateRequired( + const std::string& policy_app_id) OVERRIDE; /** * @brief Set parameters from OnSystemInfoChanged to policy table @@ -260,7 +264,8 @@ class PolicyHandler * @brief Allows to update vechicle data info. * @param SmartObject which contains all needed information. */ - virtual void OnVehicleDataUpdated(const smart_objects::SmartObject& message) OVERRIDE; + virtual void OnVehicleDataUpdated( + const smart_objects::SmartObject& message) OVERRIDE; /** * Removes device @@ -286,12 +291,14 @@ class PolicyHandler */ uint32_t GetAppIdForSending() const OVERRIDE; - custom_str::CustomString GetAppName(const std::string& policy_app_id) OVERRIDE; + custom_str::CustomString GetAppName( + const std::string& policy_app_id) OVERRIDE; virtual void OnUpdateHMIAppType( std::map<std::string, StringArray> app_hmi_types) OVERRIDE; - virtual void OnCertificateUpdated(const std::string& certificate_data) OVERRIDE; + virtual void OnCertificateUpdated( + const std::string& certificate_data) OVERRIDE; virtual bool CanUpdate() OVERRIDE; @@ -354,8 +361,9 @@ class PolicyHandler * @param type Request type * @return true, if allowed, otherwise - false */ - bool IsRequestTypeAllowed(const std::string& policy_app_id, - mobile_apis::RequestType::eType type) const OVERRIDE; + bool IsRequestTypeAllowed( + const std::string& policy_app_id, + mobile_apis::RequestType::eType type) const OVERRIDE; /** * @brief Gets application request types @@ -401,9 +409,9 @@ class PolicyHandler std::string RetrieveCertificate() const OVERRIDE; #endif // ENABLE_SECURITY - const PolicySettings &get_settings() const OVERRIDE; + const PolicySettings& get_settings() const OVERRIDE; - protected: + protected: /** * Starts next retry exchange policy table */ @@ -447,8 +455,7 @@ class PolicyHandler private: class StatisticManagerImpl : public usage_statistics::StatisticsManager { - public: - + public: StatisticManagerImpl(PolicyHandler* policy_handler) : policy_handler_(policy_handler) { DCHECK(policy_handler_); @@ -459,25 +466,26 @@ class PolicyHandler } void Increment(const std::string& app_id, - usage_statistics::AppCounterId type) { + usage_statistics::AppCounterId type) { policy_handler_->AsyncRun( new StatisticsDelegate(*policy_handler_, app_id, type)); } void Set(const std::string& app_id, - usage_statistics::AppInfoId type, - const std::string& value) { + usage_statistics::AppInfoId type, + const std::string& value) { policy_handler_->AsyncRun( new StatisticsDelegate(*policy_handler_, app_id, type, value)); } void Add(const std::string& app_id, - usage_statistics::AppStopwatchId type, - int32_t timespan_seconds) { + usage_statistics::AppStopwatchId type, + int32_t timespan_seconds) { policy_handler_->AsyncRun(new StatisticsDelegate( *policy_handler_, app_id, type, timespan_seconds)); } - private: + + private: PolicyHandler* policy_handler_; }; diff --git a/src/components/application_manager/include/application_manager/request_controller.h b/src/components/application_manager/include/application_manager/request_controller.h index 259abc6c0f..237d9f5d8a 100644 --- a/src/components/application_manager/include/application_manager/request_controller.h +++ b/src/components/application_manager/include/application_manager/request_controller.h @@ -50,7 +50,6 @@ #include "application_manager/request_info.h" #include "application_manager/request_controller_settings.h" - namespace application_manager { namespace request_controller { @@ -60,233 +59,231 @@ namespace request_controller { * requests. */ class RequestController { - public: - /** - * @brief Result code for addRequest - */ - enum TResult { - SUCCESS = 0, - TOO_MANY_REQUESTS, - TOO_MANY_PENDING_REQUESTS, - NONE_HMI_LEVEL_MANY_REQUESTS, - INVALID_DATA - }; - - /** - * @brief Thread pool state - */ - enum TPoolState { - UNDEFINED = 0, - STARTED, - STOPPED, - }; - - // Methods - - /** - * @brief Class constructor - * - */ - RequestController(const RequestControlerSettings& settings); - - /** - * @brief Class destructor - * - */ - virtual ~RequestController(); - - /** - * @brief Initialize thread pool - * - */ - void InitializeThreadpool(); - - /** - * @brief Destroy thread pool - * - */ - void DestroyThreadpool(); - - /** - * @brief Check if max request amount wasn't exceed and adds request to queue. - * - * @param request Active mobile request - * @param hmi_level Current application hmi_level - * - * @return Result code - * - */ - TResult addMobileRequest(const RequestPtr request, - const mobile_apis::HMILevel::eType& hmi_level); - - - /** - * @brief Store HMI request until response or timeout won't remove it - * - * @param request Active hmi request - * @return Result code - * - */ - TResult addHMIRequest(const RequestPtr request); - - /** - * @ Add notification to collection - * - * @param ptr Reference to shared pointer that point on hmi notification - */ - void addNotification(const RequestPtr ptr); - - - /** - * @brief Removes request from queue - * - * @param correlation_id Active request correlation ID, - * @param connection_key Active request connection key (0 for HMI requersts) - * @param force_terminate if true, request controller will terminate - * even if not allowed by request - */ - void terminateRequest(const uint32_t& correlation_id, - const uint32_t& connection_key, - bool force_terminate = false); - - /** - * @brief Removes request from queue - * - * @param mobile_correlation_id Active mobile request correlation ID - * - */ - void OnMobileResponse(const uint32_t& mobile_correlation_id, - const uint32_t& connection_key); - - - /** - * @brief Removes request from queue - * - * @param mobile_correlation_id Active mobile request correlation ID - * - */ - void OnHMIResponse(const uint32_t& correlation_id); - - /** - * @ Add notification to collection - * - * @param ptr Reference to shared pointer that point on hmi notification - */ - void removeNotification(const commands::Command* notification); - - /** - * @brief Removes all requests from queue for specified application - * - * @param app_id Mobile application ID (app_id) - * - */ - void terminateAppRequests(const uint32_t& app_id); - - /** - * @brief Terminates all requests from HMI - */ - void terminateAllHMIRequests(); - - - /** - * @brief Terminates all requests from Mobile - */ - void terminateAllMobileRequests(); - - /** - * @brief Updates request timeout - * - * @param app_id Connection key of application - * @param mobile_correlation_id Correlation ID of the mobile request - * @param new_timeout_value New timeout to be set in milliseconds - */ - void updateRequestTimeout(const uint32_t& app_id, - const uint32_t& mobile_correlation_id, - const uint32_t& new_timeout); - - /* - * @brief Function Should be called when Low Voltage is occured - */ - void OnLowVoltage(); - - /* - * @brief Function Should be called when Low Voltage is occured - */ - void OnWakeUp(); - - bool IsLowVoltage(); - - protected: - /** - * @brief Timer Callback - */ - void onTimer(); - - /** - * @brief Update timout for next OnTimer - * Not thread safe - */ - void UpdateTimer(); - - void terminateWaitingForExecutionAppRequests(const uint32_t& app_id); - void terminateWaitingForResponseAppRequests(const uint32_t& app_id); - - /** - * @brief Check Posibility to add new requests, or limits was exceeded - * @param request - request to check possipility to Add - * @return True if new request could be added, false otherwise - */ - TResult CheckPosibilitytoAdd(const RequestPtr request); - - /** - * @brief Check Posibility to add new requests, or limits was exceeded - * @param pending_requests_amount - maximum count of request that should be allowed for all applications - * @return True if new request could be added, false otherwise - */ - bool CheckPendingRequestsAmount(const uint32_t& pending_requests_amount); - - private: - class Worker : public threads::ThreadDelegate { - public: - explicit Worker(RequestController* requestController); - virtual ~Worker(); - virtual void threadMain(); - virtual void exitThreadMain(); - protected: - private: - RequestController* request_controller_; - sync_primitives::Lock thread_lock_; - volatile bool stop_flag_; - }; - - std::vector<threads::Thread*> pool_; - volatile TPoolState pool_state_; - uint32_t pool_size_; - sync_primitives::ConditionalVariable cond_var_; - - std::list<RequestPtr> mobile_request_list_; - sync_primitives::Lock mobile_request_list_lock_; - - /* - * Requests, that are waiting for responses - * RequestInfoSet provides correct processing of requests with thre same - * app_id and corr_id - */ - RequestInfoSet waiting_for_response_; - - /** - * @brief Set of HMI notifications with timeout. - */ - std::list<RequestPtr> notification_list_; - - /* - * timer for checking requests timeout - */ - timer::Timer timer_; - - bool is_low_voltage_; - const RequestControlerSettings& settings_; - DISALLOW_COPY_AND_ASSIGN(RequestController); + public: + /** + * @brief Result code for addRequest + */ + enum TResult { + SUCCESS = 0, + TOO_MANY_REQUESTS, + TOO_MANY_PENDING_REQUESTS, + NONE_HMI_LEVEL_MANY_REQUESTS, + INVALID_DATA + }; + + /** + * @brief Thread pool state + */ + enum TPoolState { + UNDEFINED = 0, + STARTED, + STOPPED, + }; + + // Methods + + /** + * @brief Class constructor + * + */ + RequestController(const RequestControlerSettings& settings); + + /** + * @brief Class destructor + * + */ + virtual ~RequestController(); + + /** + * @brief Initialize thread pool + * + */ + void InitializeThreadpool(); + + /** + * @brief Destroy thread pool + * + */ + void DestroyThreadpool(); + + /** + * @brief Check if max request amount wasn't exceed and adds request to queue. + * + * @param request Active mobile request + * @param hmi_level Current application hmi_level + * + * @return Result code + * + */ + TResult addMobileRequest(const RequestPtr request, + const mobile_apis::HMILevel::eType& hmi_level); + + /** + * @brief Store HMI request until response or timeout won't remove it + * + * @param request Active hmi request + * @return Result code + * + */ + TResult addHMIRequest(const RequestPtr request); + + /** + * @ Add notification to collection + * + * @param ptr Reference to shared pointer that point on hmi notification + */ + void addNotification(const RequestPtr ptr); + + /** + * @brief Removes request from queue + * + * @param correlation_id Active request correlation ID, + * @param connection_key Active request connection key (0 for HMI requersts) + * @param force_terminate if true, request controller will terminate + * even if not allowed by request + */ + void terminateRequest(const uint32_t& correlation_id, + const uint32_t& connection_key, + bool force_terminate = false); + + /** + * @brief Removes request from queue + * + * @param mobile_correlation_id Active mobile request correlation ID + * + */ + void OnMobileResponse(const uint32_t& mobile_correlation_id, + const uint32_t& connection_key); + + /** + * @brief Removes request from queue + * + * @param mobile_correlation_id Active mobile request correlation ID + * + */ + void OnHMIResponse(const uint32_t& correlation_id); + + /** + * @ Add notification to collection + * + * @param ptr Reference to shared pointer that point on hmi notification + */ + void removeNotification(const commands::Command* notification); + + /** + * @brief Removes all requests from queue for specified application + * + * @param app_id Mobile application ID (app_id) + * + */ + void terminateAppRequests(const uint32_t& app_id); + + /** + * @brief Terminates all requests from HMI + */ + void terminateAllHMIRequests(); + + /** + * @brief Terminates all requests from Mobile + */ + void terminateAllMobileRequests(); + + /** + * @brief Updates request timeout + * + * @param app_id Connection key of application + * @param mobile_correlation_id Correlation ID of the mobile request + * @param new_timeout_value New timeout to be set in milliseconds + */ + void updateRequestTimeout(const uint32_t& app_id, + const uint32_t& mobile_correlation_id, + const uint32_t& new_timeout); + + /* + * @brief Function Should be called when Low Voltage is occured + */ + void OnLowVoltage(); + + /* + * @brief Function Should be called when Low Voltage is occured + */ + void OnWakeUp(); + + bool IsLowVoltage(); + + protected: + /** + * @brief Timer Callback + */ + void onTimer(); + + /** + * @brief Update timout for next OnTimer + * Not thread safe + */ + void UpdateTimer(); + + void terminateWaitingForExecutionAppRequests(const uint32_t& app_id); + void terminateWaitingForResponseAppRequests(const uint32_t& app_id); + + /** + * @brief Check Posibility to add new requests, or limits was exceeded + * @param request - request to check possipility to Add + * @return True if new request could be added, false otherwise + */ + TResult CheckPosibilitytoAdd(const RequestPtr request); + + /** + * @brief Check Posibility to add new requests, or limits was exceeded + * @param pending_requests_amount - maximum count of request that should be + * allowed for all applications + * @return True if new request could be added, false otherwise + */ + bool CheckPendingRequestsAmount(const uint32_t& pending_requests_amount); + + private: + class Worker : public threads::ThreadDelegate { + public: + explicit Worker(RequestController* requestController); + virtual ~Worker(); + virtual void threadMain(); + virtual void exitThreadMain(); + + protected: + private: + RequestController* request_controller_; + sync_primitives::Lock thread_lock_; + volatile bool stop_flag_; + }; + + std::vector<threads::Thread*> pool_; + volatile TPoolState pool_state_; + uint32_t pool_size_; + sync_primitives::ConditionalVariable cond_var_; + + std::list<RequestPtr> mobile_request_list_; + sync_primitives::Lock mobile_request_list_lock_; + + /* + * Requests, that are waiting for responses + * RequestInfoSet provides correct processing of requests with thre same + * app_id and corr_id + */ + RequestInfoSet waiting_for_response_; + + /** + * @brief Set of HMI notifications with timeout. + */ + std::list<RequestPtr> notification_list_; + + /* + * timer for checking requests timeout + */ + timer::Timer timer_; + + bool is_low_voltage_; + const RequestControlerSettings& settings_; + DISALLOW_COPY_AND_ASSIGN(RequestController); }; } // namespace request_controller diff --git a/src/components/application_manager/include/application_manager/resumption/resume_ctrl.h b/src/components/application_manager/include/application_manager/resumption/resume_ctrl.h index 92dbc0e3f0..853f91ff23 100644 --- a/src/components/application_manager/include/application_manager/resumption/resume_ctrl.h +++ b/src/components/application_manager/include/application_manager/resumption/resume_ctrl.h @@ -61,10 +61,8 @@ class LastState; * @brief Contains logic for storage/restore data of applications. */ -class ResumeCtrl: public application_manager::event_engine::EventObserver { - +class ResumeCtrl : public application_manager::event_engine::EventObserver { public: - /** * @brief allows to create ResumeCtrl object */ @@ -97,14 +95,16 @@ class ResumeCtrl: public application_manager::event_engine::EventObserver { * @param application is application witch HMI Level is need to restore * @return true if success, otherwise return false */ - bool RestoreAppHMIState(application_manager::ApplicationSharedPtr application); + bool RestoreAppHMIState( + application_manager::ApplicationSharedPtr application); /** * @brief Set application HMI Level as stored in policy * @param application is application witch HMI Level is need to setup * @return true if success, otherwise return false */ - bool SetupDefaultHMILevel(application_manager::ApplicationSharedPtr application); + bool SetupDefaultHMILevel( + application_manager::ApplicationSharedPtr application); /** * @brief Setup HmiLevel for application @@ -124,7 +124,8 @@ class ResumeCtrl: public application_manager::event_engine::EventObserver { * @param application is application witch need to be checked * @return true if exist, false otherwise */ - bool ApplicationIsSaved(application_manager::ApplicationConstSharedPtr application); + bool ApplicationIsSaved( + application_manager::ApplicationConstSharedPtr application); /** * @brief Remove application from list of saved applications @@ -179,7 +180,8 @@ class ResumeCtrl: public application_manager::event_engine::EventObserver { * @param application that is need to be restored * @return true if it was saved, otherwise return false */ - bool StartResumptionOnlyHMILevel(application_manager::ApplicationSharedPtr application); + bool StartResumptionOnlyHMILevel( + application_manager::ApplicationSharedPtr application); /** * @brief Check if there are all files need for resumption @@ -194,8 +196,9 @@ class ResumeCtrl: public application_manager::event_engine::EventObserver { * @param application that is need to be restored * @return true if it was saved, otherwise return false */ - bool CheckApplicationHash(application_manager::ApplicationSharedPtr application, - const std::string& hash); + bool CheckApplicationHash( + application_manager::ApplicationSharedPtr application, + const std::string& hash); /** * @brief Checks if Resume controller have saved application with hmi app id @@ -242,7 +245,8 @@ class ResumeCtrl: public application_manager::event_engine::EventObserver { * @param application - application to restore hmi level * and audio streaming state */ - void StartAppHmiStateResumption(application_manager::ApplicationSharedPtr application); + void StartAppHmiStateResumption( + application_manager::ApplicationSharedPtr application); /** * @brief Update launch_time_ to current @@ -274,7 +278,7 @@ class ResumeCtrl: public application_manager::event_engine::EventObserver { * @return true if initialization is success otherwise * returns false */ - bool Init(LastState &last_state); + bool Init(LastState& last_state); /** * @brief Notify resume controller about new application @@ -298,7 +302,8 @@ class ResumeCtrl: public application_manager::event_engine::EventObserver { * @param application contains application for which restores data * @return true if success, otherwise return false */ - bool RestoreApplicationData(application_manager::ApplicationSharedPtr application); + bool RestoreApplicationData( + application_manager::ApplicationSharedPtr application); /** * @brief AddFiles allows to add files for the application @@ -341,8 +346,9 @@ class ResumeCtrl: public application_manager::event_engine::EventObserver { * @param application application which will be resumed * @param saved_app application specific section from backup file */ - void SetGlobalProperties(application_manager::ApplicationSharedPtr application, - const smart_objects::SmartObject& saved_app); + void SetGlobalProperties( + application_manager::ApplicationSharedPtr application, + const smart_objects::SmartObject& saved_app); /** * @brief AddSubscriptions allows to restore subscriptions @@ -358,16 +364,18 @@ class ResumeCtrl: public application_manager::event_engine::EventObserver { * @param application application which will be resumed * @param saved_app application specific section from backup file */ - void AddWayPointsSubscription(application_manager::ApplicationSharedPtr application, - const smart_objects::SmartObject& saved_app); + void AddWayPointsSubscription( + application_manager::ApplicationSharedPtr application, + const smart_objects::SmartObject& saved_app); bool CheckIgnCycleRestrictions(const smart_objects::SmartObject& saved_app); bool DisconnectedJustBeforeIgnOff( const smart_objects::SmartObject& saved_app); - bool CheckAppRestrictions(application_manager::ApplicationConstSharedPtr application, - const smart_objects::SmartObject& saved_app); + bool CheckAppRestrictions( + application_manager::ApplicationConstSharedPtr application, + const smart_objects::SmartObject& saved_app); /** * @brief CheckIcons allows to check application icons @@ -417,8 +425,9 @@ class ResumeCtrl: public application_manager::event_engine::EventObserver { * @param saved_device_mac Saved device MAC address * @return TRUE on success, otherwise FALSE */ - bool IsDeviceMacAddressEqual(application_manager::ApplicationSharedPtr application, - const std::string& saved_device_mac); + bool IsDeviceMacAddressEqual( + application_manager::ApplicationSharedPtr application, + const std::string& saved_device_mac); /** * @brief Get the last ignition off time from LastState @@ -438,9 +447,8 @@ class ResumeCtrl: public application_manager::event_engine::EventObserver { * @param use_events Process request events or not flag * @return TRUE on success, otherwise FALSE */ - bool ProcessHMIRequest( - smart_objects::SmartObjectSPtr request = NULL, - bool use_events = false); + bool ProcessHMIRequest(smart_objects::SmartObjectSPtr request = NULL, + bool use_events = false); /** * @brief Process list of HMI requests using ProcessHMIRequest method @@ -460,7 +468,7 @@ class ResumeCtrl: public application_manager::event_engine::EventObserver { * @return true, if data resumption must be skipped, otherwise - false */ bool IsAppDataResumptionExpired( - const smart_objects::SmartObject& application) const; + const smart_objects::SmartObject& application) const; /** * @brief Checks from resume data, if application has been disconnected * unexpectedly @@ -475,24 +483,24 @@ class ResumeCtrl: public application_manager::event_engine::EventObserver { * @return true, if no restrictions currently, otherwise - false */ bool IsResumeAllowed( - const application_manager::ApplicationSharedPtr application) const; + const application_manager::ApplicationSharedPtr application) const; /** *@brief Mapping applications to time_stamps * wait for timer to resume HMI Level * */ - mutable sync_primitives::Lock queue_lock_; + mutable sync_primitives::Lock queue_lock_; timer::Timer restore_hmi_level_timer_; timer::Timer save_persistent_data_timer_; - typedef std::list<uint32_t> WaitingForTimerList; - WaitingForTimerList waiting_for_timer_; - bool is_resumption_active_; - bool is_data_saved_; - time_t launch_time_; - utils::SharedPtr<ResumptionData> resumption_storage_; + typedef std::list<uint32_t> WaitingForTimerList; + WaitingForTimerList waiting_for_timer_; + bool is_resumption_active_; + bool is_data_saved_; + time_t launch_time_; + utils::SharedPtr<ResumptionData> resumption_storage_; application_manager::ApplicationManager& application_manager_; }; } // namespace resumption -#endif // SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_RESUME_CTRL_H +#endif // SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_RESUME_CTRL_H diff --git a/src/components/application_manager/include/application_manager/resumption/resumption_data.h b/src/components/application_manager/include/application_manager/resumption/resumption_data.h index f75e2c443a..d7fa3968c6 100644 --- a/src/components/application_manager/include/application_manager/resumption/resumption_data.h +++ b/src/components/application_manager/include/application_manager/resumption/resumption_data.h @@ -38,7 +38,7 @@ #include "application_manager/application_manager.h" namespace application_manager { - class ApplicationManagerSettings; +class ApplicationManagerSettings; } namespace resumption { @@ -69,8 +69,7 @@ class ResumptionData { * @brief Save application persistent info for future resuming * @param application is application witch need to be saved */ - virtual void SaveApplication( - app_mngr::ApplicationSharedPtr application) = 0; + virtual void SaveApplication(app_mngr::ApplicationSharedPtr application) = 0; /** * @brief Returns HMI level of application from saved data @@ -208,8 +207,8 @@ class ResumptionData { * @brief Persist saves resumption data on file system */ virtual void Persist() = 0; - protected: + protected: /** * @brief Retrieves of commands from application * @param application contains application of which selection commands @@ -287,7 +286,7 @@ class ResumptionData { ++first; } } - mutable sync_primitives::Lock resumption_lock_; + mutable sync_primitives::Lock resumption_lock_; const application_manager::ApplicationManager& application_manager_; }; } // namespace resumption diff --git a/src/components/application_manager/include/application_manager/resumption/resumption_data_db.h b/src/components/application_manager/include/application_manager/resumption/resumption_data_db.h index 7554f1359c..4441b2d4e3 100644 --- a/src/components/application_manager/include/application_manager/resumption/resumption_data_db.h +++ b/src/components/application_manager/include/application_manager/resumption/resumption_data_db.h @@ -42,10 +42,7 @@ namespace resumption { /** * @brief Points what structure contains vr commands */ -enum AccessoryVRCommand { - kVRCommandFromChoice = 0, - kVRCommandFromCommand -}; +enum AccessoryVRCommand { kVRCommandFromChoice = 0, kVRCommandFromCommand }; struct ApplicationParams { ApplicationParams(const smart_objects::SmartObject& application); @@ -89,8 +86,7 @@ class ResumptionDataDB : public ResumptionData { * @brief Save application persistent info for future resuming to db * @param application is application which need to be saved */ - void SaveApplication( - app_mngr::ApplicationSharedPtr application) OVERRIDE; + void SaveApplication(app_mngr::ApplicationSharedPtr application) OVERRIDE; /** * @brief Returns HMI level of application from saved data * @param policy_app_id contains policy id of application @@ -206,7 +202,6 @@ class ResumptionDataDB : public ResumptionData { const std::string& device_id, mobile_apis::HMILevel::eType hmi_level); - /** * @brief Write database to file system */ diff --git a/src/components/application_manager/include/application_manager/resumption/resumption_data_json.h b/src/components/application_manager/include/application_manager/resumption/resumption_data_json.h index 092ac25ea3..1b6eb02776 100644 --- a/src/components/application_manager/include/application_manager/resumption/resumption_data_json.h +++ b/src/components/application_manager/include/application_manager/resumption/resumption_data_json.h @@ -48,8 +48,9 @@ class ResumptionDataJson : public ResumptionData { /** * @brief Constructor of ResumptionDataJson */ - ResumptionDataJson(LastState& last_state, - const application_manager::ApplicationManager& application_manager); + ResumptionDataJson( + LastState& last_state, + const application_manager::ApplicationManager& application_manager); /** * @brief allows to destroy ResumptionDataJson object @@ -185,14 +186,13 @@ class ResumptionDataJson : public ResumptionData { bool DropAppDataResumption(const std::string& device_id, const std::string& app_id) OVERRIDE; - /** * @brief Write json resumption info to file system */ void Persist() OVERRIDE; resumption::LastState& last_state() const { - return last_state_; + return last_state_; } private: diff --git a/src/components/application_manager/include/application_manager/state_controller_impl.h b/src/components/application_manager/include/application_manager/state_controller_impl.h index e555d50b2f..f2f9fb39a4 100644 --- a/src/components/application_manager/include/application_manager/state_controller_impl.h +++ b/src/components/application_manager/include/application_manager/state_controller_impl.h @@ -47,7 +47,7 @@ namespace application_manager { class StateControllerImpl : public event_engine::EventObserver, - public StateController { + public StateController { public: explicit StateControllerImpl(ApplicationManager& app_mngr); @@ -58,7 +58,8 @@ class StateControllerImpl : public event_engine::EventObserver, * @param state state of new regular state */ - virtual void SetRegularState(ApplicationSharedPtr app, HmiStatePtr state, + virtual void SetRegularState(ApplicationSharedPtr app, + HmiStatePtr state, const bool SendActivateApp); /** @@ -81,8 +82,8 @@ class StateControllerImpl : public event_engine::EventObserver, * @param SendActivateApp: if true, ActivateAppRequest will be sent on HMI */ virtual void SetRegularState(ApplicationSharedPtr app, - const mobile_apis::HMILevel::eType hmi_level, - const bool SendActivateApp); + const mobile_apis::HMILevel::eType hmi_level, + const bool SendActivateApp); /** * @brief SetRegularState Change regular hmi level, audio state and system @@ -107,7 +108,7 @@ class StateControllerImpl : public event_engine::EventObserver, * @param hmi_level new hmi level for application */ virtual void SetRegularState(ApplicationSharedPtr app, - const mobile_apis::HMILevel::eType hmi_level); + const mobile_apis::HMILevel::eType hmi_level); /** * @brief SetRegularState Change regular audio state @@ -164,8 +165,8 @@ class StateControllerImpl : public event_engine::EventObserver, * @param new_state state after change */ virtual void OnStateChanged(ApplicationSharedPtr app, - HmiStatePtr old_state, - HmiStatePtr new_state); + HmiStatePtr old_state, + HmiStatePtr new_state); /** * @brief Checks activity of Deactivate HMI state. @@ -304,7 +305,8 @@ class StateControllerImpl : public event_engine::EventObserver, void TempStateStarted(HmiState::StateID ID); /** - * @brief TempStateStopped remove HMI State ID from StateControllerImpl collection + * @brief TempStateStopped remove HMI State ID from StateControllerImpl + * collection * @param ID state identifier */ void TempStateStopped(HmiState::StateID ID); @@ -441,7 +443,6 @@ class StateControllerImpl : public event_engine::EventObserver, std::map<uint32_t, HmiStatePtr> waiting_for_activate; ApplicationManager& app_mngr_; }; - } #endif // SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_STATE_CONTROLLER_IMPL_H_ |