summaryrefslogtreecommitdiff
path: root/src/input
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2015-11-20 21:42:31 +0300
committerAndrei Karas <akaras@inbox.ru>2015-11-20 21:53:56 +0300
commitf3511bcf5aac7a46958f9cdf1649be976679d257 (patch)
tree4f8557315cc9ffdc2347ef8a09c6ea9890f7bb2f /src/input
parenta4dc0e9c2b9aff1f2d6f131f263f809ee254443b (diff)
downloadmanaverse-f3511bcf5aac7a46958f9cdf1649be976679d257.tar.gz
manaverse-f3511bcf5aac7a46958f9cdf1649be976679d257.tar.bz2
manaverse-f3511bcf5aac7a46958f9cdf1649be976679d257.tar.xz
manaverse-f3511bcf5aac7a46958f9cdf1649be976679d257.zip
Fix code style.
Diffstat (limited to 'src/input')
-rw-r--r--src/input/inputactionmap.h2
-rw-r--r--src/input/inputmanager.cpp2
-rw-r--r--src/input/inputmanager.h2
-rw-r--r--src/input/joystick.cpp2
-rw-r--r--src/input/keyboardconfig.cpp2
5 files changed, 2 insertions, 8 deletions
diff --git a/src/input/inputactionmap.h b/src/input/inputactionmap.h
index 3496732aa..7beafa6c3 100644
--- a/src/input/inputactionmap.h
+++ b/src/input/inputactionmap.h
@@ -35,8 +35,6 @@
#include "actions/target.h"
#include "actions/windows.h"
-#include "enums/input/inputtype.h"
-
#include "input/inputactiondata.h"
#include "input/inputcondition.h"
#include "input/inputmanager.h"
diff --git a/src/input/inputmanager.cpp b/src/input/inputmanager.cpp
index 5efc05f2f..94cac4b05 100644
--- a/src/input/inputmanager.cpp
+++ b/src/input/inputmanager.cpp
@@ -203,6 +203,8 @@ void InputManager::store() const
case InputType::JOYSTICK:
tmp = "j";
break;
+ case InputType::KEYBOARD:
+ case InputType::UNKNOWN:
default:
break;
}
diff --git a/src/input/inputmanager.h b/src/input/inputmanager.h
index 3fecd3c38..b32c0f37e 100644
--- a/src/input/inputmanager.h
+++ b/src/input/inputmanager.h
@@ -23,8 +23,6 @@
#include "input/inputfunction.h"
-#include "enums/input/inputtype.h"
-
#include "events/inputevent.h"
#include "utils/stringmap.h"
diff --git a/src/input/joystick.cpp b/src/input/joystick.cpp
index f1c0660f2..19ded2815 100644
--- a/src/input/joystick.cpp
+++ b/src/input/joystick.cpp
@@ -27,8 +27,6 @@
#include "settings.h"
#include "sdlshared.h"
-#include "enums/input/inputtype.h"
-
#include "input/inputmanager.h"
#include "utils/timer.h"
diff --git a/src/input/keyboardconfig.cpp b/src/input/keyboardconfig.cpp
index d2497e175..eadbbb624 100644
--- a/src/input/keyboardconfig.cpp
+++ b/src/input/keyboardconfig.cpp
@@ -24,8 +24,6 @@
#include "configuration.h"
-#include "enums/input/inputtype.h"
-
#include "input/inputmanager.h"
#include "utils/gettext.h"