diff options
| author | Andrei Karas <akaras@inbox.ru> | 2014-02-19 01:18:16 +0300 |
|---|---|---|
| committer | Andrei Karas <akaras@inbox.ru> | 2014-02-20 00:49:07 +0300 |
| commit | 26f9aad24bc50d4e9fd161d185df049c9e7a62cf (patch) | |
| tree | d8fd87aef6395b5a4704e9570fcbcddcc8ccca83 /src/input | |
| parent | 50b5afdb7e68cdec8f77020b578dc3f6874933bb (diff) | |
| download | manaplus-26f9aad24bc50d4e9fd161d185df049c9e7a62cf.tar.gz manaplus-26f9aad24bc50d4e9fd161d185df049c9e7a62cf.tar.bz2 manaplus-26f9aad24bc50d4e9fd161d185df049c9e7a62cf.tar.xz manaplus-26f9aad24bc50d4e9fd161d185df049c9e7a62cf.zip | |
improve includes.
Diffstat (limited to 'src/input')
| -rw-r--r-- | src/input/inputmanager.cpp | 4 | ||||
| -rw-r--r-- | src/input/key.h | 2 | ||||
| -rw-r--r-- | src/input/mouseinput.h | 6 | ||||
| -rw-r--r-- | src/input/multitouchmanager.h | 2 |
4 files changed, 8 insertions, 6 deletions
diff --git a/src/input/inputmanager.cpp b/src/input/inputmanager.cpp index d19130e7c..5d157f0fa 100644 --- a/src/input/inputmanager.cpp +++ b/src/input/inputmanager.cpp @@ -28,7 +28,6 @@ #include "input/keyboardconfig.h" #include "input/keyboarddata.h" #include "being/localplayer.h" -#include "being/playerinfo.h" #ifdef USE_SDL2 #include "input/multitouchmanager.h" #endif @@ -47,7 +46,6 @@ #include "gui/windows/setupwindow.h" #include "gui/windows/textdialog.h" #include "gui/windows/tradewindow.h" -#include "gui/windows/quitdialog.h" #include "utils/timer.h" @@ -59,6 +57,8 @@ InputManager inputManager; +class QuitDialog; + extern QuitDialog *quitDialog; static class KeyFunctor final diff --git a/src/input/key.h b/src/input/key.h index fa48d3583..97bc7113d 100644 --- a/src/input/key.h +++ b/src/input/key.h @@ -194,4 +194,4 @@ class Key final int mValue; }; -#endif // end GCN_KEY_HPP +#endif // INPUT_KEY_H diff --git a/src/input/mouseinput.h b/src/input/mouseinput.h index 5ece1f77a..a90a1366d 100644 --- a/src/input/mouseinput.h +++ b/src/input/mouseinput.h @@ -61,8 +61,8 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#ifndef MOUSEINPUT_H -#define MOUSEINPUT_H +#ifndef INPUT_MOUSEINPUT_H +#define INPUT_MOUSEINPUT_H #include "input/mouseinput.h" @@ -213,4 +213,4 @@ class MouseInput final int mRealY; }; -#endif // MOUSEINPUT_H +#endif // INPUT_MOUSEINPUT_H diff --git a/src/input/multitouchmanager.h b/src/input/multitouchmanager.h index 076ccb3a8..82bfd0881 100644 --- a/src/input/multitouchmanager.h +++ b/src/input/multitouchmanager.h @@ -25,7 +25,9 @@ #include "localconsts.h" +#ifdef USE_SDL2 union SDL_Event; +#endif struct MultiTouchEvent { |