X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Finput%2Fbindings.cpp;h=291c8f152584b552acbf7228053fcb1ed765ee6b;hb=3bb7bd5d99a71420b1dfa8d433f4f274bbe280fa;hp=d6317d8627bdbffe0e2f31447a8dd1668697b908;hpb=24da3e62cf22663ef16b61b9510fbac49308f756;p=libs%2Fgui.git

diff --git a/source/input/bindings.cpp b/source/input/bindings.cpp
index d6317d8..291c8f1 100644
--- a/source/input/bindings.cpp
+++ b/source/input/bindings.cpp
@@ -1,6 +1,6 @@
+#include "bindings.h"
 #include <algorithm>
 #include <msp/strings/format.h>
-#include "bindings.h"
 #include "controlscheme.h"
 
 using namespace std;
@@ -19,7 +19,7 @@ vector<Device *> Bindings::resolve_devices(Device &dev) const
 		else if(!d.name.empty())
 			resolved_devs.push_back(dev.find_subdevice(d.name));
 		else
-			resolved_devs.push_back(0);
+			resolved_devs.push_back(nullptr);
 	}
 	return resolved_devs;
 }
@@ -37,7 +37,7 @@ bool Bindings::apply_to(ControlScheme &control_scheme, Device &dev)
 	for(const Binding &b: bindings)
 	{
 		Control *ctrl = control_scheme.find(b.control);
-		Device *bdev = (b.device<resolved_devs.size() ? resolved_devs[b.device] : 0);
+		Device *bdev = (b.device<resolved_devs.size() ? resolved_devs[b.device] : nullptr);
 		if(ctrl && bdev)
 		{
 			ctrl->set_source(*bdev, b.type, b.index);