Merge branch 'master' of newgeom:newgeom.git

[modules/shaper.git] / src / Event / Event_Loop.cxx

diff --git a/src/Event/Event_Loop.cxx b/src/Event/Event_Loop.cxx
index 558edd0da5320f6d508ddefe02eb94413c05a04f..c5cadce448a9c687508757504dc231ddf97d90ab 100644 (file)
--- a/src/Event/Event_Loop.cxx
+++ b/src/Event/Event_Loop.cxx
@@ -2,19 +2,19 @@
 // Created:    Thu Mar 13 2014
 // Author:     Mikhail PONIKAROV
 
-#include <Event_Loop.hxx>
+#include <Event_Loop.h>
 #include <string>
 
 using namespace std;
 
-Event_Loop* Event_Loop::Loop()
+Event_Loop* Event_Loop::loop()
 {
   // initialized on initialization of the application
   static Event_Loop MAIN_LOOP;
   return &MAIN_LOOP;
 }
 
-Event_ID Event_Loop::EventByName(const char* theName)
+Event_ID Event_Loop::eventByName(const char* theName)
 {
   ///! All events created in this session, uniquely identified by the text and char pointer
   static map<string, char*> CREATED_EVENTS;
@@ -30,39 +30,39 @@ Event_ID Event_Loop::EventByName(const char* theName)
   return Event_ID(aResult);
 }
 
-void Event_Loop::Send(Event_Message& theMessage)
+void Event_Loop::send(Event_Message& theMessage)
 {
   // TO DO: make it in thread and wit husage of semaphores
 
   map<char*, map<void*, list<Event_Listener*> > >::iterator aFindID = myListeners.find(
-      theMessage.EventID().EventText());
+      theMessage.eventID().eventText());
   if (aFindID != myListeners.end()) {
     map<void*, list<Event_Listener*> >::iterator aFindSender = aFindID->second.find(
-        theMessage.Sender());
+        theMessage.sender());
     if (aFindSender != aFindID->second.end()) {
       list<Event_Listener*>& aListeners = aFindSender->second;
       for(list<Event_Listener*>::iterator aL = aListeners.begin(); aL != aListeners.end(); aL++)
-        (*aL)->ProcessEvent(&theMessage);
+        (*aL)->processEvent(&theMessage);
     }
-    if (theMessage.Sender()) { // also call for NULL senders registered
+    if (theMessage.sender()) { // also call for NULL senders registered
       aFindSender = aFindID->second.find(NULL);
       if (aFindSender != aFindID->second.end()) {
         list<Event_Listener*>& aListeners = aFindSender->second;
         for(list<Event_Listener*>::iterator aL = aListeners.begin(); aL != aListeners.end(); aL++)
-          (*aL)->ProcessEvent(&theMessage);
+          (*aL)->processEvent(&theMessage);
       }
     }
   }
 }
 
-void Event_Loop::RegisterListener(Event_Listener* theListener, const Event_ID theID,
+void Event_Loop::registerListener(Event_Listener* theListener, const Event_ID theID,
                                   void* theSender)
 {
   map<char*, map<void*, list<Event_Listener*> > >::iterator aFindID = myListeners.find(
-      theID.EventText());
+      theID.eventText());
   if (aFindID == myListeners.end()) { // create container associated with ID
-    myListeners[theID.EventText()] = map<void*, list<Event_Listener*> >();
-    aFindID = myListeners.find(theID.EventText());
+    myListeners[theID.eventText()] = map<void*, list<Event_Listener*> >();
+    aFindID = myListeners.find(theID.eventText());
   }
 
   map<void*, list<Event_Listener*> >::iterator aFindSender = aFindID->second.find(theSender);