some cleanup in modules, fixes in tooltip, uiwidget warnings, disable map saving for a while

This commit is contained in:
Eduardo Bart
2012-02-05 20:42:35 -02:00
parent 0471785d30
commit a55e138002
27 changed files with 180 additions and 114 deletions

View File

@@ -45,8 +45,8 @@ void EventDispatcher::poll()
scheduledEvent->execute();
}
int maxEvents = m_eventList.size();
for(int i=0;i<maxEvents;++i) {
m_pollEventsSize = m_eventList.size();
for(int i=0;i<m_pollEventsSize;++i) {
EventPtr event = m_eventList.front();
m_eventList.pop_front();
event->execute();
@@ -64,9 +64,10 @@ ScheduledEventPtr EventDispatcher::scheduleEvent(const SimpleCallback& callback,
EventPtr EventDispatcher::addEvent(const SimpleCallback& callback, bool pushFront)
{
EventPtr event(new Event(callback));
if(pushFront)
if(pushFront) {
m_eventList.push_front(event);
else
m_pollEventsSize++;
} else
m_eventList.push_back(event);
return event;
}

View File

@@ -80,6 +80,7 @@ public:
private:
std::list<EventPtr> m_eventList;
int m_pollEventsSize;
std::priority_queue<ScheduledEventPtr, std::vector<ScheduledEventPtr>, lessScheduledEvent> m_scheduledEventList;
};