diff options
| author | Andrei Karas <akaras@inbox.ru> | 2015-12-29 00:59:00 +0300 |
|---|---|---|
| committer | Andrei Karas <akaras@inbox.ru> | 2015-12-29 00:59:00 +0300 |
| commit | 38e782f30d15a0fceabf863e40ffe66124cef8a8 (patch) | |
| tree | 360d96948ddef2d4c506d8e4760be24de89a7dd2 /src/gui | |
| parent | b5ffd5541fabee632acc2979d9dafc84e60aa3d8 (diff) | |
| download | manaplus-38e782f30d15a0fceabf863e40ffe66124cef8a8.tar.gz manaplus-38e782f30d15a0fceabf863e40ffe66124cef8a8.tar.bz2 manaplus-38e782f30d15a0fceabf863e40ffe66124cef8a8.tar.xz manaplus-38e782f30d15a0fceabf863e40ffe66124cef8a8.zip | |
Move touchmanager into touch directory.
Diffstat (limited to 'src/gui')
| -rw-r--r-- | src/gui/gui.cpp | 3 | ||||
| -rw-r--r-- | src/gui/windowmanager.cpp | 3 | ||||
| -rw-r--r-- | src/gui/windows/setupwindow.cpp | 3 |
3 files changed, 6 insertions, 3 deletions
diff --git a/src/gui/gui.cpp b/src/gui/gui.cpp index 146558032..02b0d3f08 100644 --- a/src/gui/gui.cpp +++ b/src/gui/gui.cpp @@ -79,7 +79,6 @@ #include "resources/image.h" #endif #include "settings.h" -#include "touchmanager.h" #include "listeners/focuslistener.h" #include "listeners/guiconfiglistener.h" @@ -87,6 +86,8 @@ #include "input/inputmanager.h" +#include "input/touch/touchmanager.h" + #include "render/renderers.h" #include "resources/imageset.h" diff --git a/src/gui/windowmanager.cpp b/src/gui/windowmanager.cpp index 49c0b859e..1793bcbea 100644 --- a/src/gui/windowmanager.cpp +++ b/src/gui/windowmanager.cpp @@ -27,7 +27,6 @@ #include "game.h" #include "settings.h" #include "spellmanager.h" -#include "touchmanager.h" #include "gui/gui.h" #include "gui/userpalette.h" @@ -52,6 +51,8 @@ #include "gui/widgets/createwidget.h" #include "gui/widgets/desktop.h" +#include "input/touch/touchmanager.h" + #include "utils/delete2.h" #include "utils/files.h" #include "utils/sdlcheckutils.h" diff --git a/src/gui/windows/setupwindow.cpp b/src/gui/windows/setupwindow.cpp index 674668cf7..85a999e46 100644 --- a/src/gui/windows/setupwindow.cpp +++ b/src/gui/windows/setupwindow.cpp @@ -24,7 +24,6 @@ #include "configuration.h" #include "game.h" -#include "touchmanager.h" #include "gui/windows/chatwindow.h" @@ -50,6 +49,8 @@ #include "gui/widgets/label.h" #include "gui/widgets/tabbedarea.h" +#include "input/touch/touchmanager.h" + #include "utils/delete2.h" #include "utils/dtor.h" #include "utils/gettext.h" |