2 files changed, 13 insertions, 16 deletions
diff --git a/src/common/Utilities/EventProcessor.cpp b/src/common/Utilities/EventProcessor.cpp
index 0149f222da8..eda5c5ed5ac 100644
--- a/src/common/Utilities/EventProcessor.cpp
+++ b/src/common/Utilities/EventProcessor.cpp
@@ -111,29 +111,24 @@ void EventProcessor::KillAllEvents(bool force)
         m_events.clear();
 }
 
-void EventProcessor::AddEvent(BasicEvent* Event, uint64 e_time, bool set_addtime)
+void EventProcessor::AddEvent(BasicEvent* event, uint64 e_time, bool set_addtime)
 {
     if (set_addtime)
-        Event->m_addTime = m_time;
-    Event->m_execTime = e_time;
-    m_events.insert(std::pair<uint64, BasicEvent*>(e_time, Event));
+        event->m_addTime = m_time;
+    event->m_execTime = e_time;
+    m_events.insert(std::pair<uint64, BasicEvent*>(e_time, event));
 }
 
-void EventProcessor::ModifyEventTime(BasicEvent* Event, uint64 newTime)
+void EventProcessor::ModifyEventTime(BasicEvent* event, uint64 newTime)
 {
     for (auto itr = m_events.begin(); itr != m_events.end(); ++itr)
     {
-        if (itr->second != Event)
+        if (itr->second != event)
             continue;
 
-        Event->m_execTime = newTime;
+        event->m_execTime = newTime;
         m_events.erase(itr);
-        m_events.insert(std::pair<uint64, BasicEvent*>(newTime, Event));
+        m_events.insert(std::pair<uint64, BasicEvent*>(newTime, event));
         break;
     }
 }
-
-uint64 EventProcessor::CalculateTime(uint64 t_offset) const
-{
-    return(m_time + t_offset);
-}
diff --git a/src/common/Utilities/EventProcessor.h b/src/common/Utilities/EventProcessor.h
index 9a356b0e3f5..488d4a98649 100644
--- a/src/common/Utilities/EventProcessor.h
+++ b/src/common/Utilities/EventProcessor.h
@@ -20,6 +20,7 @@
 #define __EVENTPROCESSOR_H
 
 #include "Define.h"
+#include "Duration.h"
 #include <map>
 
 class EventProcessor;
@@ -76,9 +77,10 @@ class TC_COMMON_API EventProcessor
 
         void Update(uint32 p_time);
         void KillAllEvents(bool force);
-        void AddEvent(BasicEvent* Event, uint64 e_time, bool set_addtime = true);
-        void ModifyEventTime(BasicEvent* Event, uint64 newTime);
-        uint64 CalculateTime(uint64 t_offset) const;
+        void AddEvent(BasicEvent* event, uint64 e_time, bool set_addtime = true);
+        void AddEventAtOffset(BasicEvent* event, Milliseconds const& offset) { AddEvent(event, CalculateTime(offset.count())); }
+        void ModifyEventTime(BasicEvent* event, uint64 newTime);
+        uint64 CalculateTime(uint64 t_offset) const { return m_time + t_offset; }
 
     protected:
         uint64 m_time;