summaryrefslogtreecommitdiff
path: root/src/input
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2014-07-17 13:07:38 +0300
committerAndrei Karas <akaras@inbox.ru>2014-07-17 15:40:27 +0300
commit25ef222f6fa5d0c9c13a76b3e2149cfec3b13227 (patch)
treee5a9f4c6578b15d90b4f1d79418b305b79f72917 /src/input
parenta7bfd014942781fecb21f2685eafa7fe40fe593b (diff)
downloadmv-25ef222f6fa5d0c9c13a76b3e2149cfec3b13227.tar.gz
mv-25ef222f6fa5d0c9c13a76b3e2149cfec3b13227.tar.bz2
mv-25ef222f6fa5d0c9c13a76b3e2149cfec3b13227.tar.xz
mv-25ef222f6fa5d0c9c13a76b3e2149cfec3b13227.zip
Rename keyboarddata into inputactionmap.
Diffstat (limited to 'src/input')
-rw-r--r--src/input/inputactionmap.h (renamed from src/input/keyboarddata.h)0
-rw-r--r--src/input/inputmanager.cpp2
2 files changed, 1 insertions, 1 deletions
diff --git a/src/input/keyboarddata.h b/src/input/inputactionmap.h
index fb810a683..fb810a683 100644
--- a/src/input/keyboarddata.h
+++ b/src/input/inputactionmap.h
diff --git a/src/input/inputmanager.cpp b/src/input/inputmanager.cpp
index c6e2b7091..8b3539042 100644
--- a/src/input/inputmanager.cpp
+++ b/src/input/inputmanager.cpp
@@ -24,9 +24,9 @@
#include "game.h"
#include "touchmanager.h"
+#include "input/inputactionmap.h"
#include "input/joystick.h"
#include "input/keyboardconfig.h"
-#include "input/keyboarddata.h"
#include "input/keysortfunctor.h"
#include "being/localplayer.h"
#ifdef USE_SDL2