diff options
Diffstat (limited to 'mwe')
| -rw-r--r-- | mwe/events/include/event.h | 3 | ||||
| -rw-r--r-- | mwe/events/include/eventManager.h | 11 |
2 files changed, 0 insertions, 14 deletions
diff --git a/mwe/events/include/event.h b/mwe/events/include/event.h index b1d9cb9..0208085 100644 --- a/mwe/events/include/event.h +++ b/mwe/events/include/event.h @@ -5,11 +5,8 @@ #include <string> #include <unordered_map> #include <variant> -<<<<<<< HEAD #include "keyCodes.h" #include "customTypes.h" -======= ->>>>>>> b3b762a34e7ccb4a0dcd041a693ac7180af16002 class UUIDGenerator { public: diff --git a/mwe/events/include/eventManager.h b/mwe/events/include/eventManager.h index 91bac8c..61e8c01 100644 --- a/mwe/events/include/eventManager.h +++ b/mwe/events/include/eventManager.h @@ -28,21 +28,10 @@ public: void dispatchEvents(); private: -<<<<<<< HEAD EventManager() = default; std::vector<std::pair<std::unique_ptr<Event>, int>> eventsQueue; std::unordered_map<int, std::vector<std::unique_ptr<IEventHandlerWrapper>>> subscribers; std::unordered_map<int, std::unordered_map<int, std::vector<std::unique_ptr<IEventHandlerWrapper>>>> subscribersByEventId; -======= - EventManager() = default; - std::vector<std::pair<std::unique_ptr<Event>, int>> m_eventsQueue; - std::unordered_map<int, std::vector<std::unique_ptr<IEventHandlerWrapper>>> - m_subscribers; - std::unordered_map< - int, std::unordered_map< - int, std::vector<std::unique_ptr<IEventHandlerWrapper>>>> - m_subscribersByEventId; ->>>>>>> b3b762a34e7ccb4a0dcd041a693ac7180af16002 }; template <typename EventType> |