diff options
author | Alexander Kutsan <AKutsan@luxoft.com> | 2016-01-19 12:01:07 +0200 |
---|---|---|
committer | Alexander Kutsan <AKutsan@luxoft.com> | 2016-01-19 12:01:07 +0200 |
commit | bf1d4a39dc00c67be9b4e521a98eb329636617f4 (patch) | |
tree | 287f48d47c2bf0a76a68b49741b79bd53001a501 /src/components | |
parent | d33c1694ed5f9440c11d7f61abe498ebcbbecc70 (diff) | |
download | sdl_core-bf1d4a39dc00c67be9b4e521a98eb329636617f4.tar.gz |
Used OVERRIDE macro against virtual in hmi_state.h
Override macro will be usefull for c++11 migration
Diffstat (limited to 'src/components')
-rw-r--r-- | src/components/application_manager/include/application_manager/hmi_state.h | 34 |
1 files changed, 17 insertions, 17 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 fefc654b7d..68f8519b21 100644 --- a/src/components/application_manager/include/application_manager/hmi_state.h +++ b/src/components/application_manager/include/application_manager/hmi_state.h @@ -203,7 +203,7 @@ class HmiState { */ class VRHmiState : public HmiState { public: - virtual mobile_apis::AudioStreamingState::eType audio_streaming_state() const; + mobile_apis::AudioStreamingState::eType audio_streaming_state() const OVERRIDE; VRHmiState(uint32_t app_id, ApplicationManager* app_mngr); }; @@ -213,7 +213,7 @@ class VRHmiState : public HmiState { class TTSHmiState : public HmiState { public: TTSHmiState(uint32_t app_id, ApplicationManager* app_mngr); - virtual mobile_apis::AudioStreamingState::eType audio_streaming_state() const; + mobile_apis::AudioStreamingState::eType audio_streaming_state() const OVERRIDE; }; /** @@ -223,7 +223,7 @@ class TTSHmiState : public HmiState { class NaviStreamingHmiState : public HmiState { public: NaviStreamingHmiState(uint32_t app_id, ApplicationManager* app_mngr); - virtual mobile_apis::AudioStreamingState::eType audio_streaming_state() const; + mobile_apis::AudioStreamingState::eType audio_streaming_state() const OVERRIDE; }; /** @@ -233,9 +233,9 @@ class NaviStreamingHmiState : public HmiState { class PhoneCallHmiState : public HmiState { public: PhoneCallHmiState(uint32_t app_id, ApplicationManager* app_mngr); - virtual mobile_apis::HMILevel::eType hmi_level() const; - virtual mobile_apis::AudioStreamingState::eType audio_streaming_state() - const { + mobile_apis::HMILevel::eType hmi_level() const OVERRIDE; + mobile_apis::AudioStreamingState::eType audio_streaming_state() + const OVERRIDE { return mobile_apis::AudioStreamingState::NOT_AUDIBLE; } }; @@ -247,8 +247,8 @@ class PhoneCallHmiState : public HmiState { class SafetyModeHmiState : public HmiState { public: SafetyModeHmiState(uint32_t app_id, ApplicationManager* app_mngr); - virtual mobile_apis::AudioStreamingState::eType audio_streaming_state() - const { + mobile_apis::AudioStreamingState::eType audio_streaming_state() + const OVERRIDE { return mobile_apis::AudioStreamingState::NOT_AUDIBLE; } }; @@ -260,9 +260,9 @@ class SafetyModeHmiState : public HmiState { class DeactivateHMI : public HmiState { public: DeactivateHMI(uint32_t app_id, ApplicationManager* app_mngr); - virtual mobile_apis::HMILevel::eType hmi_level() const; - virtual mobile_apis::AudioStreamingState::eType audio_streaming_state() - const { + mobile_apis::HMILevel::eType hmi_level() const OVERRIDE; + mobile_apis::AudioStreamingState::eType audio_streaming_state() + const OVERRIDE { return mobile_apis::AudioStreamingState::NOT_AUDIBLE; } }; @@ -274,9 +274,9 @@ class DeactivateHMI : public HmiState { class AudioSource : public HmiState { public: AudioSource(uint32_t app_id, ApplicationManager* app_mngr); - virtual mobile_apis::HMILevel::eType hmi_level() const; - virtual mobile_apis::AudioStreamingState::eType audio_streaming_state() - const { + mobile_apis::HMILevel::eType hmi_level() const OVERRIDE; + mobile_apis::AudioStreamingState::eType audio_streaming_state() + const OVERRIDE { return mobile_apis::AudioStreamingState::NOT_AUDIBLE; } }; @@ -289,9 +289,9 @@ class AudioSource : public HmiState { class EmbeddedNavi : public HmiState { public: EmbeddedNavi(uint32_t app_id, ApplicationManager* app_mngr); - virtual mobile_apis::HMILevel::eType hmi_level() const; - virtual mobile_apis::AudioStreamingState::eType audio_streaming_state() - const { + mobile_apis::HMILevel::eType hmi_level() const OVERRIDE; + mobile_apis::AudioStreamingState::eType audio_streaming_state() + const OVERRIDE { return mobile_apis::AudioStreamingState::NOT_AUDIBLE; } }; |