Replace deprecation comments with DEPRECATED macro

7 files changed, 37 insertions, 48 deletions

diff --git a/src/components/application_manager/src/application_impl.cc b/src/components/application_manager/src/application_impl.cc
index eaf097d43f..735a9955a7 100644
--- a/src/components/application_manager/src/application_impl.cc
+++ b/src/components/application_manager/src/application_impl.cc
@@ -614,8 +614,8 @@ void ApplicationImpl::set_app_allowed(const bool allowed) {
   is_app_allowed_ = allowed;
 }
 
-// DEPRECATED
-void ApplicationImpl::set_device(connection_handler::DeviceHandle device) {
+DEPRECATED void ApplicationImpl::set_device(
+    connection_handler::DeviceHandle device) {
   device_id_ = device;
 }
 
diff --git a/src/components/application_manager/src/application_manager_impl.cc b/src/components/application_manager/src/application_manager_impl.cc
index cf8aae75f3..eb3313e492 100644
--- a/src/components/application_manager/src/application_manager_impl.cc
+++ b/src/components/application_manager/src/application_manager_impl.cc
@@ -638,13 +638,13 @@ ApplicationSharedPtr ApplicationManagerImpl::RegisterApplication(
   return application;
 }
 
-// DEPRECATED
-bool ApplicationManagerImpl::RemoveAppDataFromHMI(ApplicationSharedPtr app) {
+DEPRECATED bool ApplicationManagerImpl::RemoveAppDataFromHMI(
+    ApplicationSharedPtr app) {
   return true;
 }
 
-// DEPRECATED
-bool ApplicationManagerImpl::LoadAppDataToHMI(ApplicationSharedPtr app) {
+DEPRECATED bool ApplicationManagerImpl::LoadAppDataToHMI(
+    ApplicationSharedPtr app) {
   return true;
 }
 
@@ -795,8 +795,8 @@ void ApplicationManagerImpl::set_driver_distraction(const bool is_distracting) {
   is_distracting_driver_ = is_distracting;
 }
 
-// DEPRECATED
-void ApplicationManagerImpl::set_vr_session_started(const bool state) {
+DEPRECATED void ApplicationManagerImpl::set_vr_session_started(
+    const bool state) {
   is_vr_session_strated_ = state;
 }
 
diff --git a/src/components/application_manager/src/commands/command_impl.cc b/src/components/application_manager/src/commands/command_impl.cc
index ea179a5bfc..b928184148 100644
--- a/src/components/application_manager/src/commands/command_impl.cc
+++ b/src/components/application_manager/src/commands/command_impl.cc
@@ -139,8 +139,7 @@ bool CommandImpl::ReplaceMobileWithHMIAppId(
   return true;
 }
 
-// DEPRECATED
-void CommandImpl::ReplaceMobileByHMIAppId(
+DEPRECATED void CommandImpl::ReplaceMobileByHMIAppId(
     NsSmartDeviceLink::NsSmartObjects::SmartObject& message) {
   if (!ReplaceMobileWithHMIAppId(message)) {
     LOG4CXX_ERROR(logger_, "Substitution mobile --> HMI id is failed.");
@@ -192,8 +191,7 @@ bool CommandImpl::ReplaceHMIWithMobileAppId(
   return true;
 }
 
-// DEPRECATED
-void CommandImpl::ReplaceHMIByMobileAppId(
+DEPRECATED void CommandImpl::ReplaceHMIByMobileAppId(
     NsSmartDeviceLink::NsSmartObjects::SmartObject& message) {
   if (!ReplaceHMIWithMobileAppId(message)) {
     LOG4CXX_ERROR(logger_, "Substitution HMI --> mobile id is failed.");
diff --git a/src/components/application_manager/src/commands/mobile/register_app_interface_request.cc b/src/components/application_manager/src/commands/mobile/register_app_interface_request.cc
index 870ff532da..a3a30ddb20 100644
--- a/src/components/application_manager/src/commands/mobile/register_app_interface_request.cc
+++ b/src/components/application_manager/src/commands/mobile/register_app_interface_request.cc
@@ -741,8 +741,8 @@ void RegisterAppInterfaceRequest::SendRegisterAppInterfaceResponseToMobile(
   SendChangeRegistrationOnHMI(application);
 }
 
-// DEPRECATED
-void RegisterAppInterfaceRequest::SendRegisterAppInterfaceResponseToMobile() {
+DEPRECATED void
+RegisterAppInterfaceRequest::SendRegisterAppInterfaceResponseToMobile() {
   SendRegisterAppInterfaceResponseToMobile(ApplicationType::kNewApplication);
 }
 
diff --git a/src/components/application_manager/src/hmi_state.cc b/src/components/application_manager/src/hmi_state.cc
index f67de7a957..bc1ccd8f42 100644
--- a/src/components/application_manager/src/hmi_state.cc
+++ b/src/components/application_manager/src/hmi_state.cc
@@ -56,10 +56,9 @@ HmiState::HmiState(utils::SharedPtr<Application> app,
     , audio_streaming_state_(mobile_apis::AudioStreamingState::INVALID_ENUM)
     , system_context_(mobile_apis::SystemContext::INVALID_ENUM) {}
 
-// DEPRECATED
-HmiState::HmiState(uint32_t app_id,
-                   const ApplicationManager& app_mngr,
-                   StateID state_id)
+DEPRECATED HmiState::HmiState(uint32_t app_id,
+                              const ApplicationManager& app_mngr,
+                              StateID state_id)
     : state_id_(state_id)
     , app_mngr_(app_mngr)
     , hmi_level_(mobile_apis::HMILevel::INVALID_ENUM)
@@ -68,8 +67,8 @@ HmiState::HmiState(uint32_t app_id,
   app_ = app_mngr_.application(app_id);
 }
 
-// DEPRECATED
-HmiState::HmiState(uint32_t app_id, const ApplicationManager& app_mngr)
+DEPRECATED HmiState::HmiState(uint32_t app_id,
+                              const ApplicationManager& app_mngr)
     : state_id_(STATE_ID_REGULAR)
     , app_mngr_(app_mngr)
     , hmi_level_(mobile_apis::HMILevel::INVALID_ENUM)
@@ -109,16 +108,16 @@ VRHmiState::VRHmiState(utils::SharedPtr<Application> app,
                        const ApplicationManager& app_mngr)
     : HmiState(app, app_mngr, STATE_ID_VR_SESSION) {}
 
-// DEPRECATED
-VRHmiState::VRHmiState(uint32_t app_id, const ApplicationManager& app_mngr)
+DEPRECATED VRHmiState::VRHmiState(uint32_t app_id,
+                                  const ApplicationManager& app_mngr)
     : HmiState(app_id, app_mngr, STATE_ID_VR_SESSION) {}
 
 TTSHmiState::TTSHmiState(utils::SharedPtr<Application> app,
                          const ApplicationManager& app_mngr)
     : HmiState(app, app_mngr, STATE_ID_TTS_SESSION) {}
 
-// DEPRECATED
-TTSHmiState::TTSHmiState(uint32_t app_id, const ApplicationManager& app_mngr)
+DEPRECATED TTSHmiState::TTSHmiState(uint32_t app_id,
+                                    const ApplicationManager& app_mngr)
     : HmiState(app_id, app_mngr, STATE_ID_TTS_SESSION) {}
 
 mobile_apis::AudioStreamingState::eType TTSHmiState::audio_streaming_state()
@@ -140,9 +139,8 @@ NaviStreamingHmiState::NaviStreamingHmiState(utils::SharedPtr<Application> app,
                                              const ApplicationManager& app_mngr)
     : HmiState(app, app_mngr, STATE_ID_NAVI_STREAMING) {}
 
-// DEPRECATED
-NaviStreamingHmiState::NaviStreamingHmiState(uint32_t app_id,
-                                             const ApplicationManager& app_mngr)
+DEPRECATED NaviStreamingHmiState::NaviStreamingHmiState(
+    uint32_t app_id, const ApplicationManager& app_mngr)
     : HmiState(app_id, app_mngr, STATE_ID_NAVI_STREAMING) {}
 
 mobile_apis::AudioStreamingState::eType
@@ -165,9 +163,8 @@ PhoneCallHmiState::PhoneCallHmiState(utils::SharedPtr<Application> app,
                                      const ApplicationManager& app_mngr)
     : HmiState(app, app_mngr, STATE_ID_PHONE_CALL) {}
 
-// DEPRECATED
-PhoneCallHmiState::PhoneCallHmiState(uint32_t app_id,
-                                     const ApplicationManager& app_mngr)
+DEPRECATED PhoneCallHmiState::PhoneCallHmiState(
+    uint32_t app_id, const ApplicationManager& app_mngr)
     : HmiState(app_id, app_mngr, STATE_ID_PHONE_CALL) {}
 
 mobile_apis::HMILevel::eType PhoneCallHmiState::hmi_level() const {
@@ -191,18 +188,16 @@ SafetyModeHmiState::SafetyModeHmiState(utils::SharedPtr<Application> app,
                                        const ApplicationManager& app_mngr)
     : HmiState(app, app_mngr, STATE_ID_SAFETY_MODE) {}
 
-// DEPRECATED
-SafetyModeHmiState::SafetyModeHmiState(uint32_t app_id,
-                                       const ApplicationManager& app_mngr)
+DEPRECATED SafetyModeHmiState::SafetyModeHmiState(
+    uint32_t app_id, const ApplicationManager& app_mngr)
     : HmiState(app_id, app_mngr, STATE_ID_SAFETY_MODE) {}
 
 DeactivateHMI::DeactivateHMI(utils::SharedPtr<Application> app,
                              const ApplicationManager& app_mngr)
     : HmiState(app, app_mngr, STATE_ID_DEACTIVATE_HMI) {}
 
-// DERECATED
-DeactivateHMI::DeactivateHMI(uint32_t app_id,
-                             const ApplicationManager& app_mngr)
+DEPRECATED DeactivateHMI::DeactivateHMI(uint32_t app_id,
+                                        const ApplicationManager& app_mngr)
     : HmiState(app_id, app_mngr, STATE_ID_DEACTIVATE_HMI) {}
 
 mobile_apis::HMILevel::eType DeactivateHMI::hmi_level() const {
@@ -220,8 +215,8 @@ AudioSource::AudioSource(utils::SharedPtr<Application> app,
                          const ApplicationManager& app_mngr)
     : HmiState(app, app_mngr, STATE_ID_AUDIO_SOURCE) {}
 
-// DEPRECATED
-AudioSource::AudioSource(uint32_t app_id, const ApplicationManager& app_mngr)
+DEPRECATED AudioSource::AudioSource(uint32_t app_id,
+                                    const ApplicationManager& app_mngr)
     : HmiState(app_id, app_mngr, STATE_ID_AUDIO_SOURCE) {}
 
 mobile_apis::HMILevel::eType AudioSource::hmi_level() const {
@@ -245,8 +240,8 @@ EmbeddedNavi::EmbeddedNavi(utils::SharedPtr<Application> app,
                            const ApplicationManager& app_mngr)
     : HmiState(app, app_mngr, STATE_ID_EMBEDDED_NAVI) {}
 
-// DEPRECATED
-EmbeddedNavi::EmbeddedNavi(uint32_t app_id, const ApplicationManager& app_mngr)
+DEPRECATED EmbeddedNavi::EmbeddedNavi(uint32_t app_id,
+                                      const ApplicationManager& app_mngr)
     : HmiState(app_id, app_mngr, STATE_ID_EMBEDDED_NAVI) {}
 
 mobile_apis::HMILevel::eType EmbeddedNavi::hmi_level() const {
diff --git a/src/components/application_manager/src/resumption/resumption_data_db.cc b/src/components/application_manager/src/resumption/resumption_data_db.cc
index bd439e05bc..b031fd0afd 100644
--- a/src/components/application_manager/src/resumption/resumption_data_db.cc
+++ b/src/components/application_manager/src/resumption/resumption_data_db.cc
@@ -212,8 +212,7 @@ uint32_t ResumptionDataDB::GetHMIApplicationID(
   return hmi_app_id;
 }
 
-// DEPRECATED
-void ResumptionDataDB::OnSuspend() {}
+DEPRECATED void ResumptionDataDB::OnSuspend() {}
 
 void ResumptionDataDB::IncrementIgnOffCount() {
   LOG4CXX_AUTO_TRACE(logger_);
@@ -294,8 +293,7 @@ bool ResumptionDataDB::GetHashId(const std::string& policy_app_id,
   return SelectHashId(policy_app_id, device_id, hash_id);
 }
 
-// DEPRECATED
-void ResumptionDataDB::OnAwake() {}
+DEPRECATED void ResumptionDataDB::OnAwake() {}
 
 void ResumptionDataDB::DecrementIgnOffCount() {
   LOG4CXX_AUTO_TRACE(logger_);
diff --git a/src/components/application_manager/src/resumption/resumption_data_json.cc b/src/components/application_manager/src/resumption/resumption_data_json.cc
index 5bbf36dfdd..e99d8bae26 100644
--- a/src/components/application_manager/src/resumption/resumption_data_json.cc
+++ b/src/components/application_manager/src/resumption/resumption_data_json.cc
@@ -143,8 +143,7 @@ uint32_t ResumptionDataJson::GetHMIApplicationID(
   return hmi_app_id;
 }
 
-// DEPRECATED
-void ResumptionDataJson::OnSuspend() {}
+DEPRECATED void ResumptionDataJson::OnSuspend() {}
 
 void ResumptionDataJson::IncrementIgnOffCount() {
   using namespace app_mngr;
@@ -170,8 +169,7 @@ void ResumptionDataJson::IncrementIgnOffCount() {
   LOG4CXX_DEBUG(logger_, GetResumptionData().toStyledString());
 }
 
-// DEPRECATED
-void ResumptionDataJson::OnAwake() {}
+DEPRECATED void ResumptionDataJson::OnAwake() {}
 
 void ResumptionDataJson::DecrementIgnOffCount() {
   using namespace app_mngr;