From de7ee04f70f8b3aa02b284e715f45858cd152916 Mon Sep 17 00:00:00 2001 From: jacobkeeler Date: Mon, 23 Sep 2019 15:49:18 -0400 Subject: Remove deprecated methods from project --- .../include/application_manager/event_engine/event_observer.h | 6 ------ .../application_manager/plugin_manager/rpc_plugin_manager.h | 7 ------- .../application_manager/plugin_manager/rpc_plugin_manager_impl.h | 3 --- .../sdl_rpc_plugin/src/commands/hmi/navi_start_stream_request.cc | 2 +- .../application_manager/src/event_engine/event_observer.cc | 4 ---- .../src/plugin_manager/rpc_plugin_manager_impl.cc | 5 ----- 6 files changed, 1 insertion(+), 26 deletions(-) diff --git a/src/components/application_manager/include/application_manager/event_engine/event_observer.h b/src/components/application_manager/include/application_manager/event_engine/event_observer.h index 7a7fe7c2ec..1f4eccaf46 100644 --- a/src/components/application_manager/include/application_manager/event_engine/event_observer.h +++ b/src/components/application_manager/include/application_manager/event_engine/event_observer.h @@ -92,12 +92,6 @@ class EventObserver { */ void unsubscribe_from_event(const Event::EventID& event_id); - /* - * @brief Unsubscribes the observer from all events - * - */ - DEPRECATED void unsubscribe_from_all_events(); - /* * @brief Unsubscribes the observer from all events * diff --git a/src/components/application_manager/include/application_manager/plugin_manager/rpc_plugin_manager.h b/src/components/application_manager/include/application_manager/plugin_manager/rpc_plugin_manager.h index abf5494ecb..eb14f26ae6 100644 --- a/src/components/application_manager/include/application_manager/plugin_manager/rpc_plugin_manager.h +++ b/src/components/application_manager/include/application_manager/plugin_manager/rpc_plugin_manager.h @@ -59,13 +59,6 @@ class RPCPluginManager { */ virtual uint32_t LoadPlugins(const std::string& plugins_path) = 0; - /** - * @brief GetPlugins get list of plugins - * @return list of loaded plugins - */ - DEPRECATED - virtual std::vector& GetPlugins() = 0; - /** * @brief FindPluginToProcess find plugin to process message * @param function_id RPC identifier to process diff --git a/src/components/application_manager/include/application_manager/plugin_manager/rpc_plugin_manager_impl.h b/src/components/application_manager/include/application_manager/plugin_manager/rpc_plugin_manager_impl.h index c3fc79b5f9..5495c44e05 100644 --- a/src/components/application_manager/include/application_manager/plugin_manager/rpc_plugin_manager_impl.h +++ b/src/components/application_manager/include/application_manager/plugin_manager/rpc_plugin_manager_impl.h @@ -64,9 +64,6 @@ class RPCPluginManagerImpl : public RPCPluginManager { uint32_t LoadPlugins(const std::string& plugins_path) OVERRIDE; - DEPRECATED - std::vector& GetPlugins() OVERRIDE; - utils::Optional FindPluginToProcess( const int32_t function_id, const commands::Command::CommandSource message_source) OVERRIDE; diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/navi_start_stream_request.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/navi_start_stream_request.cc index 7f643d6130..e06995f40d 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/navi_start_stream_request.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/navi_start_stream_request.cc @@ -64,7 +64,7 @@ NaviStartStreamRequest::NaviStartStreamRequest( } NaviStartStreamRequest::~NaviStartStreamRequest() { - // unsubscribe_from_all_events() in EventObserver's destructor isn't enough; + // unsubscribe_from_all_hmi_events() in EventObserver's destructor isn't enough; // we must unsubscribe before this NaviStartStreamRequest instance is removed unsubscribe_from_event(hmi_apis::FunctionID::Navigation_StartStream); } diff --git a/src/components/application_manager/src/event_engine/event_observer.cc b/src/components/application_manager/src/event_engine/event_observer.cc index fc252d3125..e17203f2f2 100644 --- a/src/components/application_manager/src/event_engine/event_observer.cc +++ b/src/components/application_manager/src/event_engine/event_observer.cc @@ -57,10 +57,6 @@ void EventObserver::unsubscribe_from_event(const Event::EventID& event_id) { event_dispatcher_.remove_observer(event_id, *this); } -void EventObserver::unsubscribe_from_all_events() { - event_dispatcher_.remove_observer(*this); -} - void EventObserver::unsubscribe_from_all_hmi_events() { event_dispatcher_.remove_observer(*this); } diff --git a/src/components/application_manager/src/plugin_manager/rpc_plugin_manager_impl.cc b/src/components/application_manager/src/plugin_manager/rpc_plugin_manager_impl.cc index af2373fbc1..0c7ec9838b 100644 --- a/src/components/application_manager/src/plugin_manager/rpc_plugin_manager_impl.cc +++ b/src/components/application_manager/src/plugin_manager/rpc_plugin_manager_impl.cc @@ -112,11 +112,6 @@ uint32_t RPCPluginManagerImpl::LoadPlugins(const std::string& plugins_path) { return loaded_plugins_.size(); } -std::vector& -RPCPluginManagerImpl::GetPlugins() { - return loaded_plugins_; -} - utils::Optional RPCPluginManagerImpl::FindPluginToProcess( const int32_t function_id, const commands::Command::CommandSource message_source) { -- cgit v1.2.1