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

Timestamp:

Jul 24, 2006, 11:09:47 AM (18 years ago)

Author:

bensch

Message:

orxonox/trunk: merged the proxy back

merged with commandsvn merge -r9346:HEAD ​https://svn.orxonox.net/orxonox/branches/proxy .

no conflicts

Location:

trunk/src/lib/event

Files:

• event_handler.cc (modified) (4 diffs)
• key_mapper.cc (modified) (1 diff)

trunk/src/lib/event/event_handler.cc

@@ -207 +207 @@
       else
       {
-        PRINTF(2)("%s::%s was already subscribed to state %d event %d\n", el->getClassName(), el->getName(), i, eventType);
+        PRINTF(2)("%s::%s was already subscribed to state %d event %d\n", el->getClassCName(), el->getCName(), i, eventType);
       }
   }
@@ -216 +216 @@
     else
     {
-      PRINTF(2)("%s::%s was already subscribed to state %d event %d\n", el->getClassName(), el->getName(), state, eventType);
+      PRINTF(2)("%s::%s was already subscribed to state %d event %d\n", el->getClassCName(), el->getCName(), state, eventType);
     }
   }
@@ -463 +463 @@
   {
     PRINT(4)("=  Event dispatcher msg: This event has been consumed\n");
-    PRINT(4)("=  Got Event nr %i, for state %i (%d registered) to %s::%s(%p)\n", event.type, i, state, this->listeners[state][event.type][i]->getClassName(), this->listeners[state][event.type][i]->getName(), this->listeners[state][event.type][i]);
+    PRINT(4)("=  Got Event nr %i, for state %i (%d registered) to %s::%s(%p)\n",
+      event.type,
+      i, state,
+      this->listeners[state][event.type][i]->getClassCName(),
+      this->listeners[state][event.type][i]->getCName(),
+      this->listeners[state][event.type][i]);
     PRINT(4)("=======================================================\n");
     this->listeners[state][event.type][i]->process(event);
@@ -563 +568 @@
         EVToKeyName(j).c_str(), j,
         ELStateToString((elState)i).c_str(), i,
-        this->listeners[i][j][evl]->getName(), this->listeners[i][j][evl]);
+        this->listeners[i][j][evl]->getCName(), this->listeners[i][j][evl]);
   }
   PRINT(0)("============================EH=\n");

trunk/src/lib/event/key_mapper.cc

@@ -31 +31 @@
 
 
-using namespace std;
+