summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/CMakeLists.txt1
-rw-r--r--src/Makefile.am1
-rw-r--r--src/actions/chat.cpp2
-rw-r--r--src/actions/commands.cpp3
-rw-r--r--src/actions/pets.cpp2
-rw-r--r--src/const/gui/chat.h (renamed from src/gui/chatconsts.h)6
-rw-r--r--src/game.cpp3
-rw-r--r--src/gui/widgets/tabs/chat/gmtab.cpp5
-rw-r--r--src/gui/widgets/tabs/chat/tradetab.cpp2
-rw-r--r--src/gui/windows/chatwindow.cpp3
-rw-r--r--src/gui/windows/shopwindow.cpp2
-rw-r--r--src/net/ea/adminhandler.cpp2
-rw-r--r--src/net/eathena/chatrecv.cpp4
-rw-r--r--src/net/tmwa/adminhandler.cpp2
-rw-r--r--src/net/tmwa/chathandler.cpp2
-rw-r--r--src/net/tmwa/chatrecv.cpp2
-rw-r--r--src/net/tmwa/pethandler.cpp2
-rw-r--r--src/utils/chatutils.cpp2
18 files changed, 26 insertions, 20 deletions
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index f5434822f..47a15746c 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -913,6 +913,7 @@ SET(SRCS
const/equipment.h
const/spells.h
const/utils/timer.h
+ const/gui/chat.h
const/gui/theme.h
const/render/graphics.h
render/graphics.cpp
diff --git a/src/Makefile.am b/src/Makefile.am
index 1fe9b4f89..eb452277d 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -475,6 +475,7 @@ SRC += events/actionevent.h \
const/equipment.h \
const/spells.h \
const/utils/timer.h \
+ const/gui/chat.h \
const/gui/theme.h \
const/render/graphics.h \
render/graphics.cpp \
diff --git a/src/actions/chat.cpp b/src/actions/chat.cpp
index 4c77787ab..42d16ee22 100644
--- a/src/actions/chat.cpp
+++ b/src/actions/chat.cpp
@@ -24,7 +24,7 @@
#include "actions/actiondef.h"
-#include "gui/chatconsts.h"
+#include "const/gui/chat.h"
#include "gui/windows/chatwindow.h"
diff --git a/src/actions/commands.cpp b/src/actions/commands.cpp
index cea0bdc67..6f2d49b77 100644
--- a/src/actions/commands.cpp
+++ b/src/actions/commands.cpp
@@ -36,7 +36,8 @@
#include "being/playerinfo.h"
#include "being/playerrelations.h"
-#include "gui/chatconsts.h"
+#include "const/gui/chat.h"
+
#include "gui/viewport.h"
#include "gui/windows/chatwindow.h"
diff --git a/src/actions/pets.cpp b/src/actions/pets.cpp
index 6b141bddb..826d5ad84 100644
--- a/src/actions/pets.cpp
+++ b/src/actions/pets.cpp
@@ -31,7 +31,7 @@
#include "enums/being/beingdirection.h"
-#include "gui/chatconsts.h"
+#include "const/gui/chat.h"
#include "input/inputactionoperators.h"
diff --git a/src/gui/chatconsts.h b/src/const/gui/chat.h
index 8028962c6..dc3f101fe 100644
--- a/src/gui/chatconsts.h
+++ b/src/const/gui/chat.h
@@ -20,8 +20,8 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-#ifndef GUI_CHATCONSTS_H
-#define GUI_CHATCONSTS_H
+#ifndef CONST_GUI_CHAT_H
+#define CONST_GUI_CHAT_H
#include <string>
@@ -29,4 +29,4 @@ const std::string GENERAL_CHANNEL = "";
const std::string GM_CHANNEL = "#gm";
const std::string TRADE_CHANNEL = "#trade";
-#endif // GUI_CHATCONSTS_H
+#endif // CONST_GUI_CHAT_H
diff --git a/src/game.cpp b/src/game.cpp
index 94bb4a8fd..a8a13e0dc 100644
--- a/src/game.cpp
+++ b/src/game.cpp
@@ -43,6 +43,8 @@
#include "const/spells.h"
+#include "const/gui/chat.h"
+
#include "enums/being/beingdirection.h"
#include "particle/particle.h"
@@ -51,7 +53,6 @@
#include "input/joystick.h"
#include "input/keyboardconfig.h"
-#include "gui/chatconsts.h"
#include "gui/dialogsmanager.h"
#include "gui/gui.h"
#include "gui/popupmanager.h"
diff --git a/src/gui/widgets/tabs/chat/gmtab.cpp b/src/gui/widgets/tabs/chat/gmtab.cpp
index a54798fc5..28dfe4e8c 100644
--- a/src/gui/widgets/tabs/chat/gmtab.cpp
+++ b/src/gui/widgets/tabs/chat/gmtab.cpp
@@ -20,13 +20,14 @@
#include "gui/widgets/tabs/chat/gmtab.h"
-#include "gui/chatconsts.h"
-#include "net/chathandler.h"
+#include "const/gui/chat.h"
#include "gui/windows/chatwindow.h"
#include "utils/gettext.h"
+#include "net/chathandler.h"
+
#include "debug.h"
GmTab *gmChatTab = nullptr;
diff --git a/src/gui/widgets/tabs/chat/tradetab.cpp b/src/gui/widgets/tabs/chat/tradetab.cpp
index 414c97d9d..44c5cd9f0 100644
--- a/src/gui/widgets/tabs/chat/tradetab.cpp
+++ b/src/gui/widgets/tabs/chat/tradetab.cpp
@@ -22,7 +22,7 @@
#include "gui/widgets/tabs/chat/tradetab.h"
-#include "gui/chatconsts.h"
+#include "const/gui/chat.h"
#include "gui/windows/chatwindow.h"
diff --git a/src/gui/windows/chatwindow.cpp b/src/gui/windows/chatwindow.cpp
index c08454623..d290a41a4 100644
--- a/src/gui/windows/chatwindow.cpp
+++ b/src/gui/windows/chatwindow.cpp
@@ -34,9 +34,10 @@
#include "being/playerinfo.h"
#include "being/playerrelations.h"
+#include "const/gui/chat.h"
+
#include "input/inputmanager.h"
-#include "gui/chatconsts.h"
#include "gui/focushandler.h"
#include "gui/gui.h"
#include "gui/skin.h"
diff --git a/src/gui/windows/shopwindow.cpp b/src/gui/windows/shopwindow.cpp
index 3eff4682b..19a7e31b8 100644
--- a/src/gui/windows/shopwindow.cpp
+++ b/src/gui/windows/shopwindow.cpp
@@ -29,7 +29,7 @@
#include "gui/windows/shopselldialog.h"
#include "gui/windows/tradewindow.h"
-#include "gui/chatconsts.h"
+#include "const/gui/chat.h"
#endif
#ifdef EATHENA_SUPPORT
diff --git a/src/net/ea/adminhandler.cpp b/src/net/ea/adminhandler.cpp
index bccd2062d..85a7dc316 100644
--- a/src/net/ea/adminhandler.cpp
+++ b/src/net/ea/adminhandler.cpp
@@ -24,7 +24,7 @@
#include "game.h"
-#include "gui/chatconsts.h"
+#include "const/gui/chat.h"
#include "net/chathandler.h"
#include "net/serverfeatures.h"
diff --git a/src/net/eathena/chatrecv.cpp b/src/net/eathena/chatrecv.cpp
index 40281384a..b23216643 100644
--- a/src/net/eathena/chatrecv.cpp
+++ b/src/net/eathena/chatrecv.cpp
@@ -30,9 +30,9 @@
#include "being/playerrelation.h"
#include "being/playerrelations.h"
-#include "enums/resources/notifytypes.h"
+#include "const/gui/chat.h"
-#include "gui/chatconsts.h"
+#include "enums/resources/notifytypes.h"
#include "gui/windows/chatwindow.h"
diff --git a/src/net/tmwa/adminhandler.cpp b/src/net/tmwa/adminhandler.cpp
index b5d032e72..ef0ab0a6e 100644
--- a/src/net/tmwa/adminhandler.cpp
+++ b/src/net/tmwa/adminhandler.cpp
@@ -22,7 +22,7 @@
#include "net/tmwa/adminhandler.h"
-#include "gui/chatconsts.h"
+#include "const/gui/chat.h"
#include "net/chathandler.h"
diff --git a/src/net/tmwa/chathandler.cpp b/src/net/tmwa/chathandler.cpp
index dc0ecbab2..fbf18f64c 100644
--- a/src/net/tmwa/chathandler.cpp
+++ b/src/net/tmwa/chathandler.cpp
@@ -24,7 +24,7 @@
#include "being/localplayer.h"
-#include "gui/chatconsts.h"
+#include "const/gui/chat.h"
#include "net/serverfeatures.h"
diff --git a/src/net/tmwa/chatrecv.cpp b/src/net/tmwa/chatrecv.cpp
index a768dab2e..b7931df6f 100644
--- a/src/net/tmwa/chatrecv.cpp
+++ b/src/net/tmwa/chatrecv.cpp
@@ -29,7 +29,7 @@
#include "being/playerrelation.h"
#include "being/playerrelations.h"
-#include "gui/chatconsts.h"
+#include "const/gui/chat.h"
#include "gui/widgets/tabs/chat/gmtab.h"
diff --git a/src/net/tmwa/pethandler.cpp b/src/net/tmwa/pethandler.cpp
index 615fbb073..1701ab311 100644
--- a/src/net/tmwa/pethandler.cpp
+++ b/src/net/tmwa/pethandler.cpp
@@ -20,7 +20,7 @@
#include "net/tmwa/pethandler.h"
-#include "gui/chatconsts.h"
+#include "const/gui/chat.h"
#include "net/chathandler.h"
diff --git a/src/utils/chatutils.cpp b/src/utils/chatutils.cpp
index 17ee9e11a..abd8b4db7 100644
--- a/src/utils/chatutils.cpp
+++ b/src/utils/chatutils.cpp
@@ -25,7 +25,7 @@
#include "being/localplayer.h"
-#include "gui/chatconsts.h"
+#include "const/gui/chat.h"
#include "gui/widgets/tabs/chat/whispertab.h"
generated by cgit v1.2.3-70-g09d2 (git 2.46.0) at 2024-11-01 00:20:09 +0000