diff options
author | jacobkeeler <jacob.keeler@livioradio.com> | 2018-02-01 15:04:07 -0500 |
---|---|---|
committer | jacobkeeler <jacob.keeler@livioradio.com> | 2018-02-01 15:04:07 -0500 |
commit | 21754a3bde48b47f107830eba6f4e666b140e43a (patch) | |
tree | b1e4a393e47dab0fc40c395ecd707b81fe9fcc76 | |
parent | a50c9f1cc63106ddcda1236c1db805b123df9495 (diff) | |
download | sdl_core-21754a3bde48b47f107830eba6f4e666b140e43a.tar.gz |
Fix deprecated warnings in application_impl and connection_handler_implfix/deprecated_warnings
5 files changed, 18 insertions, 15 deletions
diff --git a/src/components/application_manager/include/application_manager/application_impl.h b/src/components/application_manager/include/application_manager/application_impl.h index 10ec8b8eb8..fd6dd13e39 100644 --- a/src/components/application_manager/include/application_manager/application_impl.h +++ b/src/components/application_manager/include/application_manager/application_impl.h @@ -184,7 +184,7 @@ class ApplicationImpl : public virtual Application, void increment_list_files_in_none_count(); bool set_app_icon_path(const std::string& path); void set_app_allowed(const bool allowed); - DEPRECATED void set_device(connection_handler::DeviceHandle device); + void set_device(connection_handler::DeviceHandle device); virtual uint32_t get_grammar_id() const; virtual void set_grammar_id(uint32_t value); bool is_audio() const OVERRIDE; diff --git a/src/components/application_manager/src/application_impl.cc b/src/components/application_manager/src/application_impl.cc index 735a9955a7..b58b1fa78d 100644 --- a/src/components/application_manager/src/application_impl.cc +++ b/src/components/application_manager/src/application_impl.cc @@ -614,7 +614,7 @@ void ApplicationImpl::set_app_allowed(const bool allowed) { is_app_allowed_ = allowed; } -DEPRECATED void ApplicationImpl::set_device( +void ApplicationImpl::set_device( connection_handler::DeviceHandle device) { device_id_ = device; } diff --git a/src/components/connection_handler/include/connection_handler/connection_handler_impl.h b/src/components/connection_handler/include/connection_handler/connection_handler_impl.h index 120d48917b..3aa304aabc 100644 --- a/src/components/connection_handler/include/connection_handler/connection_handler_impl.h +++ b/src/components/connection_handler/include/connection_handler/connection_handler_impl.h @@ -202,7 +202,7 @@ class ConnectionHandlerImpl * \return uint32_t Id (number) of new session if successful, otherwise 0. * \deprecated */ - DEPRECATED virtual uint32_t OnSessionStartedCallback( + virtual uint32_t OnSessionStartedCallback( const transport_manager::ConnectionUID connection_handle, const uint8_t session_id, const protocol_handler::ServiceType& service_type, @@ -238,7 +238,7 @@ class ConnectionHandlerImpl * \return uint32_t 0 if operation fails, session key otherwise * \deprecated */ - DEPRECATED uint32_t OnSessionEndedCallback( + uint32_t OnSessionEndedCallback( const transport_manager::ConnectionUID connection_handle, const uint8_t session_id, const uint32_t& hashCode, @@ -512,10 +512,10 @@ class ConnectionHandlerImpl * \param device_id Returned: DeviceID * \return int32_t -1 in case of error or 0 in case of success */ - DEPRECATED int32_t GetDataOnSessionKey(uint32_t key, - uint32_t* app_id, - std::list<int32_t>* sessions_list, - uint32_t* device_id) const OVERRIDE; + int32_t GetDataOnSessionKey(uint32_t key, + uint32_t* app_id, + std::list<int32_t>* sessions_list, + uint32_t* device_id) const OVERRIDE; const ConnectionHandlerSettings& get_settings() const OVERRIDE; diff --git a/src/components/connection_handler/src/connection_handler_impl.cc b/src/components/connection_handler/src/connection_handler_impl.cc index ac8bad2205..0be29ed6d3 100644 --- a/src/components/connection_handler/src/connection_handler_impl.cc +++ b/src/components/connection_handler/src/connection_handler_impl.cc @@ -716,13 +716,15 @@ int32_t ConnectionHandlerImpl::GetDataOnSessionKey( return 0; } -DEPRECATED 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_); - return GetDataOnSessionKey(key, app_id, sessions_list, device_id); + DeviceHandle handle; + int32_t result = GetDataOnSessionKey(key, app_id, sessions_list, &handle); + *device_id = static_cast<uint32_t>(handle); + return result; } const ConnectionHandlerSettings& ConnectionHandlerImpl::get_settings() const { 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 20be7b64e9..9b3dd893bb 100644 --- a/src/components/include/test/connection_handler/mock_connection_handler.h +++ b/src/components/include/test/connection_handler/mock_connection_handler.h @@ -85,7 +85,8 @@ class MockConnectionHandler : public connection_handler::ConnectionHandler { MOCK_METHOD2(BindProtocolVersionWithSession, void(uint32_t connection_key, uint8_t protocol_version)); - DEPRECATED MOCK_CONST_METHOD4(GetDataOnSessionKey, + //DEPRECATED + MOCK_CONST_METHOD4(GetDataOnSessionKey, int32_t(uint32_t key, uint32_t* app_id, std::list<int32_t>* sessions_list, |