X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Finput%2Fhub.cpp;h=1916126c9ff3f3be420de975bb3b93ea03ad9f55;hb=479298192e3e5b71a402f79520c90372a4c4b504;hp=e45cd6576b3bd02b890f2ab96606fc125fee63dc;hpb=3b0d63f09b6bfc5de215e27eef8a5934eb4d3851;p=libs%2Fgui.git

diff --git a/source/input/hub.cpp b/source/input/hub.cpp
index e45cd65..1916126 100644
--- a/source/input/hub.cpp
+++ b/source/input/hub.cpp
@@ -1,9 +1,9 @@
+#include "hub.h"
 #include <stdexcept>
 #include <sigc++/bind.h>
 #include <sigc++/bind_return.h>
 #include <msp/core/hash.h>
 #include <msp/core/maputils.h>
-#include "hub.h"
 
 using namespace std;
 
@@ -27,27 +27,27 @@ 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;
 			--n;
 		}
-	return 0;
+	return nullptr;
 }
 
 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;
+	return nullptr;
 }
 
-std::string Hub::get_button_name(unsigned btn) const
+string Hub::get_button_name(unsigned btn) const
 {
 	unsigned dev_index = btn>>8;
 	if(dev_index>=devices.size())
@@ -57,7 +57,7 @@ std::string Hub::get_button_name(unsigned btn) const
 	return dev.get_name()+": "+dev.get_button_name(btn&0xFF);
 }
 
-std::string Hub::get_axis_name(unsigned axis) const
+string Hub::get_axis_name(unsigned axis) const
 {
 	unsigned dev_index = axis>>8;
 	if(dev_index>=devices.size())