Fix style issues in projectfix/style_issues_develop

7 files changed, 30 insertions, 29 deletions

diff --git a/src/components/application_manager/src/application_impl.cc b/src/components/application_manager/src/application_impl.cc
index b58b1fa78d..115a52eef3 100644
--- a/src/components/application_manager/src/application_impl.cc
+++ b/src/components/application_manager/src/application_impl.cc
@@ -614,8 +614,7 @@ void ApplicationImpl::set_app_allowed(const bool allowed) {
   is_app_allowed_ = allowed;
 }
 
-void ApplicationImpl::set_device(
-    connection_handler::DeviceHandle device) {
+void ApplicationImpl::set_device(connection_handler::DeviceHandle device) {
   device_id_ = device;
 }
 
diff --git a/src/components/connection_handler/src/connection_handler_impl.cc b/src/components/connection_handler/src/connection_handler_impl.cc
index 0be29ed6d3..7ea9efa1cc 100644
--- a/src/components/connection_handler/src/connection_handler_impl.cc
+++ b/src/components/connection_handler/src/connection_handler_impl.cc
@@ -716,10 +716,11 @@ int32_t ConnectionHandlerImpl::GetDataOnSessionKey(
   return 0;
 }
 
-int32_t ConnectionHandlerImpl::GetDataOnSessionKey(uint32_t key,
-                                                   uint32_t* app_id,
-                                                   std::list<int32_t>* sessions_list,
-                                                   uint32_t* device_id) const {
+int32_t ConnectionHandlerImpl::GetDataOnSessionKey(
+    uint32_t key,
+    uint32_t* app_id,
+    std::list<int32_t>* sessions_list,
+    uint32_t* device_id) const {
   LOG4CXX_AUTO_TRACE(logger_);
   DeviceHandle handle;
   int32_t result = GetDataOnSessionKey(key, app_id, sessions_list, &handle);
diff --git a/src/components/include/test/connection_handler/mock_connection_handler.h b/src/components/include/test/connection_handler/mock_connection_handler.h
index 9b3dd893bb..f1416c999e 100644
--- a/src/components/include/test/connection_handler/mock_connection_handler.h
+++ b/src/components/include/test/connection_handler/mock_connection_handler.h
@@ -85,12 +85,12 @@ class MockConnectionHandler : public connection_handler::ConnectionHandler {
   MOCK_METHOD2(BindProtocolVersionWithSession,
                void(uint32_t connection_key, uint8_t protocol_version));
 
-  //DEPRECATED
+  // DEPRECATED
   MOCK_CONST_METHOD4(GetDataOnSessionKey,
-                                int32_t(uint32_t key,
-                                        uint32_t* app_id,
-                                        std::list<int32_t>* sessions_list,
-                                        uint32_t* device_id));
+                     int32_t(uint32_t key,
+                             uint32_t* app_id,
+                             std::list<int32_t>* sessions_list,
+                             uint32_t* device_id));
   MOCK_CONST_METHOD4(GetDataOnSessionKey,
                      int32_t(uint32_t key,
                              uint32_t* app_id,
diff --git a/src/components/include/test/connection_handler/mock_connection_handler_observer.h b/src/components/include/test/connection_handler/mock_connection_handler_observer.h
index 1e92106688..f1c605eaca 100644
--- a/src/components/include/test/connection_handler/mock_connection_handler_observer.h
+++ b/src/components/include/test/connection_handler/mock_connection_handler_observer.h
@@ -48,10 +48,11 @@ class MockConnectionHandlerObserver
   MOCK_METHOD0(OnFindNewApplicationsRequest, void());
   MOCK_METHOD1(RemoveDevice,
                void(const connection_handler::DeviceHandle& device_handle));
-  DEPRECATED MOCK_METHOD3(OnServiceStartedCallback,
-               bool(const connection_handler::DeviceHandle& device_handle,
-                    const int32_t& session_key,
-                    const protocol_handler::ServiceType& type));
+  DEPRECATED MOCK_METHOD3(
+      OnServiceStartedCallback,
+      bool(const connection_handler::DeviceHandle& device_handle,
+           const int32_t& session_key,
+           const protocol_handler::ServiceType& type));
   MOCK_METHOD4(OnServiceStartedCallback,
                void(const connection_handler::DeviceHandle& device_handle,
                     const int32_t& session_key,
diff --git a/src/components/include/test/protocol_handler/mock_protocol_handler.h b/src/components/include/test/protocol_handler/mock_protocol_handler.h
index 12f8279ded..79c2188cdf 100644
--- a/src/components/include/test/protocol_handler/mock_protocol_handler.h
+++ b/src/components/include/test/protocol_handler/mock_protocol_handler.h
@@ -63,12 +63,12 @@ class MockProtocolHandler : public ::protocol_handler::ProtocolHandler {
                      const ::protocol_handler::ProtocolHandlerSettings&());
   MOCK_METHOD0(get_session_observer, protocol_handler::SessionObserver&());
   DEPRECATED MOCK_METHOD6(NotifySessionStartedResult,
-               void(int32_t connection_id,
-                    uint8_t session_id,
-                    uint8_t generated_session_id,
-                    uint32_t hash_id,
-                    bool protection,
-                    std::vector<std::string>& rejected_params));
+                          void(int32_t connection_id,
+                               uint8_t session_id,
+                               uint8_t generated_session_id,
+                               uint32_t hash_id,
+                               bool protection,
+                               std::vector<std::string>& rejected_params));
   MOCK_METHOD2(NotifySessionStarted,
                void(const ::protocol_handler::SessionContext& context,
                     std::vector<std::string>& rejected_params));
diff --git a/src/components/transport_manager/src/iap2_emulation/iap2_transport_adapter.cc b/src/components/transport_manager/src/iap2_emulation/iap2_transport_adapter.cc
index 4704f7dd27..741c075310 100644
--- a/src/components/transport_manager/src/iap2_emulation/iap2_transport_adapter.cc
+++ b/src/components/transport_manager/src/iap2_emulation/iap2_transport_adapter.cc
@@ -131,7 +131,7 @@ void IAP2USBEmulationTransportAdapter::IAPSignalHandlerDelegate::threadMain() {
 
   const auto size = 32;
   while (run_flag_) {
-    char buffer[size];    
+    char buffer[size];
     auto bytes = read(in_, &buffer, size);
     if (0 == bytes) {
       continue;
diff --git a/src/components/transport_manager/src/usb/libusb/usb_connection.cc b/src/components/transport_manager/src/usb/libusb/usb_connection.cc
index a1b2430889..3e59bdf40b 100644
--- a/src/components/transport_manager/src/usb/libusb/usb_connection.cc
+++ b/src/components/transport_manager/src/usb/libusb/usb_connection.cc
@@ -43,8 +43,9 @@
 
 #include "utils/logger.h"
 
-// Define the buffer size, because the Android accessory protocol packet support packet buffers up to 16Kbytes
-#define TRANSPORT_USB_BUFFER_MAX_SIZE	(16*1024)
+// Define the buffer size, because the Android accessory protocol packet support
+// packet buffers up to 16Kbytes
+#define TRANSPORT_USB_BUFFER_MAX_SIZE (16 * 1024)
 
 namespace transport_manager {
 namespace transport_adapter {
@@ -312,11 +313,10 @@ bool UsbConnection::Init() {
     return false;
   }
 
-  if(in_endpoint_max_packet_size_ < TRANSPORT_USB_BUFFER_MAX_SIZE){
-  	in_buffer_size_ = TRANSPORT_USB_BUFFER_MAX_SIZE;
-  }
-  else {
-  	in_buffer_size_ = in_endpoint_max_packet_size_;
+  if (in_endpoint_max_packet_size_ < TRANSPORT_USB_BUFFER_MAX_SIZE) {
+    in_buffer_size_ = TRANSPORT_USB_BUFFER_MAX_SIZE;
+  } else {
+    in_buffer_size_ = in_endpoint_max_packet_size_;
   }
 
   in_buffer_ = new unsigned char[in_buffer_size_];