1 files changed, 9 insertions, 8 deletions
diff --git a/src/components/application_manager/rpc_plugins/app_service_rpc_plugin/src/commands/hmi/as_get_app_service_data_request_from_hmi.cc b/src/components/application_manager/rpc_plugins/app_service_rpc_plugin/src/commands/hmi/as_get_app_service_data_request_from_hmi.cc
index 32fccb0192..ff9d4e436a 100644
--- a/src/components/application_manager/rpc_plugins/app_service_rpc_plugin/src/commands/hmi/as_get_app_service_data_request_from_hmi.cc
+++ b/src/components/application_manager/rpc_plugins/app_service_rpc_plugin/src/commands/hmi/as_get_app_service_data_request_from_hmi.cc
@@ -92,7 +92,7 @@ void ASGetAppServiceDataRequestFromHMI::GetWeatherImagePaths(
   if (data.keyExists(strings::minute_forecast)) {
     smart_objects::SmartObject& minute_forecast =
         data[strings::minute_forecast];
-    for (size_t i = 0; i < minute_forecast.length(); i++) {
+    for (size_t i = 0; i < minute_forecast.length(); ++i) {
       if (minute_forecast[i].keyExists(strings::weather_icon)) {
         MessageHelper::VerifyImage(minute_forecast[i][strings::weather_icon],
                                    app,
@@ -104,7 +104,7 @@ void ASGetAppServiceDataRequestFromHMI::GetWeatherImagePaths(
   if (data.keyExists(strings::hourly_forecast)) {
     smart_objects::SmartObject& hourly_forecast =
         data[strings::hourly_forecast];
-    for (size_t i = 0; i < hourly_forecast.length(); i++) {
+    for (size_t i = 0; i < hourly_forecast.length(); ++i) {
       if (hourly_forecast[i].keyExists(strings::weather_icon)) {
         MessageHelper::VerifyImage(hourly_forecast[i][strings::weather_icon],
                                    app,
@@ -116,7 +116,7 @@ void ASGetAppServiceDataRequestFromHMI::GetWeatherImagePaths(
   if (data.keyExists(strings::multiday_forecast)) {
     smart_objects::SmartObject& multiday_forecast =
         data[strings::multiday_forecast];
-    for (size_t i = 0; i < multiday_forecast.length(); i++) {
+    for (size_t i = 0; i < multiday_forecast.length(); ++i) {
       if (multiday_forecast[i].keyExists(strings::weather_icon)) {
         MessageHelper::VerifyImage(multiday_forecast[i][strings::weather_icon],
                                    app,
@@ -145,7 +145,7 @@ void ASGetAppServiceDataRequestFromHMI::GetNavigationImagePaths(
 
   if (data.keyExists(strings::instructions)) {
     smart_objects::SmartObject& instructions = data[strings::instructions];
-    for (size_t i = 0; i < instructions.length(); i++) {
+    for (size_t i = 0; i < instructions.length(); ++i) {
       if (instructions[i].keyExists(strings::image)) {
         MessageHelper::VerifyImage(
             instructions[i][strings::image], app, application_manager_);
@@ -240,8 +240,8 @@ void ASGetAppServiceDataRequestFromHMI::on_event(
   hmi_apis::Common_Result::eType result =
       static_cast<hmi_apis::Common_Result::eType>(
           event_message[strings::params][hmi_response::code].asInt());
-  bool success =
-      IsHMIResultSuccess(result, HmiInterfaces::HMI_INTERFACE_AppService);
+  bool success = CommandImpl::IsHMIResultSuccess(
+      result, HmiInterfaces::HMI_INTERFACE_AppService);
   if (ValidateResponse(msg_params)) {
     SendResponse(success,
                  correlation_id(),
@@ -263,7 +263,8 @@ void ASGetAppServiceDataRequestFromHMI::on_event(
           msg_params[strings::result_code].asInt());
   hmi_apis::Common_Result::eType result =
       MessageHelper::MobileToHMIResult(mobile_result);
-  bool success = IsMobileResultSuccess(mobile_result);
+  bool success =
+      application_manager::commands::IsMobileResultSuccess(mobile_result);
 
   if (ValidateResponse(msg_params)) {
     SendResponse(success,
@@ -275,7 +276,7 @@ void ASGetAppServiceDataRequestFromHMI::on_event(
   }
 }
 
-void ASGetAppServiceDataRequestFromHMI::onTimeOut() {
+void ASGetAppServiceDataRequestFromHMI::OnTimeOut() {
   SDL_LOG_AUTO_TRACE();
   SendErrorResponse(correlation_id(),
                     hmi_apis::FunctionID::AppService_GetAppServiceData,