move input related files into input dir.

17 files changed, 41 insertions, 27 deletions

diff --git a/src/gui/widgets/browserbox.cpp b/src/gui/widgets/browserbox.cpp
index c1910ae88..6fd38e4c6 100644
--- a/src/gui/widgets/browserbox.cpp
+++ b/src/gui/widgets/browserbox.cpp
@@ -24,7 +24,8 @@
 #include "gui/widgets/browserbox.h"
 
 #include "client.h"
-#include "inputmanager.h"
+
+#include "input/inputmanager.h"
 
 #include "gui/gui.h"
 #include "gui/sdlfont.h"
diff --git a/src/gui/widgets/button.cpp b/src/gui/widgets/button.cpp
index ed9ac0580..1fb4fa5e4 100644
--- a/src/gui/widgets/button.cpp
+++ b/src/gui/widgets/button.cpp
@@ -25,8 +25,9 @@
 #include "client.h"
 #include "configuration.h"
 #include "graphicsvertexes.h"
-#include "keydata.h"
-#include "keyevent.h"
+
+#include "input/keydata.h"
+#include "input/keyevent.h"
 
 #include "resources/imageset.h"
 
diff --git a/src/gui/widgets/checkbox.cpp b/src/gui/widgets/checkbox.cpp
index d0c10ecb6..5548390bc 100644
--- a/src/gui/widgets/checkbox.cpp
+++ b/src/gui/widgets/checkbox.cpp
@@ -24,8 +24,9 @@
 
 #include "client.h"
 #include "configuration.h"
-#include "keydata.h"
-#include "keyevent.h"
+
+#include "input/keydata.h"
+#include "input/keyevent.h"
 
 #include "resources/image.h"
 
diff --git a/src/gui/widgets/dropdown.cpp b/src/gui/widgets/dropdown.cpp
index 9845c295c..8eac7bf79 100644
--- a/src/gui/widgets/dropdown.cpp
+++ b/src/gui/widgets/dropdown.cpp
@@ -24,8 +24,9 @@
 
 #include "client.h"
 #include "configuration.h"
-#include "keydata.h"
-#include "keyevent.h"
+
+#include "input/keydata.h"
+#include "input/keyevent.h"
 
 #include "gui/sdlinput.h"
 #include "gui/viewport.h"
diff --git a/src/gui/widgets/dropshortcutcontainer.cpp b/src/gui/widgets/dropshortcutcontainer.cpp
index d0bf896eb..96d068ade 100644
--- a/src/gui/widgets/dropshortcutcontainer.cpp
+++ b/src/gui/widgets/dropshortcutcontainer.cpp
@@ -25,10 +25,11 @@
 #include "client.h"
 #include "dragdrop.h"
 #include "dropshortcut.h"
-#include "keyboardconfig.h"
 #include "localplayer.h"
 #include "playerinfo.h"
 
+#include "input/keyboardconfig.h"
+
 #include "gui/inventorywindow.h"
 #include "gui/itempopup.h"
 #include "gui/viewport.h"
diff --git a/src/gui/widgets/emoteshortcutcontainer.cpp b/src/gui/widgets/emoteshortcutcontainer.cpp
index 977b55a4f..d72f5379d 100644
--- a/src/gui/widgets/emoteshortcutcontainer.cpp
+++ b/src/gui/widgets/emoteshortcutcontainer.cpp
@@ -25,13 +25,14 @@
 #include "client.h"
 #include "configuration.h"
 #include "emoteshortcut.h"
-#include "inputmanager.h"
 #include "inventory.h"
 #include "item.h"
 #include "itemshortcut.h"
-#include "keyboardconfig.h"
 #include "localplayer.h"
 
+#include "input/inputmanager.h"
+#include "input/keyboardconfig.h"
+
 #include "gui/textpopup.h"
 #include "gui/viewport.h"
 
diff --git a/src/gui/widgets/extendedlistbox.cpp b/src/gui/widgets/extendedlistbox.cpp
index 00bb5e5fd..69c7e4d54 100644
--- a/src/gui/widgets/extendedlistbox.cpp
+++ b/src/gui/widgets/extendedlistbox.cpp
@@ -22,7 +22,8 @@
 
 #include "client.h"
 #include "configuration.h"
-#include "keyevent.h"
+
+#include "input/keyevent.h"
 
 #include "gui/sdlinput.h"
 
diff --git a/src/gui/widgets/guitable.cpp b/src/gui/widgets/guitable.cpp
index 638f310bd..68068acf7 100644
--- a/src/gui/widgets/guitable.cpp
+++ b/src/gui/widgets/guitable.cpp
@@ -24,7 +24,8 @@
 
 #include "client.h"
 #include "configuration.h"
-#include "keyevent.h"
+
+#include "input/keyevent.h"
 
 #include "gui/sdlinput.h"
 
diff --git a/src/gui/widgets/inttextfield.cpp b/src/gui/widgets/inttextfield.cpp
index be8b2e310..1c1fc222c 100644
--- a/src/gui/widgets/inttextfield.cpp
+++ b/src/gui/widgets/inttextfield.cpp
@@ -22,8 +22,8 @@
 
 #include "gui/widgets/inttextfield.h"
 
-#include "keydata.h"
-#include "keyevent.h"
+#include "input/keydata.h"
+#include "input/keyevent.h"
 
 #include "gui/sdlinput.h"
 
diff --git a/src/gui/widgets/itemshortcutcontainer.cpp b/src/gui/widgets/itemshortcutcontainer.cpp
index c42074d6b..40eaefcf9 100644
--- a/src/gui/widgets/itemshortcutcontainer.cpp
+++ b/src/gui/widgets/itemshortcutcontainer.cpp
@@ -26,14 +26,15 @@
 #include "configuration.h"
 #include "dragdrop.h"
 #include "inventory.h"
-#include "inputmanager.h"
 #include "item.h"
 #include "itemshortcut.h"
 #include "spellshortcut.h"
-#include "keyboardconfig.h"
 #include "localplayer.h"
 #include "playerinfo.h"
 
+#include "input/inputmanager.h"
+#include "input/keyboardconfig.h"
+
 #include "gui/inventorywindow.h"
 #include "gui/itempopup.h"
 #include "gui/skilldialog.h"
diff --git a/src/gui/widgets/listbox.cpp b/src/gui/widgets/listbox.cpp
index a5ffc2f8b..29b7b0e48 100644
--- a/src/gui/widgets/listbox.cpp
+++ b/src/gui/widgets/listbox.cpp
@@ -24,7 +24,8 @@
 
 #include "client.h"
 #include "configuration.h"
-#include "keyevent.h"
+
+#include "input/keyevent.h"
 
 #include "gui/gui.h"
 #include "gui/sdlinput.h"
diff --git a/src/gui/widgets/radiobutton.cpp b/src/gui/widgets/radiobutton.cpp
index ff4a8f6f4..8f595e6c3 100644
--- a/src/gui/widgets/radiobutton.cpp
+++ b/src/gui/widgets/radiobutton.cpp
@@ -24,8 +24,9 @@
 
 #include "client.h"
 #include "configuration.h"
-#include "keydata.h"
-#include "keyevent.h"
+
+#include "input/keydata.h"
+#include "input/keyevent.h"
 
 #include "resources/image.h"
 
diff --git a/src/gui/widgets/slider.cpp b/src/gui/widgets/slider.cpp
index 00b55f936..b8988964e 100644
--- a/src/gui/widgets/slider.cpp
+++ b/src/gui/widgets/slider.cpp
@@ -24,7 +24,8 @@
 
 #include "client.h"
 #include "configuration.h"
-#include "keyevent.h"
+
+#include "input/keyevent.h"
 
 #include "resources/image.h"
 
diff --git a/src/gui/widgets/spellshortcutcontainer.cpp b/src/gui/widgets/spellshortcutcontainer.cpp
index 335be9866..0ffb25b1d 100644
--- a/src/gui/widgets/spellshortcutcontainer.cpp
+++ b/src/gui/widgets/spellshortcutcontainer.cpp
@@ -25,10 +25,11 @@
 #include "client.h"
 #include "dragdrop.h"
 #include "itemshortcut.h"
-#include "keyboardconfig.h"
 #include "localplayer.h"
 #include "spellshortcut.h"
 
+#include "input/keyboardconfig.h"
+
 #include "gui/inventorywindow.h"
 #include "gui/okdialog.h"
 #include "gui/shortcutwindow.h"
diff --git a/src/gui/widgets/tabbedarea.cpp b/src/gui/widgets/tabbedarea.cpp
index 5a8b7265f..d9b75dc11 100644
--- a/src/gui/widgets/tabbedarea.cpp
+++ b/src/gui/widgets/tabbedarea.cpp
@@ -22,8 +22,8 @@
 
 #include "gui/widgets/tabbedarea.h"
 
-#include "keydata.h"
-#include "keyevent.h"
+#include "input/keydata.h"
+#include "input/keyevent.h"
 
 #include "gui/widgets/scrollarea.h"
 #include "gui/widgets/tab.h"
diff --git a/src/gui/widgets/textbox.cpp b/src/gui/widgets/textbox.cpp
index d38c3c9c9..53f071d3d 100644
--- a/src/gui/widgets/textbox.cpp
+++ b/src/gui/widgets/textbox.cpp
@@ -22,8 +22,8 @@
 
 #include "gui/widgets/textbox.h"
 
-#include "keydata.h"
-#include "keyevent.h"
+#include "input/keydata.h"
+#include "input/keyevent.h"
 
 #include <guichan/font.hpp>
 
diff --git a/src/gui/widgets/textfield.cpp b/src/gui/widgets/textfield.cpp
index bff4f67f2..aac233d24 100644
--- a/src/gui/widgets/textfield.cpp
+++ b/src/gui/widgets/textfield.cpp
@@ -24,8 +24,9 @@
 
 #include "client.h"
 #include "configuration.h"
-#include "inputmanager.h"
-#include "keyevent.h"
+
+#include "input/inputmanager.h"
+#include "input/keyevent.h"
 
 #include "gui/popupmenu.h"
 #include "gui/sdlinput.h"