X-Git-Url: http://git.tdb.fi/?p=libs%2Fcore.git;a=blobdiff_plain;f=source%2Feventdispatcher.cpp;h=06a594f76d397165789940184f7c1a8d0ab65771;hp=2150fe23b7055fb0fd1e0d5eb3ae770d60c9b9dc;hb=b97d4e9f86e90254ab9edef7ee62a910f6333c78;hpb=8b29f7bad5fac36817424fedd2b6206df9d545c5

diff --git a/source/eventdispatcher.cpp b/source/eventdispatcher.cpp
index 2150fe2..06a594f 100644
--- a/source/eventdispatcher.cpp
+++ b/source/eventdispatcher.cpp
@@ -1,17 +1,8 @@
-/* $Id$
-
-This file is part of libmspio
-Copyright © 2007 Mikko Rasa, Mikkosoft Productions
-Distributed under the LGPL
-*/
 #include <msp/time/units.h>
 #include "base.h"
 #include "eventdispatcher.h"
 #include "poll.h"
 
-#include <iostream>
-using namespace std;
-
 namespace Msp {
 namespace IO {
 
@@ -20,13 +11,12 @@ EventDispatcher::EventDispatcher()
 
 void EventDispatcher::add(Base &obj)
 {
-	//cout<<"evdisp add "<<&obj<<'\n';
-	SlotMap::iterator i=objects.find(&obj);
+	SlotMap::iterator i = objects.find(&obj);
 	if(i==objects.end())
 	{
-		i=objects.insert(SlotMap::value_type(&obj, Slot(&obj))).first;
-		i->second.evch_conn=obj.signal_events_changed.connect(sigc::bind(sigc::mem_fun(this, &EventDispatcher::object_events_changed), &obj));
-		i->second.del_conn=obj.signal_deleted.connect(sigc::bind(sigc::mem_fun(this, &EventDispatcher::object_deleted), &obj));
+		i = objects.insert(SlotMap::value_type(&obj, Slot(&obj))).first;
+		i->second.evch_conn = obj.signal_events_changed.connect(sigc::bind(sigc::mem_fun(this, &EventDispatcher::object_events_changed), &obj));
+		i->second.del_conn = obj.signal_deleted.connect(sigc::bind(sigc::mem_fun(this, &EventDispatcher::object_deleted), &obj));
 
 		if(obj.get_events())
 			poller.set_object(obj, obj.get_events());
@@ -35,8 +25,7 @@ void EventDispatcher::add(Base &obj)
 
 void EventDispatcher::remove(Base &obj)
 {
-	//cout<<"evdisp remove "<<&obj<<'\n';
-	SlotMap::iterator i=objects.find(&obj);
+	SlotMap::iterator i = objects.find(&obj);
 	if(i!=objects.end())
 	{
 		i->second.evch_conn.disconnect();
@@ -77,7 +66,7 @@ void EventDispatcher::object_deleted(Base *obj)
 
 void EventDispatcher::dispatch()
 {
-	const Poller::SlotSeq &result=poller.get_result();
+	const Poller::SlotSeq &result = poller.get_result();
 	for(Poller::SlotSeq::const_iterator i=result.begin(); i!=result.end(); ++i)
 		i->object->event(i->events);
 }