diff options
author | Andrei Karas <akaras@inbox.ru> | 2015-05-30 17:58:44 +0300 |
---|---|---|
committer | Andrei Karas <akaras@inbox.ru> | 2015-05-30 18:10:24 +0300 |
commit | c9a84749b3b71d4df6cc3b9b488d60dc4a013a20 (patch) | |
tree | 961f8c54d593d62871fae00c2e1030cdd682634a /src/gui | |
parent | 59d0e4b1d9fc1f876ac98d677e48d818affe3d42 (diff) | |
download | manaplus-c9a84749b3b71d4df6cc3b9b488d60dc4a013a20.tar.gz manaplus-c9a84749b3b71d4df6cc3b9b488d60dc4a013a20.tar.bz2 manaplus-c9a84749b3b71d4df6cc3b9b488d60dc4a013a20.tar.xz manaplus-c9a84749b3b71d4df6cc3b9b488d60dc4a013a20.zip |
Move inputaction into enums directory.
Diffstat (limited to 'src/gui')
-rw-r--r-- | src/gui/popups/statuspopup.h | 2 | ||||
-rw-r--r-- | src/gui/widgets/button.cpp | 2 | ||||
-rw-r--r-- | src/gui/widgets/checkbox.cpp | 2 | ||||
-rw-r--r-- | src/gui/widgets/dropdown.cpp | 2 | ||||
-rw-r--r-- | src/gui/widgets/guitable.cpp | 4 | ||||
-rw-r--r-- | src/gui/widgets/inttextfield.cpp | 2 | ||||
-rw-r--r-- | src/gui/widgets/listbox.cpp | 2 | ||||
-rw-r--r-- | src/gui/widgets/radiobutton.cpp | 2 | ||||
-rw-r--r-- | src/gui/widgets/slider.cpp | 2 | ||||
-rw-r--r-- | src/gui/widgets/tabbedarea.cpp | 2 | ||||
-rw-r--r-- | src/gui/widgets/textbox.cpp | 2 | ||||
-rw-r--r-- | src/gui/windows/charcreatedialog.cpp | 4 | ||||
-rw-r--r-- | src/gui/windows/charselectdialog.cpp | 2 | ||||
-rw-r--r-- | src/gui/windows/editserverdialog.cpp | 4 | ||||
-rw-r--r-- | src/gui/windows/logindialog.cpp | 2 | ||||
-rw-r--r-- | src/gui/windows/quitdialog.cpp | 2 | ||||
-rw-r--r-- | src/gui/windows/registerdialog.cpp | 8 | ||||
-rw-r--r-- | src/gui/windows/serverdialog.cpp | 2 | ||||
-rw-r--r-- | src/gui/windows/updaterwindow.cpp | 4 | ||||
-rw-r--r-- | src/gui/windows/worldselectdialog.cpp | 2 |
20 files changed, 27 insertions, 27 deletions
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" |