From c9a84749b3b71d4df6cc3b9b488d60dc4a013a20 Mon Sep 17 00:00:00 2001 From: Andrei Karas Date: Sat, 30 May 2015 17:58:44 +0300 Subject: Move inputaction into enums directory. --- src/gui/windows/charcreatedialog.cpp | 4 ++-- src/gui/windows/charselectdialog.cpp | 2 +- src/gui/windows/editserverdialog.cpp | 4 ++-- src/gui/windows/logindialog.cpp | 2 +- src/gui/windows/quitdialog.cpp | 2 +- src/gui/windows/registerdialog.cpp | 8 ++++---- src/gui/windows/serverdialog.cpp | 2 +- src/gui/windows/updaterwindow.cpp | 4 ++-- src/gui/windows/worldselectdialog.cpp | 2 +- 9 files changed, 15 insertions(+), 15 deletions(-) (limited to 'src/gui/windows') 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" -- cgit v1.2.3-60-g2f50