1 files changed, 30 insertions, 41 deletions

diff --git a/mwe/events/src/eventManager.cpp b/mwe/events/src/eventManager.cpp
index ce8e940..c37dcb0 100644
--- a/mwe/events/src/eventManager.cpp
+++ b/mwe/events/src/eventManager.cpp
@@ -2,15 +2,15 @@
 
 void EventManager::shutdown()
 {
-    m_subscribers.clear();
+    subscribers.clear();
 }
 
 void EventManager::subscribe(int eventType, std::unique_ptr<IEventHandlerWrapper>&& handler, int eventId)
 {
     if (eventId) {
-        std::unordered_map<int, std::unordered_map<int, std::vector<std::unique_ptr<IEventHandlerWrapper>>>>::iterator subscribers = m_subscribersByEventId.find(eventType);
+        std::unordered_map<int, std::unordered_map<int, std::vector<std::unique_ptr<IEventHandlerWrapper>>>>::iterator subscribers = subscribersByEventId.find(eventType);
 
-        if (subscribers != m_subscribersByEventId.end()) {
+        if (subscribers != subscribersByEventId.end()) {
             std::unordered_map<int, std::vector<std::unique_ptr<IEventHandlerWrapper>>>& handlersMap = subscribers->second;
             std::unordered_map<int, std::vector<std::unique_ptr<IEventHandlerWrapper>>>::iterator handlers = handlersMap.find(eventId);
             if (handlers != handlersMap.end()) {
@@ -18,31 +18,20 @@ void EventManager::subscribe(int eventType, std::unique_ptr<IEventHandlerWrapper
                 return;
             }
         }
-        m_subscribersByEventId[eventType][eventId].emplace_back(std::move(handler));
+        subscribersByEventId[eventType][eventId].emplace_back(std::move(handler));
 
     } else {
-        std::unordered_map<int, std::vector<std::unique_ptr<IEventHandlerWrapper>>>::iterator subscribers = m_subscribers.find(eventType);
-        if (subscribers != m_subscribers.end()) {
-            std::vector<std::unique_ptr<IEventHandlerWrapper>>& handlers = subscribers->second;
-            for (std::unique_ptr<IEventHandlerWrapper>& it : handlers) {
-                if (it->getType() == handler->getType()) {
-                    // log for double register
-                    return;
-                }
-            }
-            handlers.emplace_back(std::move(handler));
-        } else {
-            m_subscribers[eventType].emplace_back(std::move(handler));
-        }
+        auto& handlers = subscribers[eventType];
+    	handlers.emplace_back(std::move(handler));
     }
 }
 
 void EventManager::unsubscribe(int eventType, const std::string& handlerName, int eventId)
 {
     if (eventId) {
-        std::unordered_map<int, std::unordered_map<int, std::vector<std::unique_ptr<IEventHandlerWrapper>>>>::iterator subscribers = m_subscribersByEventId.find(eventType);
-        if (subscribers != m_subscribersByEventId.end()) {
-            std::unordered_map<int, std::vector<std::unique_ptr<IEventHandlerWrapper>>>& handlersMap = subscribers->second;
+        std::unordered_map<int, std::unordered_map<int, std::vector<std::unique_ptr<IEventHandlerWrapper>>>>::iterator subscriberList = subscribersByEventId.find(eventType);
+        if (subscriberList != subscribersByEventId.end()) {
+            std::unordered_map<int, std::vector<std::unique_ptr<IEventHandlerWrapper>>>& handlersMap = subscriberList->second;
             std::unordered_map<int, std::vector<std::unique_ptr<IEventHandlerWrapper>>>::iterator handlers = handlersMap.find(eventId);
             if (handlers != handlersMap.end()) {
                 std::vector<std::unique_ptr<IEventHandlerWrapper>>& callbacks = handlers->second;
@@ -55,8 +44,8 @@ void EventManager::unsubscribe(int eventType, const std::string& handlerName, in
             }
         }
     } else {
-        std::unordered_map<int, std::vector<std::unique_ptr<IEventHandlerWrapper>>>::iterator handlersIt = m_subscribers.find(eventType);
-        if (handlersIt != m_subscribers.end()) {
+        std::unordered_map<int, std::vector<std::unique_ptr<IEventHandlerWrapper>>>::iterator handlersIt = subscribers.find(eventType);
+        if (handlersIt != subscribers.end()) {
             std::vector<std::unique_ptr<IEventHandlerWrapper>>& handlers = handlersIt->second;
             for (std::vector<std::unique_ptr<IEventHandlerWrapper>>::iterator it = handlers.begin(); it != handlers.end(); ++it) {
                 if (it->get()->getType() == handlerName) {
@@ -70,38 +59,38 @@ void EventManager::unsubscribe(int eventType, const std::string& handlerName, in
 
 void EventManager::triggerEvent(const Event& event_, int eventId)
 {
-    std::vector<std::unique_ptr<IEventHandlerWrapper>>& handlers = m_subscribers[event_.getEventType()];
-    for (std::unique_ptr<IEventHandlerWrapper>& handler : handlers) {
-        handler->exec(event_);
-    }
-
-    std::unordered_map<int, std::vector<std::unique_ptr<IEventHandlerWrapper>>>& handlersMap = m_subscribersByEventId[event_.getEventType()];
-    std::unordered_map<int, std::vector<std::unique_ptr<IEventHandlerWrapper>>>::iterator handlersIt = handlersMap.find(eventId);
-    if (handlersIt != handlersMap.end()) {
-        std::vector<std::unique_ptr<IEventHandlerWrapper>>& callbacks = handlersIt->second;
-        for (std::vector<std::unique_ptr<IEventHandlerWrapper>>::iterator it = callbacks.begin(); it != callbacks.end();) {
-            std::unique_ptr<IEventHandlerWrapper>& handler = *it;
-            handler->exec(event_);
-            if (handler->isDestroyOnSuccess()) {
-                it = callbacks.erase(it);
-            } else {
-                ++it;
+    if (eventId > 0) {
+        auto handlersIt = subscribersByEventId[event_.getEventType()].find(eventId);
+        if (handlersIt != subscribersByEventId[event_.getEventType()].end()) {
+            std::vector<std::unique_ptr<IEventHandlerWrapper>>& callbacks = handlersIt->second;
+            for (auto it = callbacks.begin(); it != callbacks.end();) {
+                (*it)->exec(event_);
+                if ((*it)->isDestroyOnSuccess()) {
+                    it = callbacks.erase(it);
+                } else {
+                    ++it;
+                }
             }
         }
+    } else {
+        auto& handlers = subscribers[event_.getEventType()];
+        for (std::unique_ptr<IEventHandlerWrapper>& handler : handlers) {
+            handler->exec(event_);
+        }
     }
 }
 
 void EventManager::queueEvent(std::unique_ptr<Event>&& event_, int eventId)
 {
-    m_eventsQueue.emplace_back(std::move(event_), eventId);
+    eventsQueue.emplace_back(std::move(event_), eventId);
 }
 
 void EventManager::dispatchEvents()
 {
-    for (std::vector<std::pair<std::unique_ptr<Event>, int>>::iterator eventIt = m_eventsQueue.begin(); eventIt != m_eventsQueue.end();) {
+    for (std::vector<std::pair<std::unique_ptr<Event>, int>>::iterator eventIt = eventsQueue.begin(); eventIt != eventsQueue.end();) {
         if (!eventIt->first.get()->getHandled()) {
             triggerEvent(*eventIt->first.get(), eventIt->second);
-            eventIt = m_eventsQueue.erase(eventIt);
+            eventIt = eventsQueue.erase(eventIt);
         } else {
             ++eventIt;
         }