Merge pull request #3047 from smartdevicelink/feature/remove_deprecated_methods_6.0.0

Remove deprecated methods from project

6 files changed, 1 insertions, 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
@@ -96,12 +96,6 @@ class EventObserver {
    * @brief Unsubscribes the observer from all events
    *
    */
-  DEPRECATED void unsubscribe_from_all_events();
-
-  /*
-   * @brief Unsubscribes the observer from all events
-   *
-   */
   void unsubscribe_from_all_hmi_events();
 
   // Mobile 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
@@ -60,13 +60,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<RPCPluginPtr>& GetPlugins() = 0;
-
-  /**
    * @brief FindPluginToProcess find plugin to process message
    * @param function_id RPC identifier to process
    * @param message_source message_source source of message 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<RPCPluginPtr>& GetPlugins() OVERRIDE;
-
   utils::Optional<RPCPlugin> 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::RPCPluginPtr>&
-RPCPluginManagerImpl::GetPlugins() {
-  return loaded_plugins_;
-}
-
 utils::Optional<RPCPlugin> RPCPluginManagerImpl::FindPluginToProcess(
     const int32_t function_id,
     const commands::Command::CommandSource message_source) {