From 643299c26ea8fb0b185469c0b71b4d154d49f4f4 Mon Sep 17 00:00:00 2001
From: hsc <hsc@8c4709b5-6ec9-48aa-a5cd-a96041d1645a>
Date: Tue, 3 Apr 2012 14:05:26 +0000
Subject: [PATCH] removing redundant EventList::makeActive(event)
This method has no users, and I'm preparing for modifying a dependency's
signature.
git-svn-id: https://www4.informatik.uni-erlangen.de/i4svn/danceos/trunk/devel/fail@1023 8c4709b5-6ec9-48aa-a5cd-a96041d1645a
---
core/controller/EventList.cc | 12 ------------
core/controller/EventList.hpp | 13 +++----------
2 files changed, 3 insertions(+), 22 deletions(-)
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
--
GitLab