diff options
| author | Andrei Karas <akaras@inbox.ru> | 2014-07-17 13:07:38 +0300 |
|---|---|---|
| committer | Andrei Karas <akaras@inbox.ru> | 2014-07-17 15:40:27 +0300 |
| commit | 25ef222f6fa5d0c9c13a76b3e2149cfec3b13227 (patch) | |
| tree | e5a9f4c6578b15d90b4f1d79418b305b79f72917 /src | |
| parent | a7bfd014942781fecb21f2685eafa7fe40fe593b (diff) | |
| download | mv-25ef222f6fa5d0c9c13a76b3e2149cfec3b13227.tar.gz mv-25ef222f6fa5d0c9c13a76b3e2149cfec3b13227.tar.bz2 mv-25ef222f6fa5d0c9c13a76b3e2149cfec3b13227.tar.xz mv-25ef222f6fa5d0c9c13a76b3e2149cfec3b13227.zip | |
Rename keyboarddata into inputactionmap.
Diffstat (limited to 'src')
| -rw-r--r-- | src/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | src/Makefile.am | 2 | ||||
| -rw-r--r-- | src/input/inputactionmap.h (renamed from src/input/keyboarddata.h) | 0 | ||||
| -rw-r--r-- | src/input/inputmanager.cpp | 2 |
4 files changed, 3 insertions, 3 deletions
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index b9337b715..0360cca8e 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -805,6 +805,7 @@ SET(SRCS textcommand.cpp textcommand.h input/inputaction.h + input/inputactionmap.h input/inputcondition.h input/inputmanager.cpp input/inputmanager.h @@ -814,7 +815,6 @@ SET(SRCS input/joystick.h input/keyboardconfig.cpp input/keyboardconfig.h - input/keyboarddata.h input/keydata.h input/keyfunction.h input/keyinput.h diff --git a/src/Makefile.am b/src/Makefile.am index 8ce35047b..1c5e0d660 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -927,6 +927,7 @@ manaplus_SOURCES += gui/widgets/avatarlistbox.cpp \ textcommand.h \ events/inputevent.h \ input/inputaction.h \ + input/inputactionmap.h \ input/inputcondition.h \ input/inputmanager.cpp \ input/inputmanager.h \ @@ -935,7 +936,6 @@ manaplus_SOURCES += gui/widgets/avatarlistbox.cpp \ input/joystick.h \ input/keyboardconfig.cpp \ input/keyboardconfig.h \ - input/keyboarddata.h \ input/keydata.h \ input/keyfunction.h \ input/keyinput.h \ 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 |