X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Finput%2Fhub.cpp;h=1916126c9ff3f3be420de975bb3b93ea03ad9f55;hb=11ab96ba152e389814543a6398e2cd6f17a31092;hp=532512267a10f7ce4041921f49d12d76e058fad3;hpb=30cab36b531f6efddca07c3fe9a6b1b81ca42bde;p=libs%2Fgui.git

diff --git a/source/input/hub.cpp b/source/input/hub.cpp
index 5325122..1916126 100644
--- a/source/input/hub.cpp
+++ b/source/input/hub.cpp
@@ -34,7 +34,7 @@ Device *Hub::find_subdevice(DeviceType t, unsigned n)
 				return dev;
 			--n;
 		}
-	return 0;
+	return nullptr;
 }
 
 Device *Hub::find_subdevice(const string &n)
@@ -44,10 +44,10 @@ Device *Hub::find_subdevice(const string &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())