working dispatcher + factory

include/sp/protocol/MessageDispatcher.h

@@ -7,6 +7,7 @@
 
 #include <map>
 #include <memory>
+#include <vector>
 
 namespace sp {
 
@@ -14,13 +15,12 @@ namespace sp {
  * \class MessageDispatcher
  * \brief Class used to dispatch messages
  */
-template <typename MessageIdType, typename MessageBase, typename MessageHandler>
+template <typename MessageBase>
 class MessageDispatcher {
-  private:
-	std::map<MessageIdType, std::vector<MessageHandler*>> m_Handlers;
-
   public:
 	using MessageBaseType = MessageBase;
+	using MessageIdType = typename MessageBase::MessageIdType;
+	using MessageHandler = typename MessageBase::HandlerType;
 
 	/**
 	 * \brief Constructor
@@ -39,21 +39,24 @@ class MessageDispatcher {
 	 * \param handler The packet handler
 	 */
 	void RegisterHandler(MessageIdType a_MessageType, MessageHandler* a_Handler);
-	
+
 	/**
 	 * \brief Unregister a packet handler
 	 * \param type The packet type
 	 * \param handler The packet handler
 	 */
 	void UnregisterHandler(MessageIdType a_MessageType, MessageHandler* a_Handler);
-	
+
 	/**
 	 * \brief Unregister a packet handler
 	 * \param handler The packet handler
 	 */
 	void UnregisterHandler(MessageHandler* a_Handler);
+
+  private:
+	std::map<MessageIdType, std::vector<MessageHandler*>> m_Handlers;
 };
 
-#include <sp/protocol/message/MessageDispatcherImpl.inl>
-
 }  // namespace sp
+
+#include <sp/protocol/MessageDispatcherImpl.inl>