Merge branch 'release/4.1.0'

1 files changed, 4 insertions, 25 deletions

diff --git a/src/components/hmi_message_handler/include/hmi_message_handler/hmi_message_adapter.h b/src/components/hmi_message_handler/include/hmi_message_handler/hmi_message_adapter.h
index 5ed37031ea..d2a3a5b907 100644
--- a/src/components/hmi_message_handler/include/hmi_message_handler/hmi_message_adapter.h
+++ b/src/components/hmi_message_handler/include/hmi_message_handler/hmi_message_adapter.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, Ford Motor Company
+ * Copyright (c) 2015, Ford Motor Company
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -33,7 +33,7 @@
 #ifndef SRC_COMPONENTS_HMI_MESSAGE_HANDLER_INCLUDE_HMI_MESSAGE_HANDLER_HMI_MESSAGE_ADAPTER_H_
 #define SRC_COMPONENTS_HMI_MESSAGE_HANDLER_INCLUDE_HMI_MESSAGE_HANDLER_HMI_MESSAGE_ADAPTER_H_
 
-#include "hmi_message_handler/hmi_message_handler.h"
+#include "hmi_message_handler/hmi_message_sender.h"
 
 namespace hmi_message_handler {
 /**
@@ -43,37 +43,16 @@ namespace hmi_message_handler {
  * SDL with HMI has to implement this interface.
  */
 class HMIMessageAdapter : public HMIMessageSender {
- public:
-  /**
-   * \brief Constructor
-   * \param handler Pointer to implementation of HMIMessageHandler abstract class
-   * to notify it about receiving message or error on sending message.
-   */
-  explicit HMIMessageAdapter(HMIMessageHandler* handler);
-
-  /**
-   * \brief Destructor
-   */
-  virtual ~HMIMessageAdapter();
-
  protected:
   /**
    * \brief Interface for subscriptions.
    * Each class implementing interface should use it according to
    * standarts of transport for which it is to be an adapter.
-   * For example, Adapter for MessageBroker will use it to subscribe to notifications
+   * For example, Adapter for MessageBroker will use it to subscribe to
+   * notifications
    * from HMI.
    */
   virtual void SubscribeTo() = 0;
-  inline virtual HMIMessageHandler* handler() const {
-    return handler_;
-  }
-
- private:
-  /**
-   *\brief Pointer on handler to notify it about receiving message/error.
-   */
-  mutable HMIMessageHandler* handler_;
 };
 
 }  // namespace hmi_message_handler