Changeset 5866 for code/branches/core5/src/modules

Timestamp:

Oct 3, 2009, 6:32:05 PM (15 years ago)

Author:

landauf

Message:

some cleanup in the eventsystem. not sure if everything still works, but there are more changes to come.

Location:

code/branches/core5/src/modules/objects/eventsystem

Files:

• EventListener.cc (modified) (2 diffs)
• EventListener.h (modified) (1 diff)
• EventTarget.cc (modified) (2 diffs)
• EventTarget.h (modified) (1 diff)

code/branches/core5/src/modules/objects/eventsystem/EventListener.cc

@@ -78 +78 @@
         for (ObjectList<BaseObject>::iterator it = ObjectList<BaseObject>::begin(); it != ObjectList<BaseObject>::end(); ++it)
             if (it->getName() == this->eventName_)
-                this->registerAsListener(*it);
+                this->addEventSource(*it, "");
     }
 
@@ -87 +87 @@
 
         if (object->getName() == this->eventName_)
-            this->registerAsListener(object);
-    }
-
-    void EventListener::registerAsListener(BaseObject* object)
-    {
-        object->registerEventListener(this, "");
+            this->addEventSource(object, "");
     }
 }

code/branches/core5/src/modules/objects/eventsystem/EventListener.h

@@ -54 +54 @@
         private:
             virtual void loadedNewXMLName(BaseObject* object);
-            void registerAsListener(BaseObject* object);
 
             std::string eventName_;

code/branches/core5/src/modules/objects/eventsystem/EventTarget.cc

@@ -49 +49 @@
         for (ObjectList<BaseObject>::iterator it = ObjectList<BaseObject>::begin(); it != ObjectList<BaseObject>::end(); ++it)
             if (it->getName() == this->getName())
-                this->addAsEvent(*it);
+                this->addEventTarget(*it);
     }
 
@@ -58 +58 @@
 
         if (object->getName() == this->getName())
-            this->addAsEvent(object);
+            this->addEventTarget(object);
     }
 
-    void EventTarget::addAsEvent(BaseObject* object)
+    void EventTarget::addEventTarget(BaseObject* object)
     {
         if (object != static_cast<BaseObject*>(this))
-            object->addEvent(this, "");
+            object->addEventSource(this, "");
     }
 }

code/branches/core5/src/modules/objects/eventsystem/EventTarget.h

@@ -47 +47 @@
         private:
             virtual void loadedNewXMLName(BaseObject* object);
-            void addAsEvent(BaseObject* object);
+            void addEventTarget(BaseObject* object);
     };
 }