Fix for cov 171196

+ style fixes

5 files changed, 13 insertions, 13 deletions

diff --git a/src/components/application_manager/src/app_launch/apps_launcher.cc b/src/components/application_manager/src/app_launch/apps_launcher.cc
index 23ac02156d..bf3ce1e0a9 100644
--- a/src/components/application_manager/src/app_launch/apps_launcher.cc
+++ b/src/components/application_manager/src/app_launch/apps_launcher.cc
@@ -97,8 +97,8 @@ AppsLauncher::Launcher::Launcher(
     const uint16_t app_launch_retry_wait_time)
     : retry_index_(0)
     , retry_timer_(
-        "AppsLauncherTimer",
-        new timer::TimerTaskImpl<Launcher>(this, &Launcher::LaunchNow))
+          "AppsLauncherTimer",
+          new timer::TimerTaskImpl<Launcher>(this, &Launcher::LaunchNow))
     , app_launch_max_retry_attempt_(app_launch_max_retry_attempt)
     , app_launch_retry_wait_time_(app_launch_retry_wait_time)
     , connection_handler_(connection_handler)
diff --git a/src/components/application_manager/src/policies/policy_handler.cc b/src/components/application_manager/src/policies/policy_handler.cc
index 4a90cbd3cd..3ff7fcfa9a 100644
--- a/src/components/application_manager/src/policies/policy_handler.cc
+++ b/src/components/application_manager/src/policies/policy_handler.cc
@@ -76,7 +76,8 @@ RequestTypeMap TypeToString = {
     {mobile_apis::RequestType::QUERY_APPS, "QUERY_APPS"},
     {mobile_apis::RequestType::LAUNCH_APP, "LAUNCH_APP"},
     {mobile_apis::RequestType::LOCK_SCREEN_ICON_URL, "LOCK_SCREEN_ICON_URL"},
-    {mobile_apis::RequestType::TRAFFIC_MESSAGE_CHANNEL, "TRAFFIC_MESSAGE_CHANNEL"},
+    {mobile_apis::RequestType::TRAFFIC_MESSAGE_CHANNEL,
+     "TRAFFIC_MESSAGE_CHANNEL"},
     {mobile_apis::RequestType::DRIVER_PROFILE, "DRIVER_PROFILE"},
     {mobile_apis::RequestType::VOICE_SEARCH, "VOICE_SEARCH"},
     {mobile_apis::RequestType::NAVIGATION, "NAVIGATION"},
@@ -88,7 +89,7 @@ RequestTypeMap TypeToString = {
     {mobile_apis::RequestType::MEDIA, "MEDIA"},
     {mobile_apis::RequestType::FOTA, "FOTA"}};
 
-const std::string RequestTypeToString(RequestType::eType type) {
+const std::string RequestTypeToString(mobile_apis::RequestType::eType type) {
   RequestTypeMap::const_iterator it = TypeToString.find(type);
   if (TypeToString.end() != it) {
     return (*it).second;
diff --git a/src/components/application_manager/src/resumption/resume_ctrl_impl.cc b/src/components/application_manager/src/resumption/resume_ctrl_impl.cc
index 996f3d365c..e7788bf9ff 100644
--- a/src/components/application_manager/src/resumption/resume_ctrl_impl.cc
+++ b/src/components/application_manager/src/resumption/resume_ctrl_impl.cc
@@ -644,7 +644,7 @@ bool ResumeCtrlImpl::DisconnectedJustBeforeIgnOff(
   DCHECK_OR_RETURN(saved_app.keyExists(strings::time_stamp), false);
 
   const time_t time_stamp =
-      static_cast<time_t>(saved_app[strings::time_stamp].asUInt());
+      static_cast<time_t>(saved_app[strings::time_stamp].asInt());
   time_t ign_off_time =
       static_cast<time_t>(resumption_storage_->GetIgnOffTime());
   const uint32_t sec_spent_before_ign = labs(ign_off_time - time_stamp);
@@ -796,15 +796,15 @@ void ResumeCtrlImpl::OnAppRegistrationEnd() {
   StartSavePersistentDataTimer();
 }
 
-int32_t ResumeCtrlImpl::GetSavedAppHmiLevel(const std::string& app_id, 
-                                            const std::string& device_id) const {
+int32_t ResumeCtrlImpl::GetSavedAppHmiLevel(
+    const std::string& app_id, const std::string& device_id) const {
   using namespace mobile_apis;
   smart_objects::SmartObject saved_app;
   if (resumption_storage_->GetSavedApplication(app_id, device_id, saved_app)) {
     const HMILevel::eType saved_hmi_level =
         static_cast<mobile_apis::HMILevel::eType>(
             saved_app[strings::hmi_level].asInt());
-        
+
     return saved_hmi_level;
   }
   return static_cast<int32_t>(mobile_apis::HMILevel::INVALID_ENUM);
diff --git a/src/components/policy/policy_external/src/sql_pt_representation.cc b/src/components/policy/policy_external/src/sql_pt_representation.cc
index c49cd5ac29..1732f3c774 100644
--- a/src/components/policy/policy_external/src/sql_pt_representation.cc
+++ b/src/components/policy/policy_external/src/sql_pt_representation.cc
@@ -224,8 +224,7 @@ int SQLPTRepresentation::DaysBeforeExchange(uint16_t current) {
     return limit;
   }
 
-  if (limit < 0 || last < 0 || current < last ||
-      limit < (current - last)) {
+  if (limit < 0 || last < 0 || current < last || limit < (current - last)) {
     return 0;
   }
 
diff --git a/src/components/policy/policy_regular/src/policy_manager_impl.cc b/src/components/policy/policy_regular/src/policy_manager_impl.cc
index b1a8c82f89..f05ac9cb67 100644
--- a/src/components/policy/policy_regular/src/policy_manager_impl.cc
+++ b/src/components/policy/policy_regular/src/policy_manager_impl.cc
@@ -321,9 +321,9 @@ void PolicyManagerImpl::StartPTExchange() {
         // Start retry sequency
         const uint32_t timeout_msec = NextRetryTimeout();
 
-        if(timeout_msec) {
+        if (timeout_msec) {
           LOG4CXX_DEBUG(logger_,
-            "Start retry sequence timeout = " << timeout_msec);                  
+                        "Start retry sequence timeout = " << timeout_msec);
           timer_retry_sequence_.Start(timeout_msec, timer::kPeriodic);
         }
       }
@@ -1117,7 +1117,7 @@ void PolicyManagerImpl::RetrySequence() {
   const uint32_t timeout_msec = NextRetryTimeout();
   LOG4CXX_DEBUG(logger_, "New retry sequence timeout = " << timeout_msec);
   if (!timeout_msec) {
-    if(timer_retry_sequence_.is_running()) {
+    if (timer_retry_sequence_.is_running()) {
       timer_retry_sequence_.Stop();
     }
     return;