Replace deprecation comments with DEPRECATED macro

7 files changed, 30 insertions, 50 deletions

diff --git a/src/components/application_manager/include/application_manager/application.h b/src/components/application_manager/include/application_manager/application.h
index 4e10d8d435..eca22afa63 100644
--- a/src/components/application_manager/include/application_manager/application.h
+++ b/src/components/application_manager/include/application_manager/application.h
@@ -48,6 +48,7 @@
 #include "application_manager/application_state.h"
 #include "protocol_handler/protocol_handler.h"
 #include "smart_objects/smart_object.h"
+#include "utils/macro.h"
 
 namespace application_manager {
 
@@ -561,8 +562,8 @@ class Application : public virtual InitialApplicationData,
   virtual void increment_list_files_in_none_count() = 0;
   virtual bool set_app_icon_path(const std::string& file_name) = 0;
   virtual void set_app_allowed(const bool allowed) = 0;
-  // DEPRECATED
-  virtual void set_device(connection_handler::DeviceHandle device) = 0;
+  DEPRECATED virtual void set_device(
+      connection_handler::DeviceHandle device) = 0;
   virtual uint32_t get_grammar_id() const = 0;
   virtual void set_grammar_id(uint32_t value) = 0;
 
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 3d7e29fb99..10ec8b8eb8 100644
--- a/src/components/application_manager/include/application_manager/application_impl.h
+++ b/src/components/application_manager/include/application_manager/application_impl.h
@@ -52,6 +52,7 @@
 #include "utils/atomic_object.h"
 #include "utils/custom_string.h"
 #include "utils/timer.h"
+#include "utils/macro.h"
 
 namespace usage_statistics {
 
@@ -91,8 +92,7 @@ class ApplicationImpl : public virtual Application,
       utils::SharedPtr<usage_statistics::StatisticsManager> statistics_manager,
       ApplicationManager& application_manager);
 
-  // DEPRECATED
-  ApplicationImpl(
+  DEPRECATED ApplicationImpl(
       uint32_t application_id,
       const std::string& policy_app_id,
       const std::string& mac_address,
@@ -184,8 +184,7 @@ class ApplicationImpl : public virtual Application,
   void increment_list_files_in_none_count();
   bool set_app_icon_path(const std::string& path);
   void set_app_allowed(const bool allowed);
-  // DEPRECATED
-  void set_device(connection_handler::DeviceHandle device);
+  DEPRECATED void set_device(connection_handler::DeviceHandle device);
   virtual uint32_t get_grammar_id() const;
   virtual void set_grammar_id(uint32_t value);
   bool is_audio() const OVERRIDE;
@@ -223,13 +222,6 @@ class ApplicationImpl : public virtual Application,
 
   virtual const std::string& curHash() const;
 
-#ifdef CUSTOMER_PASA
-  // DEPRECATED
-  virtual bool flag_sending_hash_change_after_awake() const;
-  // DEPRECATED
-  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
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 5962ca5b11..e91bdf5d59 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
@@ -453,11 +453,9 @@ class ApplicationManagerImpl
    */
   void UnregisterAllApplications();
 
-  // DEPRECATED
-  bool RemoveAppDataFromHMI(ApplicationSharedPtr app);
+  DEPRECATED bool RemoveAppDataFromHMI(ApplicationSharedPtr app);
 
-  // DEPRECATED
-  bool LoadAppDataToHMI(ApplicationSharedPtr app);
+  DEPRECATED bool LoadAppDataToHMI(ApplicationSharedPtr app);
   bool ActivateApplication(ApplicationSharedPtr app) OVERRIDE;
 
   /**
@@ -1485,9 +1483,8 @@ class ApplicationManagerImpl
    * @param service_type Type of service to start
    * @return True on success, false on fail
    */
-  // DEPRECATED
-  bool StartNaviService(uint32_t app_id,
-                        protocol_handler::ServiceType service_type);
+  DEPRECATED bool StartNaviService(uint32_t app_id,
+                                   protocol_handler::ServiceType service_type);
 
   /**
    * @brief Starts specified navi service for application
@@ -1765,8 +1762,7 @@ class ApplicationManagerImpl
   DISALLOW_COPY_AND_ASSIGN(ApplicationManagerImpl);
 };
 
-// DEPRECATED
-bool ApplicationManagerImpl::vr_session_started() const {
+DEPRECATED bool ApplicationManagerImpl::vr_session_started() const {
   return is_vr_session_strated_;
 }
 
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 a747c9b0f7..f2d665d998 100644
--- a/src/components/application_manager/include/application_manager/hmi_state.h
+++ b/src/components/application_manager/include/application_manager/hmi_state.h
@@ -36,6 +36,7 @@
 #include <list>
 #include "interfaces/MOBILE_API.h"
 #include "utils/shared_ptr.h"
+#include "utils/macro.h"
 
 namespace application_manager {
 
@@ -247,8 +248,7 @@ class VRHmiState : public HmiState {
   VRHmiState(utils::SharedPtr<Application> app,
              const ApplicationManager& app_mngr);
 
-  // DEPRECATED
-  VRHmiState(uint32_t app_id, const ApplicationManager& app_mngr);
+  DEPRECATED VRHmiState(uint32_t app_id, const ApplicationManager& app_mngr);
 };
 
 /**
@@ -259,8 +259,7 @@ class TTSHmiState : public HmiState {
   TTSHmiState(utils::SharedPtr<Application> app,
               const ApplicationManager& app_mngr);
 
-  // DEPRECATED
-  TTSHmiState(uint32_t app_id, const ApplicationManager& app_mngr);
+  DEPRECATED TTSHmiState(uint32_t app_id, const ApplicationManager& app_mngr);
 
   virtual mobile_apis::AudioStreamingState::eType audio_streaming_state()
       const OVERRIDE;
@@ -275,8 +274,8 @@ class NaviStreamingHmiState : public HmiState {
   NaviStreamingHmiState(utils::SharedPtr<Application> app,
                         const ApplicationManager& app_mngr);
 
-  // DEPRECATED
-  NaviStreamingHmiState(uint32_t app_id, const ApplicationManager& app_mngr);
+  DEPRECATED NaviStreamingHmiState(uint32_t app_id,
+                                   const ApplicationManager& app_mngr);
 
   mobile_apis::AudioStreamingState::eType audio_streaming_state()
       const OVERRIDE;
@@ -291,8 +290,8 @@ class PhoneCallHmiState : public HmiState {
   PhoneCallHmiState(utils::SharedPtr<Application> app,
                     const ApplicationManager& app_mngr);
 
-  // DEPRECATED
-  PhoneCallHmiState(uint32_t app_id, const ApplicationManager& app_mngr);
+  DEPRECATED PhoneCallHmiState(uint32_t app_id,
+                               const ApplicationManager& app_mngr);
 
   mobile_apis::HMILevel::eType hmi_level() const OVERRIDE;
   mobile_apis::AudioStreamingState::eType audio_streaming_state()
@@ -310,8 +309,8 @@ class SafetyModeHmiState : public HmiState {
   SafetyModeHmiState(utils::SharedPtr<Application> app,
                      const ApplicationManager& app_mngr);
 
-  // DEPRECATED
-  SafetyModeHmiState(uint32_t app_id, const ApplicationManager& app_mngr);
+  DEPRECATED SafetyModeHmiState(uint32_t app_id,
+                                const ApplicationManager& app_mngr);
 
   mobile_apis::AudioStreamingState::eType audio_streaming_state()
       const OVERRIDE {
@@ -328,8 +327,7 @@ class DeactivateHMI : public HmiState {
   DeactivateHMI(utils::SharedPtr<Application> app,
                 const ApplicationManager& app_mngr);
 
-  // DEPRECATED
-  DeactivateHMI(uint32_t app_id, const ApplicationManager& app_mngr);
+  DEPRECATED DeactivateHMI(uint32_t app_id, const ApplicationManager& app_mngr);
 
   mobile_apis::HMILevel::eType hmi_level() const OVERRIDE;
   mobile_apis::AudioStreamingState::eType audio_streaming_state()
@@ -347,8 +345,7 @@ class AudioSource : public HmiState {
   AudioSource(utils::SharedPtr<Application> app,
               const ApplicationManager& app_mngr);
 
-  // DEPRECATED
-  AudioSource(uint32_t app_id, const ApplicationManager& app_mngr);
+  DEPRECATED AudioSource(uint32_t app_id, const ApplicationManager& app_mngr);
 
   mobile_apis::HMILevel::eType hmi_level() const OVERRIDE;
   mobile_apis::AudioStreamingState::eType audio_streaming_state()
@@ -367,8 +364,7 @@ class EmbeddedNavi : public HmiState {
   EmbeddedNavi(utils::SharedPtr<Application> app,
                const ApplicationManager& app_mngr);
 
-  // DEPRECATED
-  EmbeddedNavi(uint32_t app_id, const ApplicationManager& app_mngr);
+  DEPRECATED EmbeddedNavi(uint32_t app_id, const ApplicationManager& app_mngr);
 
   mobile_apis::HMILevel::eType hmi_level() const OVERRIDE;
   mobile_apis::AudioStreamingState::eType audio_streaming_state()
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 a9954141af..bee2bce570 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
@@ -36,6 +36,7 @@
 #include "smart_objects/smart_object.h"
 #include "application_manager/application.h"
 #include "application_manager/application_manager.h"
+#include "utils/macro.h"
 
 namespace application_manager {
 class ApplicationManagerSettings;
@@ -97,8 +98,7 @@ class ResumptionData {
    * @brief Increments ignition counter for all registered applications
    * and remember ign_off time stamp
    */
-  // DEPRECATED
-  virtual void OnSuspend() = 0;
+  DEPRECATED virtual void OnSuspend() = 0;
 
   /**
    * @brief Decrements ignition counter for all registered applications
@@ -108,8 +108,7 @@ class ResumptionData {
   /**
    * @brief Decrements ignition counter for all registered applications
    */
-  // DEPRECATED
-  virtual void OnAwake() = 0;
+  DEPRECATED virtual void OnAwake() = 0;
 
   /**
    * @brief Retrieves hash ID for the given mobile app ID
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 474597398c..a8032d1f65 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
@@ -114,14 +114,12 @@ class ResumptionDataDB : public ResumptionData {
    * @brief Increments ignition counter for all registered applications
    * and remember ign_off time stamp
    */
-  // DEPRECATED
-  void OnSuspend() FINAL;
+  DEPRECATED void OnSuspend() FINAL;
 
   /**
    * @brief Decrements ignition counter for all registered applications
    */
-  // DEPRECATED
-  void OnAwake() FINAL;
+  DEPRECATED void OnAwake() FINAL;
 
   /**
    * @brief Increments ignition counter for all registered applications
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 4da3441037..82ec1d9e5c 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
@@ -85,14 +85,12 @@ class ResumptionDataJson : public ResumptionData {
    * @brief Increments ignition counter for all registered applications
    * and remember ign_off time stamp
    */
-  // DEPRECATED
-  void OnSuspend() FINAL;
+  DEPRECATED void OnSuspend() FINAL;
 
   /**
    * @brief Decrements ignition counter for all registered applications
    */
-  // DEPRECATED
-  void OnAwake() FINAL;
+  DEPRECATED void OnAwake() FINAL;
 
   /**
    * @brief Increments ignition counter for all registered applications