Changeset 5210 in orxonox.OLD for trunk/src/lib/event

Timestamp:

Sep 21, 2005, 12:01:25 AM (19 years ago)

Author:

bensch

Message:

orxonox/trunk: other minor valgrid found error-fixes

Location:

trunk/src/lib/event

Files:

• event_handler.cc (modified) (1 diff)
• event_handler.h (modified) (1 diff)

trunk/src/lib/event/event_handler.cc

@@ -36 +36 @@
   this->setClassID(CL_EVENT_HANDLER, "EventHandler");
 
-  this->listeners = new EventListener**[ES_NUMBER];
-  for(int i = 0; i < ES_NUMBER; ++i)
-    this->listeners[i] = new EventListener*[EV_NUMBER];
-
   /* now initialize them all to zero */
-  for(int i = 0; i < ES_NUMBER; ++i)
-    {
-      for(int j = 0; j < EV_NUMBER; ++j)
+  for(int i = 0; i < ES_NUMBER; i++)
+    {
+      for(int j = 0; j < EV_NUMBER; j++)
         {
           this->listeners[i][j] = NULL;

trunk/src/lib/event/event_handler.h

@@ -45 +45 @@
 
  private:
-  static EventHandler*       singletonRef;                  //!< the singleton reference
+  static EventHandler*       singletonRef;                    //!< the singleton reference
 
-  EventListener***           listeners;                     //!< a list of registered listeners
-  elState                    state;                         //!< the state of the event handlder
-  KeyMapper*                 keyMapper;                     //!< reference to the key mapper
+  EventListener*             listeners[ES_NUMBER][EV_NUMBER]; //!< a list of registered listeners
+  elState                    state;                           //!< the state of the event handlder
+  KeyMapper*                 keyMapper;                       //!< reference to the key mapper
 };