From afae7eb7a0787cd291761a3d18c43e4d3eb02d1e Mon Sep 17 00:00:00 2001
From: Andrey Oleynik <aoleynik@luxoft.com>
Date: Thu, 14 Jul 2016 15:15:10 +0300
Subject: Renames interfaces to fit coding style

Relates-to: APPLINK-23987
---
 .../include/application_manager/application_manager.h       |  4 ++--
 .../include/application_manager/application_manager_impl.h  |  4 ++--
 .../application_manager/src/application_manager_impl.cc     | 13 ++++++-------
 .../src/commands/hmi/sdl_activate_app_request.cc            |  3 ++-
 .../include/application_manager/mock_application_manager.h  |  4 ++--
 5 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/src/components/application_manager/include/application_manager/application_manager.h b/src/components/application_manager/include/application_manager/application_manager.h
index da511cd383..97c38cd134 100644
--- a/src/components/application_manager/include/application_manager/application_manager.h
+++ b/src/components/application_manager/include/application_manager/application_manager.h
@@ -347,14 +347,14 @@ class ApplicationManager {
    * @param hmi_id HMI application id
    * @return Pointer to application or uninitialized shared pointer
    */
-  virtual ApplicationConstSharedPtr app_to_be_registered(
+  virtual ApplicationConstSharedPtr WaitingApplicationByID(
       const uint32_t hmi_id) const = 0;
 
   /**
    * @brief Returns list of applications-to-be-registered (QUERY_APP list)
    * @return Locked list of applications
    */
-  virtual DataAccessor<AppsWaitRegistrationSet> apps_waiting_for_registration()
+  virtual DataAccessor<AppsWaitRegistrationSet> AppsWaitingForRegistration()
       const = 0;
 
   virtual bool IsAppsQueriedFrom(
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 9208d239fe..dda192f8b0 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
@@ -1080,10 +1080,10 @@ class ApplicationManagerImpl
   void MarkAppsGreyOut(const connection_handler::DeviceHandle handle,
                        bool is_greyed_out) OVERRIDE;
 
-  ApplicationConstSharedPtr app_to_be_registered(
+  ApplicationConstSharedPtr WaitingApplicationByID(
       const uint32_t hmi_id) const OVERRIDE;
 
-  DataAccessor<AppsWaitRegistrationSet> apps_waiting_for_registration()
+  DataAccessor<AppsWaitRegistrationSet> AppsWaitingForRegistration()
       const OVERRIDE;
 
   /**
diff --git a/src/components/application_manager/src/application_manager_impl.cc b/src/components/application_manager/src/application_manager_impl.cc
index 998968c81f..9b97736e76 100644
--- a/src/components/application_manager/src/application_manager_impl.cc
+++ b/src/components/application_manager/src/application_manager_impl.cc
@@ -834,9 +834,9 @@ void ApplicationManagerImpl::OnMessageReceived(
   messages_from_hmi_.PostMessage(impl::MessageFromHmi(message));
 }
 
-ApplicationConstSharedPtr
-ApplicationManagerImpl::app_to_be_registered(const uint32_t hmi_id) const {
-  AppsWaitRegistrationSet app_list = apps_waiting_for_registration().GetData();
+ApplicationConstSharedPtr ApplicationManagerImpl::WaitingApplicationByID(
+    const uint32_t hmi_id) const {
+  AppsWaitRegistrationSet app_list = AppsWaitingForRegistration().GetData();
 
   AppsWaitRegistrationSet::const_iterator it_end = app_list.end();
 
@@ -850,10 +850,9 @@ ApplicationManagerImpl::app_to_be_registered(const uint32_t hmi_id) const {
 }
 
 DataAccessor<AppsWaitRegistrationSet>
-ApplicationManagerImpl::apps_waiting_for_registration() const {
-  return DataAccessor<AppsWaitRegistrationSet>(
-      apps_to_register_,
-      apps_to_register_list_lock_);
+ApplicationManagerImpl::AppsWaitingForRegistration() const {
+  return DataAccessor<AppsWaitRegistrationSet>(apps_to_register_,
+                                               apps_to_register_list_lock_);
 }
 
 bool ApplicationManagerImpl::IsAppsQueriedFrom(
diff --git a/src/components/application_manager/src/commands/hmi/sdl_activate_app_request.cc b/src/components/application_manager/src/commands/hmi/sdl_activate_app_request.cc
index 719b587cbd..84297f1bcd 100644
--- a/src/components/application_manager/src/commands/hmi/sdl_activate_app_request.cc
+++ b/src/components/application_manager/src/commands/hmi/sdl_activate_app_request.cc
@@ -103,7 +103,8 @@ void SDLActivateAppRequest::Run() {
     // replaces it with connection_key only for normally registered apps, but
     // for apps_to_be_registered (waiting) it keeps original value (hmi_app_id)
     // so method does lookup for hmi_app_id
-    app_to_activate = application_manager_.app_to_be_registered(application_id);
+    app_to_activate =
+        application_manager_.WaitingApplicationByID(application_id);
 
     if (!app_to_activate) {
       LOG4CXX_WARN(
diff --git a/src/components/application_manager/test/include/application_manager/mock_application_manager.h b/src/components/application_manager/test/include/application_manager/mock_application_manager.h
index ecc3f7c598..6ad8aeb250 100644
--- a/src/components/application_manager/test/include/application_manager/mock_application_manager.h
+++ b/src/components/application_manager/test/include/application_manager/mock_application_manager.h
@@ -234,10 +234,10 @@ class MockApplicationManager : public application_manager::ApplicationManager {
   MOCK_CONST_METHOD0(IsAnyAppSubscribedForWayPoints, bool());
   MOCK_CONST_METHOD0(GetAppsSubscribedForWayPoints, const std::set<int32_t>());
   MOCK_CONST_METHOD1(
-      app_to_be_registered,
+      WaitingApplicationByID,
       application_manager::ApplicationConstSharedPtr(const uint32_t));
   MOCK_CONST_METHOD0(
-      apps_waiting_for_registration,
+      AppsWaitingForRegistration,
       DataAccessor<application_manager::AppsWaitRegistrationSet>());
 };
 
-- 
cgit v1.2.1