fixup! Fix issue with incorrect behaviour in AlertManeuver

Review changes :
 Changes Unappropriate  variables names
 Add using definitions

1 files changed, 11 insertions, 12 deletions

diff --git a/src/components/application_manager/src/commands/mobile/alert_maneuver_request.cc b/src/components/application_manager/src/commands/mobile/alert_maneuver_request.cc
index 3d8faad8d1..f01edbdb74 100644
--- a/src/components/application_manager/src/commands/mobile/alert_maneuver_request.cc
+++ b/src/components/application_manager/src/commands/mobile/alert_maneuver_request.cc
@@ -216,17 +216,17 @@ bool AlertManeuverRequest::PrepareResponseParameters(
 
 bool AlertManeuverRequest::IsWhiteSpaceExist() {
   LOG4CXX_AUTO_TRACE(logger_);
+  using smart_objects::SmartArray;
 
   if ((*message_)[strings::msg_params].keyExists(strings::tts_chunks)) {
-    const smart_objects::SmartArray* tc_array =
+    const SmartArray* tts_chuncks_arr =
         (*message_)[strings::msg_params][strings::tts_chunks].asArray();
 
-    smart_objects::SmartArray::const_iterator it_tc = tc_array->begin();
-    smart_objects::SmartArray::const_iterator it_tc_end = tc_array->end();
+    SmartArray::const_iterator it_tts_chunk = tts_chuncks_arr->begin();
 
-    for (; it_tc != it_tc_end; ++it_tc) {
-      const char* str = (*it_tc)[strings::text].asCharArray();
-      if (strlen(str) && !CheckSyntax(str)) {
+    for (; it_tts_chunk != tts_chuncks_arr->end(); ++it_tts_chunk) {
+      const char* tts_chunk_text = (*it_tts_chunk)[strings::text].asCharArray();
+      if (strlen(tts_chunk_text) && !CheckSyntax(tts_chunk_text)) {
         LOG4CXX_ERROR(logger_, "Invalid tts_chunks syntax check failed");
         return true;
       }
@@ -237,15 +237,14 @@ bool AlertManeuverRequest::IsWhiteSpaceExist() {
         (*message_)[strings::msg_params][strings::soft_buttons].getType() ==
             smart_objects::SmartType_Array,
         true);
-    const smart_objects::SmartArray* sb_array =
+    const smart_objects::SmartArray* soft_button_array =
         (*message_)[strings::msg_params][strings::soft_buttons].asArray();
 
-    smart_objects::SmartArray::const_iterator it_sb = sb_array->begin();
-    smart_objects::SmartArray::const_iterator it_sb_end = sb_array->end();
+    SmartArray::const_iterator it_soft_button = soft_button_array->begin();
 
-    for (; it_sb != it_sb_end; ++it_sb) {
-      const char* str = (*it_sb)[strings::text].asCharArray();
-      if (!CheckSyntax(str)) {
+    for (; it_soft_button != soft_button_array->end(); ++it_soft_button) {
+      const char* soft_button_text = (*it_soft_button)[strings::text].asCharArray();
+      if (!CheckSyntax(soft_button_text)) {
         LOG4CXX_ERROR(logger_, "Invalid soft_buttons syntax check failed");
         return true;
       }