diff options
author | Andrey Oleynik (GitHub) <aoleynik@luxoft.com> | 2017-12-06 10:20:51 +0200 |
---|---|---|
committer | Andriy Byzhynar <AByzhynar@luxoft.com> | 2018-01-18 12:03:51 +0200 |
commit | c4e771fb7d402157c5cbb5159c41e0a4553b8492 (patch) | |
tree | 80590c89fd5edf14c425fc92976be92236cff6a0 /src/components/include | |
parent | 2c207377259ad01c7f231533ba7189008d03a898 (diff) | |
download | sdl_core-c4e771fb7d402157c5cbb5159c41e0a4553b8492.tar.gz |
Fixes coding style
Diffstat (limited to 'src/components/include')
8 files changed, 22 insertions, 15 deletions
diff --git a/src/components/include/test/application_manager/policies/mock_policy_handler_interface.h b/src/components/include/test/application_manager/policies/mock_policy_handler_interface.h index bb4e5d3e21..931fd6cfb4 100644 --- a/src/components/include/test/application_manager/policies/mock_policy_handler_interface.h +++ b/src/components/include/test/application_manager/policies/mock_policy_handler_interface.h @@ -255,8 +255,9 @@ class MockPolicyHandlerInterface : public policy::PolicyHandlerInterface { MOCK_METHOD2(SetDefaultHmiTypes, void(const std::string& application_id, const smart_objects::SmartObject* app_types)); - MOCK_METHOD2(OnDeviceSwitching, void(const std::string& device_id_from, - const std::string& device_id_to)); + MOCK_METHOD2(OnDeviceSwitching, + void(const std::string& device_id_from, + const std::string& device_id_to)); #endif // SDL_REMOTE_CONTROL private: 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 0d0d362adb..9ca19f25f0 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 @@ -67,9 +67,9 @@ class MockConnectionHandlerObserver GetHandshakeContext, security_manager::SSLContext::HandshakeContext(uint32_t key)); - MOCK_METHOD2(OnDeviceSwitchingStart, void( - const connection_handler::Device& device_from, - const connection_handler::Device& device_to)); + MOCK_METHOD2(OnDeviceSwitchingStart, + void(const connection_handler::Device& device_from, + const connection_handler::Device& device_to)); MOCK_METHOD1(OnDeviceSwitchingFinish, void(const std::string& device_uid)); }; diff --git a/src/components/include/test/policy/policy_external/policy/mock_cache_manager.h b/src/components/include/test/policy/policy_external/policy/mock_cache_manager.h index 2f3c785865..5aa92446b6 100644 --- a/src/components/include/test/policy/policy_external/policy/mock_cache_manager.h +++ b/src/components/include/test/policy/policy_external/policy/mock_cache_manager.h @@ -247,8 +247,9 @@ class MockCacheManagerInterface : public ::policy::CacheManagerInterface { GroupsByExternalConsentStatus(const ExternalConsentStatus&)); MOCK_METHOD0(GetKnownLinksFromPT, std::map<std::string, std::string>()); MOCK_METHOD1(SetExternalConsentForApp, void(const PermissionConsent&)); - MOCK_METHOD2(OnDeviceSwitching, void(const std::string& device_id_from, - const std::string& device_id_to)); + MOCK_METHOD2(OnDeviceSwitching, + void(const std::string& device_id_from, + const std::string& device_id_to)); }; } // namespace policy_test diff --git a/src/components/include/test/policy/policy_external/policy/mock_policy_manager.h b/src/components/include/test/policy/policy_external/policy/mock_policy_manager.h index 3b835be422..9e487da4ba 100644 --- a/src/components/include/test/policy/policy_external/policy/mock_policy_manager.h +++ b/src/components/include/test/policy/policy_external/policy/mock_policy_manager.h @@ -215,8 +215,9 @@ class MockPolicyManager : public PolicyManager { MOCK_METHOD0(GetExternalConsentStatus, ExternalConsentStatus()); MOCK_CONST_METHOD1(IsNeedToUpdateExternalConsentStatus, bool(const ExternalConsentStatus&)); - MOCK_METHOD2(OnDeviceSwitching, void(const std::string& device_id_from, - const std::string& device_id_to)); + MOCK_METHOD2(OnDeviceSwitching, + void(const std::string& device_id_from, + const std::string& device_id_to)); }; } // namespace policy_manager_test } // namespace components diff --git a/src/components/include/test/policy/policy_regular/policy/mock_cache_manager.h b/src/components/include/test/policy/policy_regular/policy/mock_cache_manager.h index 9a254417ec..ed3a5088c1 100644 --- a/src/components/include/test/policy/policy_regular/policy/mock_cache_manager.h +++ b/src/components/include/test/policy/policy_regular/policy/mock_cache_manager.h @@ -211,8 +211,9 @@ class MockCacheManagerInterface : public CacheManagerInterface { MOCK_CONST_METHOD2(AppHasHMIType, bool(const std::string& application_id, policy_table::AppHMIType hmi_type)); - MOCK_METHOD2(OnDeviceSwitching, void(const std::string& device_id_from, - const std::string& device_id_to)); + MOCK_METHOD2(OnDeviceSwitching, + void(const std::string& device_id_from, + const std::string& device_id_to)); }; } // namespace policy_test diff --git a/src/components/include/test/policy/policy_regular/policy/mock_policy_manager.h b/src/components/include/test/policy/policy_regular/policy/mock_policy_manager.h index 66fc9bcf8d..82012b83c7 100644 --- a/src/components/include/test/policy/policy_regular/policy/mock_policy_manager.h +++ b/src/components/include/test/policy/policy_regular/policy/mock_policy_manager.h @@ -223,8 +223,9 @@ class MockPolicyManager : public PolicyManager { void(const std::string& policy_app_id, const std::vector<FunctionalGroupPermission>& current_permissions)); - MOCK_METHOD2(OnDeviceSwitching, void(const std::string& device_id_from, - const std::string& device_id_to)); + MOCK_METHOD2(OnDeviceSwitching, + void(const std::string& device_id_from, + const std::string& device_id_to)); }; } // namespace policy_manager_test diff --git a/src/components/include/test/transport_manager/mock_transport_manager_listener.h b/src/components/include/test/transport_manager/mock_transport_manager_listener.h index 2099c2c56b..f4c4fdcf68 100644 --- a/src/components/include/test/transport_manager/mock_transport_manager_listener.h +++ b/src/components/include/test/transport_manager/mock_transport_manager_listener.h @@ -81,8 +81,9 @@ class MockTransportManagerListener : public TransportManagerListener { MOCK_METHOD2(OnTMMessageSendFailed, void(const DataSendError& error, const ::protocol_handler::RawMessagePtr message)); - MOCK_METHOD2(OnDeviceSwitchingStart, void(const DeviceUID& device_uid_from, - const DeviceUID& device_uid_to)); + MOCK_METHOD2(OnDeviceSwitchingStart, + void(const DeviceUID& device_uid_from, + const DeviceUID& device_uid_to)); MOCK_METHOD1(OnDeviceSwitchingFinish, void(const DeviceUID& device_uid)); }; diff --git a/src/components/include/transport_manager/transport_adapter/device.h b/src/components/include/transport_manager/transport_adapter/device.h index 4616a8cfc2..148e715050 100644 --- a/src/components/include/transport_manager/transport_adapter/device.h +++ b/src/components/include/transport_manager/transport_adapter/device.h @@ -137,6 +137,7 @@ class Device { inline std::string transport_switch_id() const { return transport_switch_id_; } + private: /** * @brief Device user-friendly name. |