Streamline iterators and loop constructs

[libs/gui.git] / source / input / hub.cpp

diff --git a/source/input/hub.cpp b/source/input/hub.cpp
index e45cd6576b3bd02b890f2ab96606fc125fee63dc..79b42aaaf65c87294401b397889ed63f581d1a52 100644 (file)
--- a/source/input/hub.cpp
+++ b/source/input/hub.cpp
@@ -27,8 +27,8 @@ void Hub::attach(Device &dev)
 
 Device *Hub::find_subdevice(DeviceType t, unsigned n)
 {
-       for(vector<Device *>::const_iterator i=devices.begin(); i!=devices.end(); ++i)
-               if(Device *dev = (*i)->find_subdevice(t, 0))
+       for(Device *d: devices)
+               if(Device *dev = d->find_subdevice(t, 0))
                {
                        if(!n)
                                return dev;
@@ -41,8 +41,8 @@ Device *Hub::find_subdevice(const string &n)
 {
        if(n==name)
                return this;
-       for(vector<Device *>::const_iterator i=devices.begin(); i!=devices.end(); ++i)
-               if(Device *dev = (*i)->find_subdevice(n))
+       for(Device *d: devices)
+               if(Device *dev = d->find_subdevice(n))
                        return dev;
        return 0;
 }