diff options
| author | Andrei Karas <akaras@inbox.ru> | 2015-12-29 01:06:52 +0300 |
|---|---|---|
| committer | Andrei Karas <akaras@inbox.ru> | 2015-12-29 01:06:52 +0300 |
| commit | c1e8335738200b3c217956e897eba8f6faaf6f41 (patch) | |
| tree | 178d008e4f30e3a96d4789f6dc8f84dc76280718 | |
| parent | 06073647cf4efbbe9a423d841daea6f462ecddf8 (diff) | |
| download | manaplus-c1e8335738200b3c217956e897eba8f6faaf6f41.tar.gz manaplus-c1e8335738200b3c217956e897eba8f6faaf6f41.tar.bz2 manaplus-c1e8335738200b3c217956e897eba8f6faaf6f41.tar.xz manaplus-c1e8335738200b3c217956e897eba8f6faaf6f41.zip | |
Move multitouchmanager into touch directory.
| -rw-r--r-- | src/CMakeLists.txt | 4 | ||||
| -rw-r--r-- | src/Makefile.am | 4 | ||||
| -rw-r--r-- | src/input/inputmanager.cpp | 2 | ||||
| -rw-r--r-- | src/input/touch/multitouchmanager.cpp (renamed from src/input/multitouchmanager.cpp) | 2 | ||||
| -rw-r--r-- | src/input/touch/multitouchmanager.h (renamed from src/input/multitouchmanager.h) | 6 |
5 files changed, 9 insertions, 9 deletions
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 29a7eb0c4..33a7e139b 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -980,8 +980,8 @@ SET(SRCS input/keyboardconfig.cpp input/keyboardconfig.h input/keyinput.h - input/multitouchmanager.cpp - input/multitouchmanager.h + input/touch/multitouchmanager.cpp + input/touch/multitouchmanager.h localconsts.h being/localplayer.cpp being/localplayer.h diff --git a/src/Makefile.am b/src/Makefile.am index 7aba6e9a2..72579252d 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -511,8 +511,8 @@ SRC += events/actionevent.h \ input/keyboardconfig.cpp \ input/keyboardconfig.h \ input/keyinput.h \ - input/multitouchmanager.cpp \ - input/multitouchmanager.h \ + input/touch/multitouchmanager.cpp \ + input/touch/multitouchmanager.h \ localconsts.h \ logger.cpp \ logger.h \ diff --git a/src/input/inputmanager.cpp b/src/input/inputmanager.cpp index f06fa1a5b..4ba87b92e 100644 --- a/src/input/inputmanager.cpp +++ b/src/input/inputmanager.cpp @@ -32,7 +32,7 @@ #include "input/joystick.h" #include "input/keyboardconfig.h" #ifdef USE_SDL2 -#include "input/multitouchmanager.h" +#include "input/touch/multitouchmanager.h" #endif #include "input/touch/touchmanager.h" diff --git a/src/input/multitouchmanager.cpp b/src/input/touch/multitouchmanager.cpp index 1fd6d4012..8cdd3fa2b 100644 --- a/src/input/multitouchmanager.cpp +++ b/src/input/touch/multitouchmanager.cpp @@ -18,7 +18,7 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ -#include "input/multitouchmanager.h" +#include "input/touch/multitouchmanager.h" #ifdef USE_SDL2 #include "render/graphics.h" diff --git a/src/input/multitouchmanager.h b/src/input/touch/multitouchmanager.h index e93a919eb..b68b746aa 100644 --- a/src/input/multitouchmanager.h +++ b/src/input/touch/multitouchmanager.h @@ -18,8 +18,8 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ -#ifndef INPUT_MULTITOUCHMANAGER_H -#define INPUT_MULTITOUCHMANAGER_H +#ifndef INPUT_TOUCH_MULTITOUCHMANAGER_H +#define INPUT_TOUCH_MULTITOUCHMANAGER_H #include <map> @@ -67,5 +67,5 @@ class MultiTouchManager final extern MultiTouchManager multiTouchManager; -#endif // INPUT_MULTITOUCHMANAGER_H +#endif // INPUT_TOUCH_MULTITOUCHMANAGER_H |