summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--src/actions/actions.cpp3
-rw-r--r--src/client.cpp3
-rw-r--r--src/enums/gui/dialogtype.h (renamed from src/gui/dialogtype.h)6
-rw-r--r--src/gamemodifiers.cpp3
-rw-r--r--src/gui/dialogsmanager.cpp2
-rw-r--r--src/gui/widgets/tabs/setup_input.cpp3
-rw-r--r--src/gui/widgets/tabs/setup_theme.cpp3
-rw-r--r--src/gui/widgets/tabs/setup_video.cpp3
-rw-r--r--src/gui/windows/changeemaildialog.cpp2
-rw-r--r--src/gui/windows/changepassworddialog.cpp2
-rw-r--r--src/gui/windows/charcreatedialog.cpp2
-rw-r--r--src/gui/windows/charselectdialog.cpp2
-rw-r--r--src/gui/windows/editserverdialog.cpp2
-rw-r--r--src/gui/windows/okdialog.cpp2
-rw-r--r--src/gui/windows/registerdialog.cpp2
-rw-r--r--src/gui/windows/socialwindow.cpp2
-rw-r--r--src/gui/windows/unregisterdialog.cpp2
-rw-r--r--src/net/ea/charserverhandler.cpp2
-rw-r--r--src/net/ea/gamehandler.cpp2
-rw-r--r--src/net/eathena/charserverhandler.cpp2
-rw-r--r--src/net/tmwa/charserverhandler.cpp2
21 files changed, 29 insertions, 23 deletions
diff --git a/src/actions/actions.cpp b/src/actions/actions.cpp
index 03c66a8c2..71e0e972e 100644
--- a/src/actions/actions.cpp
+++ b/src/actions/actions.cpp
@@ -36,7 +36,8 @@
#include "being/localplayer.h"
#include "being/playerinfo.h"
-#include "gui/dialogtype.h"
+#include "enums/gui/dialogtype.h"
+
#include "gui/gui.h"
#include "gui/popupmanager.h"
#include "gui/sdlinput.h"
diff --git a/src/client.cpp b/src/client.cpp
index 8b70c084f..14f9a784c 100644
--- a/src/client.cpp
+++ b/src/client.cpp
@@ -47,12 +47,13 @@
#include "being/playerinfo.h"
#include "being/playerrelations.h"
+#include "enums/gui/dialogtype.h"
+
#include "input/inputmanager.h"
#include "input/joystick.h"
#include "input/keyboardconfig.h"
#include "gui/dialogsmanager.h"
-#include "gui/dialogtype.h"
#include "gui/gui.h"
#include "gui/skin.h"
#include "gui/popupmanager.h"
diff --git a/src/gui/dialogtype.h b/src/enums/gui/dialogtype.h
index 808ae0ca3..3a801c8eb 100644
--- a/src/gui/dialogtype.h
+++ b/src/enums/gui/dialogtype.h
@@ -20,8 +20,8 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-#ifndef GUI_DIALOGTYPE_H
-#define GUI_DIALOGTYPE_H
+#ifndef ENUMS_GUI_DIALOGTYPE_H
+#define ENUMS_GUI_DIALOGTYPE_H
#undef ERROR
@@ -35,4 +35,4 @@ namespace DialogType
};
}
-#endif // GUI_DIALOGTYPE_H
+#endif // ENUMS_GUI_DIALOGTYPE_H
diff --git a/src/gamemodifiers.cpp b/src/gamemodifiers.cpp
index 8dff23e8d..8d97c94e8 100644
--- a/src/gamemodifiers.cpp
+++ b/src/gamemodifiers.cpp
@@ -26,7 +26,8 @@
#include "being/localplayer.h"
-#include "gui/dialogtype.h"
+#include "enums/gui/dialogtype.h"
+
#include "gui/viewport.h"
#include "gui/windows/chatwindow.h"
diff --git a/src/gui/dialogsmanager.cpp b/src/gui/dialogsmanager.cpp
index 6ec6d4728..cb9381738 100644
--- a/src/gui/dialogsmanager.cpp
+++ b/src/gui/dialogsmanager.cpp
@@ -27,7 +27,7 @@
#include "being/attributes.h"
-#include "gui/dialogtype.h"
+#include "enums/gui/dialogtype.h"
#include "gui/widgets/selldialog.h"
diff --git a/src/gui/widgets/tabs/setup_input.cpp b/src/gui/widgets/tabs/setup_input.cpp
index 9f026787a..c13c3d1ce 100644
--- a/src/gui/widgets/tabs/setup_input.cpp
+++ b/src/gui/widgets/tabs/setup_input.cpp
@@ -25,6 +25,8 @@
#include "configuration.h"
+#include "enums/gui/dialogtype.h"
+
#include "input/inputmanager.h"
#include "input/keyboardconfig.h"
@@ -33,7 +35,6 @@
#include "input/pages/outfits.h"
#include "input/pages/shortcuts.h"
-#include "gui/dialogtype.h"
#include "gui/gui.h"
#include "gui/setupinputpages.h"
diff --git a/src/gui/widgets/tabs/setup_theme.cpp b/src/gui/widgets/tabs/setup_theme.cpp
index f983becbc..47d985a3e 100644
--- a/src/gui/widgets/tabs/setup_theme.cpp
+++ b/src/gui/widgets/tabs/setup_theme.cpp
@@ -22,7 +22,8 @@
#include "gui/widgets/tabs/setup_theme.h"
-#include "gui/dialogtype.h"
+#include "enums/gui/dialogtype.h"
+
#include "gui/gui.h"
#include "gui/themeinfo.h"
diff --git a/src/gui/widgets/tabs/setup_video.cpp b/src/gui/widgets/tabs/setup_video.cpp
index a6c8ab807..696927b6b 100644
--- a/src/gui/widgets/tabs/setup_video.cpp
+++ b/src/gui/widgets/tabs/setup_video.cpp
@@ -26,7 +26,8 @@
#include "graphicsmanager.h"
-#include "gui/dialogtype.h"
+#include "enums/gui/dialogtype.h"
+
#include "gui/windowmanager.h"
#include "gui/windows/okdialog.h"
diff --git a/src/gui/windows/changeemaildialog.cpp b/src/gui/windows/changeemaildialog.cpp
index c6231d0e0..550e3c941 100644
--- a/src/gui/windows/changeemaildialog.cpp
+++ b/src/gui/windows/changeemaildialog.cpp
@@ -24,7 +24,7 @@
#include "client.h"
-#include "gui/dialogtype.h"
+#include "enums/gui/dialogtype.h"
#include "gui/windows/okdialog.h"
diff --git a/src/gui/windows/changepassworddialog.cpp b/src/gui/windows/changepassworddialog.cpp
index 43200396b..9c2abef21 100644
--- a/src/gui/windows/changepassworddialog.cpp
+++ b/src/gui/windows/changepassworddialog.cpp
@@ -24,7 +24,7 @@
#include "client.h"
-#include "gui/dialogtype.h"
+#include "enums/gui/dialogtype.h"
#include "gui/windows/okdialog.h"
diff --git a/src/gui/windows/charcreatedialog.cpp b/src/gui/windows/charcreatedialog.cpp
index fa52d2227..64346eabe 100644
--- a/src/gui/windows/charcreatedialog.cpp
+++ b/src/gui/windows/charcreatedialog.cpp
@@ -27,7 +27,7 @@
#include "input/inputaction.h"
-#include "gui/dialogtype.h"
+#include "enums/gui/dialogtype.h"
#include "gui/windows/okdialog.h"
diff --git a/src/gui/windows/charselectdialog.cpp b/src/gui/windows/charselectdialog.cpp
index b6bc5c83e..51204bf4f 100644
--- a/src/gui/windows/charselectdialog.cpp
+++ b/src/gui/windows/charselectdialog.cpp
@@ -33,7 +33,7 @@
#include "listeners/charrenamelistener.h"
#include "listeners/pincodelistener.h"
-#include "gui/dialogtype.h"
+#include "enums/gui/dialogtype.h"
#include "gui/windows/charcreatedialog.h"
#include "gui/windows/chardeleteconfirm.h"
diff --git a/src/gui/windows/editserverdialog.cpp b/src/gui/windows/editserverdialog.cpp
index 99afa980f..7a33d9a99 100644
--- a/src/gui/windows/editserverdialog.cpp
+++ b/src/gui/windows/editserverdialog.cpp
@@ -23,7 +23,7 @@
#include "input/inputaction.h"
-#include "gui/dialogtype.h"
+#include "enums/gui/dialogtype.h"
#include "gui/models/typelistmodel.h"
diff --git a/src/gui/windows/okdialog.cpp b/src/gui/windows/okdialog.cpp
index 1ff6af472..a1601dddb 100644
--- a/src/gui/windows/okdialog.cpp
+++ b/src/gui/windows/okdialog.cpp
@@ -25,7 +25,7 @@
#include "soundconsts.h"
#include "soundmanager.h"
-#include "gui/dialogtype.h"
+#include "enums/gui/dialogtype.h"
#include "gui/widgets/button.h"
#include "gui/widgets/textbox.h"
diff --git a/src/gui/windows/registerdialog.cpp b/src/gui/windows/registerdialog.cpp
index ad9b7d9aa..fdddfec6f 100644
--- a/src/gui/windows/registerdialog.cpp
+++ b/src/gui/windows/registerdialog.cpp
@@ -28,7 +28,7 @@
#include "listeners/wrongdatanoticelistener.h"
-#include "gui/dialogtype.h"
+#include "enums/gui/dialogtype.h"
#include "gui/windows/okdialog.h"
diff --git a/src/gui/windows/socialwindow.cpp b/src/gui/windows/socialwindow.cpp
index 095681e8c..d742a0186 100644
--- a/src/gui/windows/socialwindow.cpp
+++ b/src/gui/windows/socialwindow.cpp
@@ -28,7 +28,7 @@
#include "being/localplayer.h"
#include "being/playerrelations.h"
-#include "gui/dialogtype.h"
+#include "enums/gui/dialogtype.h"
#include "gui/windows/confirmdialog.h"
#include "gui/windows/okdialog.h"
diff --git a/src/gui/windows/unregisterdialog.cpp b/src/gui/windows/unregisterdialog.cpp
index f9bc72046..9174a0a65 100644
--- a/src/gui/windows/unregisterdialog.cpp
+++ b/src/gui/windows/unregisterdialog.cpp
@@ -24,7 +24,7 @@
#include "client.h"
-#include "gui/dialogtype.h"
+#include "enums/gui/dialogtype.h"
#include "gui/windows/okdialog.h"
diff --git a/src/net/ea/charserverhandler.cpp b/src/net/ea/charserverhandler.cpp
index 2e1e3b262..0d7117a21 100644
--- a/src/net/ea/charserverhandler.cpp
+++ b/src/net/ea/charserverhandler.cpp
@@ -24,7 +24,7 @@
#include "client.h"
-#include "gui/dialogtype.h"
+#include "enums/gui/dialogtype.h"
#include "gui/windows/charcreatedialog.h"
#include "gui/windows/okdialog.h"
diff --git a/src/net/ea/gamehandler.cpp b/src/net/ea/gamehandler.cpp
index bc829418e..609132959 100644
--- a/src/net/ea/gamehandler.cpp
+++ b/src/net/ea/gamehandler.cpp
@@ -26,7 +26,7 @@
#include "game.h"
#include "notifymanager.h"
-#include "gui/dialogtype.h"
+#include "enums/gui/dialogtype.h"
#include "gui/windows/okdialog.h"
diff --git a/src/net/eathena/charserverhandler.cpp b/src/net/eathena/charserverhandler.cpp
index 924e42844..2becc5c35 100644
--- a/src/net/eathena/charserverhandler.cpp
+++ b/src/net/eathena/charserverhandler.cpp
@@ -28,7 +28,7 @@
#include "being/attributes.h"
-#include "gui/dialogtype.h"
+#include "enums/gui/dialogtype.h"
#include "gui/windows/charcreatedialog.h"
#include "gui/windows/charselectdialog.h"
diff --git a/src/net/tmwa/charserverhandler.cpp b/src/net/tmwa/charserverhandler.cpp
index 68d7c77ea..53c368f03 100644
--- a/src/net/tmwa/charserverhandler.cpp
+++ b/src/net/tmwa/charserverhandler.cpp
@@ -28,7 +28,7 @@
#include "being/attributes.h"
-#include "gui/dialogtype.h"
+#include "enums/gui/dialogtype.h"
#include "gui/windows/charcreatedialog.h"
#include "gui/windows/okdialog.h"
generated by cgit v1.2.3-60-g2f50 (git 2.42.0) at 2024-07-03 10:56:41 +0000