X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Finput%2Fdevice.cpp;h=228313616c62a92b0bb75d0c370f224944c4b883;hb=da43cbcdf8fd6cbfe3c24c48247854832f8b3930;hp=8bca47671d0079127af2be446089ed0498574c25;hpb=c9626e6953c16efc66575eff80c4c0de2f739041;p=libs%2Fgui.git

diff --git a/source/input/device.cpp b/source/input/device.cpp
index 8bca476..2283136 100644
--- a/source/input/device.cpp
+++ b/source/input/device.cpp
@@ -1,12 +1,18 @@
-#include <msp/strings/formatter.h>
+#include <msp/strings/format.h>
 #include "device.h"
 
 namespace Msp {
 namespace Input {
 
+Device::Device()
+{ }
+
+Device::~Device()
+{ }
+
 bool Device::get_button_state(unsigned btn) const
 {
-	if(btn>buttons.size())
+	if(btn>=buttons.size())
 		return false;
 
 	return buttons[btn];
@@ -14,7 +20,7 @@ bool Device::get_button_state(unsigned btn) const
 
 float Device::get_axis_value(unsigned axis) const
 {
-	if(axis>axes.size())
+	if(axis>=axes.size())
 		return 0;
 
 	return axes[axis];
@@ -37,7 +43,7 @@ void Device::set_button_state(unsigned btn, bool state, bool event)
 
 	if(state!=buttons[btn])
 	{
-		buttons[btn]=state;
+		buttons[btn] = state;
 
 		if(event)
 		{
@@ -56,8 +62,8 @@ void Device::set_axis_value(unsigned axis, float value, bool event)
 
 	if(value!=axes[axis])
 	{
-		float old=axes[axis];
-		axes[axis]=value;
+		float old = axes[axis];
+		axes[axis] = value;
 
 		if(event)
 			signal_axis_motion.emit(axis, value, value-old);