summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2015-12-29 01:02:59 +0300
committerAndrei Karas <akaras@inbox.ru>2015-12-29 01:02:59 +0300
commit06073647cf4efbbe9a423d841daea6f462ecddf8 (patch)
tree3a193ee24b745e9db69061a5bbf0f30fe199c0d5
parent38e782f30d15a0fceabf863e40ffe66124cef8a8 (diff)
downloadplus-06073647cf4efbbe9a423d841daea6f462ecddf8.tar.gz
plus-06073647cf4efbbe9a423d841daea6f462ecddf8.tar.bz2
plus-06073647cf4efbbe9a423d841daea6f462ecddf8.tar.xz
plus-06073647cf4efbbe9a423d841daea6f462ecddf8.zip
Move touchactions into touch directory.
-rw-r--r--src/CMakeLists.txt4
-rw-r--r--src/Makefile.am4
-rw-r--r--src/input/touch/touchactions.cpp (renamed from src/touchactions.cpp)2
-rw-r--r--src/input/touch/touchactions.h (renamed from src/touchactions.h)6
-rw-r--r--src/input/touch/touchmanager.cpp3
5 files changed, 10 insertions, 9 deletions
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 4ea2407af..29a7eb0c4 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -1193,8 +1193,8 @@ SET(SRCS
particle/textparticle.h
resources/map/tileinfo.h
resources/map/tileset.h
- touchactions.cpp
- touchactions.h
+ input/touch/touchactions.cpp
+ input/touch/touchactions.h
input/touch/touchmanager.cpp
input/touch/touchmanager.h
units.cpp
diff --git a/src/Makefile.am b/src/Makefile.am
index 51322dbf2..7aba6e9a2 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -652,8 +652,8 @@ SRC += events/actionevent.h \
text.h \
textmanager.cpp \
textmanager.h \
- touchactions.cpp \
- touchactions.h \
+ input/touch/touchactions.cpp \
+ input/touch/touchactions.h \
input/touch/touchmanager.cpp \
input/touch/touchmanager.h \
variabledata.h \
diff --git a/src/touchactions.cpp b/src/input/touch/touchactions.cpp
index 3d3d38408..57b714585 100644
--- a/src/touchactions.cpp
+++ b/src/input/touch/touchactions.cpp
@@ -18,7 +18,7 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-#include "touchactions.h"
+#include "input/touch/touchactions.h"
#include "input/inputmanager.h"
#include "input/mouseinput.h"
diff --git a/src/touchactions.h b/src/input/touch/touchactions.h
index 040aadf88..216de1741 100644
--- a/src/touchactions.h
+++ b/src/input/touch/touchactions.h
@@ -18,8 +18,8 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-#ifndef TOUCHACTIONS_H
-#define TOUCHACTIONS_H
+#ifndef INPUT_TOUCH_TOUCHACTIONS_H
+#define INPUT_TOUCH_TOUCHACTIONS_H
#include "localconsts.h"
@@ -36,4 +36,4 @@ void setHalfJoyPad(const int s);
#undef decHandler
-#endif // TOUCHACTIONS_H
+#endif // INPUT_TOUCH_TOUCHACTIONS_H
diff --git a/src/input/touch/touchmanager.cpp b/src/input/touch/touchmanager.cpp
index 3107b62c8..ec00c72a7 100644
--- a/src/input/touch/touchmanager.cpp
+++ b/src/input/touch/touchmanager.cpp
@@ -22,10 +22,11 @@
#include "configuration.h"
#include "graphicsvertexes.h"
-#include "touchactions.h"
#include "input/mouseinput.h"
+#include "input/touch/touchactions.h"
+
#include "gui/gui.h"
#include "gui/skin.h"