jeena/telldus
1
0
Fork 0
Code Issues Pull requests Projects Packages Wiki Activity Actions

By having smartpointers, the function EventHandler::removeEvent() is obsolete

Browse source
This commit is contained in:
Micke Prag 2010-10-28 09:17:42 +00:00
parent 41c763cbd4
commit 93fa34545d
4 changed files with 2 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

3
telldus-core/service/Event.cpp
View file

@ -28,9 +28,6 @@ EventBase::EventBase(EventHandler *handler) {
}
EventBase::~EventBase(void) {
if (d->handler) {
d->handler->removeEvent(this);
}
delete d;
}

1
telldus-core/service/EventHandler.h
View file

@ -9,7 +9,6 @@ public:
virtual ~EventHandler(void);
EventRef addEvent();
bool removeEvent(EventBase *event);
bool waitForAny();

12
telldus-core/service/EventHandler_unix.cpp
View file

@ -26,6 +26,7 @@ EventHandler::~EventHandler(void) {
std::list<EventRef>::const_iterator it = d->eventList.begin();
for(; it != d->eventList.end(); ++it) {
//We clear the handler if someone else still has a reference to the event
(*it)->clearHandler();
}
@ -51,17 +52,6 @@ bool EventHandler::listIsSignalled(){
return false;
}
bool EventHandler::removeEvent(EventBase *eventBase) {
Event *event = reinterpret_cast<Event *>(eventBase);
if (!event) {
return false;
}
TelldusCore::MutexLocker locker(&d->listMutex);
//TODO!
//d->eventList.remove(event);
return true;
}
void EventHandler::signal(Event *event) {
pthread_mutex_lock(&d->mutex);
//event->setSignaled();

2
telldus-core/service/TelldusMain.cpp
View file

@ -88,7 +88,7 @@ void TelldusMain::start(void) {
}
}
if(handlerEvent->isSignaled()){
if (handlerEvent->isSignaled()) {
handlerEvent->popSignal();
for ( std::list<ClientCommunicationHandler *>::iterator it = clientCommunicationHandlerList.begin(); it != clientCommunicationHandlerList.end(); ){
if ((*it)->isDone()){