Refactoring no functional changesfeature/webengine_projection_mode

Use setters instead of direct access to app_hmi_type bool var

2 files changed, 22 insertions, 21 deletions

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 a11a9461bf..1e24addf4a 100644
--- a/src/components/application_manager/include/application_manager/application_impl.h
+++ b/src/components/application_manager/include/application_manager/application_impl.h
@@ -113,7 +113,7 @@ class ApplicationImpl : public virtual Application,
   inline bool is_navi() const {
     return is_navi_;
   }
-  void set_is_navi(bool allow);
+  void set_is_navi(bool option);
 
   virtual bool is_remote_control_supported() const;
 
@@ -146,8 +146,7 @@ class ApplicationImpl : public virtual Application,
                        uint32_t timer_len = 0);
 
   virtual bool is_voice_communication_supported() const;
-  virtual void set_voice_communication_supported(
-      bool is_voice_communication_supported);
+  virtual void set_voice_communication_supported(bool option);
   inline bool app_allowed() const;
   bool has_been_activated() const;
   bool set_activated(bool is_active);
@@ -187,7 +186,7 @@ class ApplicationImpl : public virtual Application,
   bool keep_context();
   void set_version(const Version& ver);
   void set_name(const custom_str::CustomString& name);
-  void set_is_media_application(bool is_media);
+  void set_is_media_application(bool option);
   void increment_put_file_in_none_count();
   void increment_delete_file_in_none_count();
   void increment_list_files_in_none_count();
diff --git a/src/components/application_manager/src/application_impl.cc b/src/components/application_manager/src/application_impl.cc
index 8aac39b268..1bf14bef84 100644
--- a/src/components/application_manager/src/application_impl.cc
+++ b/src/components/application_manager/src/application_impl.cc
@@ -200,10 +200,10 @@ bool ApplicationImpl::is_audio() const {
 }
 
 void ApplicationImpl::ChangeSupportingAppHMIType() {
-  is_navi_ = false;
-  is_voice_communication_application_ = false;
-  mobile_projection_enabled_ = false;
-  webengine_projection_enabled_ = false;
+  set_is_navi(false);
+  set_voice_communication_supported(false);
+  set_mobile_projection_enabled(false);
+  set_webengine_projection_enabled(false);
   const smart_objects::SmartObject& array_app_types = *app_types_;
   uint32_t lenght_app_types = array_app_types.length();
 
@@ -213,16 +213,16 @@ void ApplicationImpl::ChangeSupportingAppHMIType() {
 
     switch (app_hmi_type) {
       case mobile_apis::AppHMIType::NAVIGATION:
-        is_navi_ = true;
+        set_is_navi(true);
         break;
       case mobile_apis::AppHMIType::COMMUNICATION:
-        is_voice_communication_application_ = true;
+        set_voice_communication_supported(true);
         break;
       case mobile_apis::AppHMIType::PROJECTION:
-        mobile_projection_enabled_ = true;
+        set_mobile_projection_enabled(true);
         break;
       case mobile_apis::AppHMIType::WEB_VIEW:
-        webengine_projection_enabled_ = true;
+        set_webengine_projection_enabled(true);
         break;
       default:
         break;
@@ -230,8 +230,9 @@ void ApplicationImpl::ChangeSupportingAppHMIType() {
   }
 }
 
-void ApplicationImpl::set_is_navi(bool allow) {
-  is_navi_ = allow;
+void ApplicationImpl::set_is_navi(bool option) {
+  LOG4CXX_TRACE(logger_, "option " << std::boolalpha << option);
+  is_navi_ = option;
 }
 
 bool ApplicationImpl::is_remote_control_supported() const {
@@ -246,9 +247,9 @@ bool ApplicationImpl::is_voice_communication_supported() const {
   return is_voice_communication_application_;
 }
 
-void ApplicationImpl::set_voice_communication_supported(
-    bool is_voice_communication_supported) {
-  is_voice_communication_application_ = is_voice_communication_supported;
+void ApplicationImpl::set_voice_communication_supported(bool option) {
+  LOG4CXX_TRACE(logger_, "option " << std::boolalpha << option);
+  is_voice_communication_application_ = option;
 }
 
 bool ApplicationImpl::IsAudioApplication() const {
@@ -292,7 +293,7 @@ void ApplicationImpl::SetPostponedState(const WindowID window_id,
 }
 
 void ApplicationImpl::set_mobile_projection_enabled(bool option) {
-  LOG4CXX_AUTO_TRACE(logger_);
+  LOG4CXX_TRACE(logger_, "option " << std::boolalpha << option);
   mobile_projection_enabled_ = option;
 }
 
@@ -301,7 +302,7 @@ bool ApplicationImpl::mobile_projection_enabled() const {
 }
 
 void ApplicationImpl::set_webengine_projection_enabled(const bool option) {
-  LOG4CXX_AUTO_TRACE(logger_);
+  LOG4CXX_TRACE(logger_, "option " << std::boolalpha << option);
   webengine_projection_enabled_ = option;
 }
 
@@ -472,8 +473,9 @@ void ApplicationImpl::set_name(const custom_str::CustomString& name) {
   app_name_ = name;
 }
 
-void ApplicationImpl::set_is_media_application(bool is_media) {
-  is_media_ = is_media;
+void ApplicationImpl::set_is_media_application(bool option) {
+  LOG4CXX_TRACE(logger_, "option " << std::boolalpha << option);
+  is_media_ = option;
 }
 
 bool IsTTSState(const HmiStatePtr state) {