diff options
Diffstat (limited to 'src/components/application_manager/include/application_manager/hmi_state.h')
-rw-r--r-- | src/components/application_manager/include/application_manager/hmi_state.h | 28 |
1 files changed, 14 insertions, 14 deletions
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 a22d32920a..e333cb9bbc 100644 --- a/src/components/application_manager/include/application_manager/hmi_state.h +++ b/src/components/application_manager/include/application_manager/hmi_state.h @@ -35,8 +35,8 @@ #include <iosfwd> #include <list> +#include <memory> #include "interfaces/MOBILE_API.h" -#include "utils/shared_ptr.h" #include "utils/macro.h" namespace application_manager { @@ -45,7 +45,7 @@ class HmiState; class ApplicationManager; class Application; -typedef utils::SharedPtr<HmiState> HmiStatePtr; +typedef std::shared_ptr<HmiState> HmiStatePtr; /** * @brief The HmiState class @@ -81,7 +81,7 @@ class HmiState { * @param app Application pointer * @param app_mngr Application manager */ - HmiState(utils::SharedPtr<Application> app, + HmiState(std::shared_ptr<Application> app, const ApplicationManager& app_mngr); /** @@ -90,7 +90,7 @@ class HmiState { * @param app_mngr Application manager * @param state_id HMI state to assign */ - HmiState(utils::SharedPtr<Application> app, + HmiState(std::shared_ptr<Application> app, const ApplicationManager& app_mngr, StateID state_id); @@ -226,7 +226,7 @@ class HmiState { } protected: - utils::SharedPtr<Application> app_; + std::shared_ptr<Application> app_; StateID state_id_; const ApplicationManager& app_mngr_; HmiStatePtr parent_; @@ -272,7 +272,7 @@ class VRHmiState : public HmiState { public: virtual mobile_apis::AudioStreamingState::eType audio_streaming_state() const OVERRIDE; - VRHmiState(utils::SharedPtr<Application> app, + VRHmiState(std::shared_ptr<Application> app, const ApplicationManager& app_mngr); DEPRECATED VRHmiState(uint32_t app_id, const ApplicationManager& app_mngr); @@ -283,7 +283,7 @@ class VRHmiState : public HmiState { */ class TTSHmiState : public HmiState { public: - TTSHmiState(utils::SharedPtr<Application> app, + TTSHmiState(std::shared_ptr<Application> app, const ApplicationManager& app_mngr); DEPRECATED TTSHmiState(uint32_t app_id, const ApplicationManager& app_mngr); @@ -298,7 +298,7 @@ class TTSHmiState : public HmiState { */ class VideoStreamingHmiState : public HmiState { public: - VideoStreamingHmiState(utils::SharedPtr<Application> app, + VideoStreamingHmiState(std::shared_ptr<Application> app, const ApplicationManager& app_mngr); mobile_apis::VideoStreamingState::eType video_streaming_state() @@ -311,7 +311,7 @@ class VideoStreamingHmiState : public HmiState { */ class NaviStreamingHmiState : public VideoStreamingHmiState { public: - NaviStreamingHmiState(utils::SharedPtr<Application> app, + NaviStreamingHmiState(std::shared_ptr<Application> app, const ApplicationManager& app_mngr); mobile_apis::AudioStreamingState::eType audio_streaming_state() @@ -324,7 +324,7 @@ class NaviStreamingHmiState : public VideoStreamingHmiState { */ class PhoneCallHmiState : public HmiState { public: - PhoneCallHmiState(utils::SharedPtr<Application> app, + PhoneCallHmiState(std::shared_ptr<Application> app, const ApplicationManager& app_mngr); DEPRECATED PhoneCallHmiState(uint32_t app_id, @@ -343,7 +343,7 @@ class PhoneCallHmiState : public HmiState { */ class SafetyModeHmiState : public HmiState { public: - SafetyModeHmiState(utils::SharedPtr<Application> app, + SafetyModeHmiState(std::shared_ptr<Application> app, const ApplicationManager& app_mngr); DEPRECATED SafetyModeHmiState(uint32_t app_id, @@ -365,7 +365,7 @@ class SafetyModeHmiState : public HmiState { */ class DeactivateHMI : public HmiState { public: - DeactivateHMI(utils::SharedPtr<Application> app, + DeactivateHMI(std::shared_ptr<Application> app, const ApplicationManager& app_mngr); DEPRECATED DeactivateHMI(uint32_t app_id, const ApplicationManager& app_mngr); @@ -387,7 +387,7 @@ class DeactivateHMI : public HmiState { */ class AudioSource : public HmiState { public: - AudioSource(utils::SharedPtr<Application> app, + AudioSource(std::shared_ptr<Application> app, const ApplicationManager& app_mngr); DEPRECATED AudioSource(uint32_t app_id, const ApplicationManager& app_mngr); @@ -410,7 +410,7 @@ class AudioSource : public HmiState { */ class EmbeddedNavi : public HmiState { public: - EmbeddedNavi(utils::SharedPtr<Application> app, + EmbeddedNavi(std::shared_ptr<Application> app, const ApplicationManager& app_mngr); DEPRECATED EmbeddedNavi(uint32_t app_id, const ApplicationManager& app_mngr); |