priv->pfd.clear();
priv->pfd.reserve(objects.size());
- for(vector<Slot>::const_iterator i=objects.begin(); i!=objects.end(); ++i)
+ for(const PolledObject &po: objects)
{
pollfd p;
- p.fd = *i->object->get_event_handle();
- p.events = sys_poll_event(i->events);
+ p.fd = *po.object->get_event_handle();
+ p.events = sys_poll_event(po.events);
priv->pfd.push_back(p);
}
}
for(unsigned i=0; (i<objects.size() && ret>0); ++i)
if(priv->pfd[i].revents)
{
- poll_result.push_back(Slot(objects[i].object, poll_event_from_sys(priv->pfd[i].revents)));
+ poll_result.push_back({ objects[i].object, poll_event_from_sys(priv->pfd[i].revents) });
--ret;
}
}