Changeset 2069 for code/branches/objecthierarchy/src/core/Event.h

Timestamp:

Oct 30, 2008, 11:58:31 PM (16 years ago)

Author:

landauf

Message:

fixed a bug in the event system
fixed a bug in Trigger and tweaked some features

File:

• code/branches/objecthierarchy/src/core/Event.h (modified) (2 diffs)

code/branches/objecthierarchy/src/core/Event.h

@@ -48 +48 @@
         public:
             EventContainer(const std::string& eventname, Executor* eventfunction, Identifier* subclass) : eventname_(eventname), eventfunction_(eventfunction), subclass_(subclass), activeEvents_(0) {}
-            ~EventContainer();
+            virtual ~EventContainer();
 
-            void process(BaseObject* object, const Event& event);
+            virtual void process(void* object, const Event& event);
 
         private:
@@ -59 +59 @@
             int activeEvents_;
     };
+
+    template <class T>
+    class ClassEventContainer : public EventContainer
+    {
+        public:
+            ClassEventContainer(const std::string& eventname, ExecutorMember<T>* eventfunction, Identifier* subclass) : EventContainer(eventname, (Executor*)eventfunction, subclass), eventfunction_(eventfunction) {}
+
+            void process(void* object, const Event& event)
+            {
+                this->eventfunction_->setObject((T*)object);
+                EventContainer::process(object, event);
+            }
+
+        private:
+            ExecutorMember<T>* eventfunction_;
+    };
 }