diff --git a/core/controller/EventList.cc b/core/controller/EventList.cc index 4b69c018..2ec46447 100644 --- a/core/controller/EventList.cc +++ b/core/controller/EventList.cc @@ -96,18 +96,6 @@ BaseEvent* EventList::getEventFromId(EventId id) return (NULL); // Nothing found. } -void EventList::makeActive(BaseEvent* ev) -{ - assert(ev && "FATAL ERROR: Event object pointer cannot be NULL!"); - ev->decreaseCounter(); - if (ev->getCounter() > 0) { - return; - } - ev->resetCounter(); - if(remove(ev)) // remove event from buffer-list - m_FireList.push_back(ev); -} - EventList::iterator EventList::makeActive(iterator it) { assert(it != m_BufferList.end() && diff --git a/core/controller/EventList.hpp b/core/controller/EventList.hpp index cc5bc45c..ba70031e 100644 --- a/core/controller/EventList.hpp +++ b/core/controller/EventList.hpp @@ -163,16 +163,9 @@ class EventList */ ExperimentFlow* getExperimentOf(BaseEvent* pEv); /** - * Moves the events from the (internal) buffer-list to the fire-list. To - * actually fire the events activated by calling makeActive(), call - * fireActiveEvents(). - * @param ev the event to trigger - * TODO: besserer Name statt "makeActive"? - */ - void makeActive(BaseEvent* ev); - /** - * Behaves like makeActive(BaseEvent) and additionally returns an - * updated iterator which points to the next BaseEvent-element. + * Moves the events from the (internal) buffer-list to the fire-list. + * To actually fire the events, call fireActiveEvents(). + * Returns an updated iterator which points to the next element. * @param ev the event to trigger * @return returns the updated iteration, pointing to the next element * after makeActive returns, "it" is invalid, so the returned