Move inputaction into enums directory.

36 files changed, 46 insertions, 45 deletions

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 805327f26..55cea4c33 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -902,7 +902,7 @@ SET(SRCS
     spellshortcut.h
     textcommand.cpp
     textcommand.h
-    input/inputaction.h
+    enums/input/inputaction.h
     input/inputactiondata.h
     input/inputactionmap.h
     input/inputactionsortfunctor.h
diff --git a/src/Makefile.am b/src/Makefile.am
index f8e45e440..38a4bb42b 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1038,7 +1038,7 @@ manaplus_SOURCES += gui/widgets/avatarlistbox.cpp \
 	      textcommand.cpp \
 	      textcommand.h \
 	      events/inputevent.h \
-	      input/inputaction.h \
+	      enums/input/inputaction.h \
 	      input/inputactiondata.h \
 	      input/inputactionmap.h \
 	      input/inputactionsortfunctor.h \
diff --git a/src/defaults.cpp b/src/defaults.cpp
index befba7ffe..c8ca23f54 100644
--- a/src/defaults.cpp
+++ b/src/defaults.cpp
@@ -24,11 +24,11 @@
 #include "graphicsmanager.h"
 #include "variabledata.h"
 
-#include "enums/screendensity.h"
-
 #include "being/beingspeech.h"
 
-#include "input/inputaction.h"
+#include "enums/screendensity.h"
+
+#include "enums/input/inputaction.h"
 
 #include "render/graphics.h"
 
diff --git a/src/input/inputaction.h b/src/enums/input/inputaction.h
index f398029e7..f398029e7 100644
--- a/src/input/inputaction.h
+++ b/src/enums/input/inputaction.h
diff --git a/src/gui/popups/statuspopup.h b/src/gui/popups/statuspopup.h
index 2226d1ba2..cdfbde656 100644
--- a/src/gui/popups/statuspopup.h
+++ b/src/gui/popups/statuspopup.h
@@ -24,7 +24,7 @@
 #ifndef GUI_POPUPS_STATUSPOPUP_H
 #define GUI_POPUPS_STATUSPOPUP_H
 
-#include "input/inputaction.h"
+#include "enums/input/inputaction.h"
 
 #include "gui/widgets/popup.h"
 
diff --git a/src/gui/widgets/button.cpp b/src/gui/widgets/button.cpp
index 0d7bafd74..9a6d43518 100644
--- a/src/gui/widgets/button.cpp
+++ b/src/gui/widgets/button.cpp
@@ -68,7 +68,7 @@
 #include "graphicsvertexes.h"
 #include "settings.h"
 
-#include "input/inputaction.h"
+#include "enums/input/inputaction.h"
 
 #include "resources/image.h"
 #include "resources/imageset.h"
diff --git a/src/gui/widgets/checkbox.cpp b/src/gui/widgets/checkbox.cpp
index 69479aba0..6459c5f1c 100644
--- a/src/gui/widgets/checkbox.cpp
+++ b/src/gui/widgets/checkbox.cpp
@@ -67,7 +67,7 @@
 
 #include "settings.h"
 
-#include "input/inputaction.h"
+#include "enums/input/inputaction.h"
 
 #include "resources/image.h"
 #include "resources/imagerect.h"
diff --git a/src/gui/widgets/dropdown.cpp b/src/gui/widgets/dropdown.cpp
index d6ff28e43..0d08dac60 100644
--- a/src/gui/widgets/dropdown.cpp
+++ b/src/gui/widgets/dropdown.cpp
@@ -24,7 +24,7 @@
 
 #include "settings.h"
 
-#include "input/inputaction.h"
+#include "enums/input/inputaction.h"
 
 #include "gui/gui.h"
 #include "gui/skin.h"
diff --git a/src/gui/widgets/guitable.cpp b/src/gui/widgets/guitable.cpp
index 2927b1284..ba29033a9 100644
--- a/src/gui/widgets/guitable.cpp
+++ b/src/gui/widgets/guitable.cpp
@@ -24,12 +24,12 @@
 
 #include "settings.h"
 
+#include "enums/input/inputaction.h"
+
 #include "gui/gui.h"
 
 #include "gui/models/tablemodel.h"
 
-#include "input/inputaction.h"
-
 #include "listeners/guitableactionlistener.h"
 
 #include "utils/delete2.h"
diff --git a/src/gui/widgets/inttextfield.cpp b/src/gui/widgets/inttextfield.cpp
index 094f2e50c..1ba53b1af 100644
--- a/src/gui/widgets/inttextfield.cpp
+++ b/src/gui/widgets/inttextfield.cpp
@@ -26,7 +26,7 @@
 #include "gui/sdlinput.h"
 #endif
 
-#include "input/inputaction.h"
+#include "enums/input/inputaction.h"
 
 #include "utils/stringutils.h"
 #include "debug.h"
diff --git a/src/gui/widgets/listbox.cpp b/src/gui/widgets/listbox.cpp
index 0a38d6133..5ab8945a9 100644
--- a/src/gui/widgets/listbox.cpp
+++ b/src/gui/widgets/listbox.cpp
@@ -67,7 +67,7 @@
 
 #include "settings.h"
 
-#include "input/inputaction.h"
+#include "enums/input/inputaction.h"
 
 #include "listeners/selectionlistener.h"
 
diff --git a/src/gui/widgets/radiobutton.cpp b/src/gui/widgets/radiobutton.cpp
index c7089a8ad..9fd9d81aa 100644
--- a/src/gui/widgets/radiobutton.cpp
+++ b/src/gui/widgets/radiobutton.cpp
@@ -67,7 +67,7 @@
 
 #include "settings.h"
 
-#include "input/inputaction.h"
+#include "enums/input/inputaction.h"
 
 #include "resources/image.h"
 #include "resources/imagerect.h"
diff --git a/src/gui/widgets/slider.cpp b/src/gui/widgets/slider.cpp
index 8c17c03fa..c11dc2627 100644
--- a/src/gui/widgets/slider.cpp
+++ b/src/gui/widgets/slider.cpp
@@ -68,7 +68,7 @@
 #include "graphicsvertexes.h"
 #include "settings.h"
 
-#include "input/inputaction.h"
+#include "enums/input/inputaction.h"
 
 #include "gui/gui.h"
 
diff --git a/src/gui/widgets/tabbedarea.cpp b/src/gui/widgets/tabbedarea.cpp
index e00123af6..79205617f 100644
--- a/src/gui/widgets/tabbedarea.cpp
+++ b/src/gui/widgets/tabbedarea.cpp
@@ -65,7 +65,7 @@
 
 #include "gui/widgets/tabbedarea.h"
 
-#include "input/inputaction.h"
+#include "enums/input/inputaction.h"
 
 #include "gui/gui.h"
 
diff --git a/src/gui/widgets/textbox.cpp b/src/gui/widgets/textbox.cpp
index e235fd04e..0919656ad 100644
--- a/src/gui/widgets/textbox.cpp
+++ b/src/gui/widgets/textbox.cpp
@@ -65,7 +65,7 @@
 
 #include "gui/widgets/textbox.h"
 
-#include "input/inputaction.h"
+#include "enums/input/inputaction.h"
 
 #include "gui/gui.h"
 
diff --git a/src/gui/windows/charcreatedialog.cpp b/src/gui/windows/charcreatedialog.cpp
index 49b1e1c59..87dc25115 100644
--- a/src/gui/windows/charcreatedialog.cpp
+++ b/src/gui/windows/charcreatedialog.cpp
@@ -24,12 +24,12 @@
 
 #include "configuration.h"
 
-#include "input/inputaction.h"
-
 #include "enums/being/beingdirection.h"
 
 #include "enums/gui/dialogtype.h"
 
+#include "enums/input/inputaction.h"
+
 #include "gui/windows/okdialog.h"
 
 #include "gui/widgets/button.h"
diff --git a/src/gui/windows/charselectdialog.cpp b/src/gui/windows/charselectdialog.cpp
index bb4eae95e..dd82091b0 100644
--- a/src/gui/windows/charselectdialog.cpp
+++ b/src/gui/windows/charselectdialog.cpp
@@ -28,7 +28,7 @@
 
 #include "enums/being/attributes.h"
 
-#include "input/inputaction.h"
+#include "enums/input/inputaction.h"
 
 #include "listeners/charrenamelistener.h"
 #ifdef EATHENA_SUPPORT
diff --git a/src/gui/windows/editserverdialog.cpp b/src/gui/windows/editserverdialog.cpp
index 0d1ed392f..e6fd2e16c 100644
--- a/src/gui/windows/editserverdialog.cpp
+++ b/src/gui/windows/editserverdialog.cpp
@@ -21,10 +21,10 @@
 
 #include "gui/windows/editserverdialog.h"
 
-#include "input/inputaction.h"
-
 #include "enums/gui/dialogtype.h"
 
+#include "enums/input/inputaction.h"
+
 #include "gui/models/typelistmodel.h"
 
 #include "gui/windows/okdialog.h"
diff --git a/src/gui/windows/logindialog.cpp b/src/gui/windows/logindialog.cpp
index 644c9f2ad..f2b41c7b5 100644
--- a/src/gui/windows/logindialog.cpp
+++ b/src/gui/windows/logindialog.cpp
@@ -25,7 +25,7 @@
 #include "client.h"
 #include "configuration.h"
 
-#include "input/inputaction.h"
+#include "enums/input/inputaction.h"
 
 #include "listeners/openurllistener.h"
 
diff --git a/src/gui/windows/quitdialog.cpp b/src/gui/windows/quitdialog.cpp
index c605b7796..bd710670c 100644
--- a/src/gui/windows/quitdialog.cpp
+++ b/src/gui/windows/quitdialog.cpp
@@ -27,7 +27,7 @@
 #include "soundconsts.h"
 #include "soundmanager.h"
 
-#include "input/inputaction.h"
+#include "enums/input/inputaction.h"
 
 #include "gui/dialogsmanager.h"
 #include "gui/viewport.h"
diff --git a/src/gui/windows/registerdialog.cpp b/src/gui/windows/registerdialog.cpp
index 14a7d61f5..85ad80988 100644
--- a/src/gui/windows/registerdialog.cpp
+++ b/src/gui/windows/registerdialog.cpp
@@ -24,12 +24,10 @@
 
 #include "client.h"
 
-#include "input/inputaction.h"
-
-#include "listeners/wrongdatanoticelistener.h"
-
 #include "enums/gui/dialogtype.h"
 
+#include "enums/input/inputaction.h"
+
 #include "gui/windows/okdialog.h"
 
 #include "gui/widgets/button.h"
@@ -39,6 +37,8 @@
 #include "gui/widgets/passwordfield.h"
 #include "gui/widgets/radiobutton.h"
 
+#include "listeners/wrongdatanoticelistener.h"
+
 #include "net/logindata.h"
 #include "net/loginhandler.h"
 #include "net/registrationoptions.h"
diff --git a/src/gui/windows/serverdialog.cpp b/src/gui/windows/serverdialog.cpp
index 4dc0d5fc0..26b12b0d1 100644
--- a/src/gui/windows/serverdialog.cpp
+++ b/src/gui/windows/serverdialog.cpp
@@ -27,7 +27,7 @@
 #include "configuration.h"
 #include "settings.h"
 
-#include "input/inputaction.h"
+#include "enums/input/inputaction.h"
 
 #include "net/download.h"
 
diff --git a/src/gui/windows/updaterwindow.cpp b/src/gui/windows/updaterwindow.cpp
index 4f8b4dc48..ca094f1b6 100644
--- a/src/gui/windows/updaterwindow.cpp
+++ b/src/gui/windows/updaterwindow.cpp
@@ -28,9 +28,9 @@
 
 #include "enums/gui/progresscolorid.h"
 
-#include "enums/net/updatetype.h"
+#include "enums/input/inputaction.h"
 
-#include "input/inputaction.h"
+#include "enums/net/updatetype.h"
 
 #include "gui/widgets/browserbox.h"
 #include "gui/widgets/button.h"
diff --git a/src/gui/windows/worldselectdialog.cpp b/src/gui/windows/worldselectdialog.cpp
index 73c1a4f4e..ee5af8123 100644
--- a/src/gui/windows/worldselectdialog.cpp
+++ b/src/gui/windows/worldselectdialog.cpp
@@ -25,7 +25,7 @@
 #include "client.h"
 #include "settings.h"
 
-#include "input/inputaction.h"
+#include "enums/input/inputaction.h"
 
 #include "gui/widgets/button.h"
 #include "gui/widgets/layout.h"
diff --git a/src/input/inputmanager.h b/src/input/inputmanager.h
index 11757b630..9526e8cdd 100644
--- a/src/input/inputmanager.h
+++ b/src/input/inputmanager.h
@@ -21,7 +21,8 @@
 #ifndef INPUT_INPUTMANAGER_H
 #define INPUT_INPUTMANAGER_H
 
-#include "input/inputaction.h"
+#include "enums/input/inputaction.h"
+
 #include "input/inputfunction.h"
 
 #include "events/inputevent.h"
diff --git a/src/input/pages/basic.cpp b/src/input/pages/basic.cpp
index 4cfc1c614..bb8c8b5c2 100644
--- a/src/input/pages/basic.cpp
+++ b/src/input/pages/basic.cpp
@@ -23,7 +23,7 @@
 
 #include "gui/setupactiondata.h"
 
-#include "input/inputaction.h"
+#include "enums/input/inputaction.h"
 
 #include "utils/gettext.h"
 
diff --git a/src/input/pages/chat.cpp b/src/input/pages/chat.cpp
index 5764d9e3c..33ba3929c 100644
--- a/src/input/pages/chat.cpp
+++ b/src/input/pages/chat.cpp
@@ -20,7 +20,7 @@
 
 #include "gui/setupactiondata.h"
 
-#include "input/inputaction.h"
+#include "enums/input/inputaction.h"
 
 #include "utils/gettext.h"
 
diff --git a/src/input/pages/emotes.cpp b/src/input/pages/emotes.cpp
index 194a4ed44..ddb80e7b9 100644
--- a/src/input/pages/emotes.cpp
+++ b/src/input/pages/emotes.cpp
@@ -23,7 +23,7 @@
 
 #include "gui/setupactiondata.h"
 
-#include "input/inputaction.h"
+#include "enums/input/inputaction.h"
 
 #include "utils/gettext.h"
 #include "utils/stringutils.h"
diff --git a/src/input/pages/gui.cpp b/src/input/pages/gui.cpp
index c9f3c2926..da9ce4f91 100644
--- a/src/input/pages/gui.cpp
+++ b/src/input/pages/gui.cpp
@@ -20,7 +20,7 @@
 
 #include "gui/setupactiondata.h"
 
-#include "input/inputaction.h"
+#include "enums/input/inputaction.h"
 
 #include "utils/gettext.h"
 
diff --git a/src/input/pages/move.cpp b/src/input/pages/move.cpp
index f8feb14dd..2156b9d27 100644
--- a/src/input/pages/move.cpp
+++ b/src/input/pages/move.cpp
@@ -23,7 +23,7 @@
 
 #include "gui/setupactiondata.h"
 
-#include "input/inputaction.h"
+#include "enums/input/inputaction.h"
 
 #include "utils/gettext.h"
 #include "utils/stringutils.h"
diff --git a/src/input/pages/other.cpp b/src/input/pages/other.cpp
index 98714bd9a..433907347 100644
--- a/src/input/pages/other.cpp
+++ b/src/input/pages/other.cpp
@@ -23,7 +23,7 @@
 
 #include "gui/setupactiondata.h"
 
-#include "input/inputaction.h"
+#include "enums/input/inputaction.h"
 
 #include "utils/gettext.h"
 
diff --git a/src/input/pages/outfits.cpp b/src/input/pages/outfits.cpp
index 20715a287..708587cbe 100644
--- a/src/input/pages/outfits.cpp
+++ b/src/input/pages/outfits.cpp
@@ -23,7 +23,7 @@
 
 #include "gui/setupactiondata.h"
 
-#include "input/inputaction.h"
+#include "enums/input/inputaction.h"
 
 #include "utils/gettext.h"
 #include "utils/stringutils.h"
diff --git a/src/input/pages/shortcuts.cpp b/src/input/pages/shortcuts.cpp
index f6745ca36..075532ced 100644
--- a/src/input/pages/shortcuts.cpp
+++ b/src/input/pages/shortcuts.cpp
@@ -23,7 +23,7 @@
 
 #include "gui/setupactiondata.h"
 
-#include "input/inputaction.h"
+#include "enums/input/inputaction.h"
 
 #include "utils/gettext.h"
 #include "utils/stringutils.h"
diff --git a/src/input/pages/windows.cpp b/src/input/pages/windows.cpp
index 3f3f14462..49efc9794 100644
--- a/src/input/pages/windows.cpp
+++ b/src/input/pages/windows.cpp
@@ -23,7 +23,7 @@
 
 #include "gui/setupactiondata.h"
 
-#include "input/inputaction.h"
+#include "enums/input/inputaction.h"
 
 #include "utils/gettext.h"
 
diff --git a/src/listeners/inputactionreplaylistener.h b/src/listeners/inputactionreplaylistener.h
index 97447a4e5..d1d762639 100644
--- a/src/listeners/inputactionreplaylistener.h
+++ b/src/listeners/inputactionreplaylistener.h
@@ -21,9 +21,9 @@
 #ifndef LISTENERS_INPUTACTIONREPLAYLISTENER_H
 #define LISTENERS_INPUTACTIONREPLAYLISTENER_H
 
-#include "listeners/actionlistener.h"
+#include "enums/input/inputaction.h"
 
-#include "input/inputaction.h"
+#include "listeners/actionlistener.h"
 
 #include "localconsts.h"
 
diff --git a/src/touchmanager.h b/src/touchmanager.h
index 63a84ba5f..a8c83b8d7 100644
--- a/src/touchmanager.h
+++ b/src/touchmanager.h
@@ -23,7 +23,7 @@
 
 #include "listeners/configlistener.h"
 
-#include "input/inputaction.h"
+#include "enums/input/inputaction.h"
 
 #include "gui/rect.h"