diff options
author | Andrei Karas <akaras@inbox.ru> | 2013-09-12 18:20:20 +0300 |
---|---|---|
committer | Andrei Karas <akaras@inbox.ru> | 2013-09-12 18:20:20 +0300 |
commit | 1b9eb054bb62c3cbac18ed677dfc0ac3eff5c92c (patch) | |
tree | 94d0450c40a22c2fe1765102803a0738667a92ba | |
parent | 5723ab9b763ac4113f1f46e129c089767d22639e (diff) | |
download | mv-1b9eb054bb62c3cbac18ed677dfc0ac3eff5c92c.tar.gz mv-1b9eb054bb62c3cbac18ed677dfc0ac3eff5c92c.tar.bz2 mv-1b9eb054bb62c3cbac18ed677dfc0ac3eff5c92c.tar.xz mv-1b9eb054bb62c3cbac18ed677dfc0ac3eff5c92c.zip |
remove unused includes from input files.
-rw-r--r-- | src/gui/charselectdialog.cpp | 1 | ||||
-rw-r--r-- | src/gui/sdlinput.cpp | 1 | ||||
-rw-r--r-- | src/gui/widgets/guitable.cpp | 1 | ||||
-rw-r--r-- | src/gui/widgets/listbox.cpp | 1 | ||||
-rw-r--r-- | src/gui/widgets/slider.cpp | 1 | ||||
-rw-r--r-- | src/gui/widgets/textfield.cpp | 1 | ||||
-rw-r--r-- | src/input/inputmanager.h | 4 | ||||
-rw-r--r-- | src/input/joystick.h | 2 | ||||
-rw-r--r-- | src/input/keyboardconfig.cpp | 1 | ||||
-rw-r--r-- | src/input/keyboardconfig.h | 3 | ||||
-rw-r--r-- | src/input/keyevent.h | 5 | ||||
-rw-r--r-- | src/input/keyinput.h | 4 |
12 files changed, 8 insertions, 17 deletions
diff --git a/src/gui/charselectdialog.cpp b/src/gui/charselectdialog.cpp index 1f7248a18..e7f6d9299 100644 --- a/src/gui/charselectdialog.cpp +++ b/src/gui/charselectdialog.cpp @@ -26,6 +26,7 @@ #include "configuration.h" #include "units.h" +#include "input/keydata.h" #include "input/keyevent.h" #include "gui/charcreatedialog.h" diff --git a/src/gui/sdlinput.cpp b/src/gui/sdlinput.cpp index f8c9b721c..59f9c8e19 100644 --- a/src/gui/sdlinput.cpp +++ b/src/gui/sdlinput.cpp @@ -68,6 +68,7 @@ #endif #include <SDL_keyboard.h> +#include <SDL_timer.h> #include <guichan/exception.hpp> diff --git a/src/gui/widgets/guitable.cpp b/src/gui/widgets/guitable.cpp index f186a8604..030605ed5 100644 --- a/src/gui/widgets/guitable.cpp +++ b/src/gui/widgets/guitable.cpp @@ -25,6 +25,7 @@ #include "client.h" #include "input/keyevent.h" +#include "input/keydata.h" #include "utils/dtor.h" diff --git a/src/gui/widgets/listbox.cpp b/src/gui/widgets/listbox.cpp index daed87088..f5b926ad7 100644 --- a/src/gui/widgets/listbox.cpp +++ b/src/gui/widgets/listbox.cpp @@ -24,6 +24,7 @@ #include "client.h" +#include "input/keydata.h" #include "input/keyevent.h" #include "gui/gui.h" diff --git a/src/gui/widgets/slider.cpp b/src/gui/widgets/slider.cpp index 8457200a7..a500a8014 100644 --- a/src/gui/widgets/slider.cpp +++ b/src/gui/widgets/slider.cpp @@ -24,6 +24,7 @@ #include "client.h" +#include "input/keydata.h" #include "input/keyevent.h" #include "resources/image.h" diff --git a/src/gui/widgets/textfield.cpp b/src/gui/widgets/textfield.cpp index 17b16f355..d6bc9ca68 100644 --- a/src/gui/widgets/textfield.cpp +++ b/src/gui/widgets/textfield.cpp @@ -24,6 +24,7 @@ #include "client.h" +#include "input/keydata.h" #include "input/keyevent.h" #include "gui/popupmenu.h" diff --git a/src/input/inputmanager.h b/src/input/inputmanager.h index 8611e19c3..595900303 100644 --- a/src/input/inputmanager.h +++ b/src/input/inputmanager.h @@ -27,7 +27,7 @@ #include <string> #include <map> -#include <SDL.h> +#include <SDL_events.h> const unsigned int KeyFunctionSize = 3; @@ -39,8 +39,6 @@ const unsigned int KeyFunctionSize = 3; #undef INPUT_MOUSE #endif -struct KeyData; - class Setup_Input; enum KeyTypes diff --git a/src/input/joystick.h b/src/input/joystick.h index 528eb0c94..f5f97cc09 100644 --- a/src/input/joystick.h +++ b/src/input/joystick.h @@ -25,7 +25,7 @@ #include "input/inputevent.h" -#include <SDL.h> +#include <SDL_events.h> #include <string> #include <vector> diff --git a/src/input/keyboardconfig.cpp b/src/input/keyboardconfig.cpp index 87d7a8d69..3c14db805 100644 --- a/src/input/keyboardconfig.cpp +++ b/src/input/keyboardconfig.cpp @@ -23,7 +23,6 @@ #include "input/keyboardconfig.h" #include "configuration.h" -#include "logger.h" #include "input/inputmanager.h" diff --git a/src/input/keyboardconfig.h b/src/input/keyboardconfig.h index f6152fa1a..39ecf8909 100644 --- a/src/input/keyboardconfig.h +++ b/src/input/keyboardconfig.h @@ -23,16 +23,13 @@ #ifndef INPUT_KEYBOARDCONFIG_H #define INPUT_KEYBOARDCONFIG_H -#include <SDL_types.h> #include <SDL_keyboard.h> #include "sdlshared.h" #include "input/inputevent.h" -#include <map> #include <string> -#include <vector> union SDL_Event; diff --git a/src/input/keyevent.h b/src/input/keyevent.h index 24623bda4..cb96f45c9 100644 --- a/src/input/keyevent.h +++ b/src/input/keyevent.h @@ -21,13 +21,8 @@ #ifndef INPUT_KEYEVENT_H #define INPUT_KEYEVENT_H -#include "input/keydata.h" - #include <guichan/key.hpp> #include <guichan/keyevent.hpp> -#include <guichan/widget.hpp> - -#include <string> class KeyEvent final : public gcn::KeyEvent { diff --git a/src/input/keyinput.h b/src/input/keyinput.h index 590995e2c..9d744f01c 100644 --- a/src/input/keyinput.h +++ b/src/input/keyinput.h @@ -21,12 +21,8 @@ #ifndef INPUT_KEYINPUT_H #define INPUT_KEYINPUT_H -#include "input/keydata.h" - #include <guichan/keyinput.hpp> -#include <string> - class KeyInput final : public gcn::KeyInput { public: |