From 74f23fd3d0e1fb3be8e5419193d57d91746c887a Mon Sep 17 00:00:00 2001 From: Jared Adams Date: Fri, 27 Mar 2009 13:12:24 -0600 Subject: Clean up chat and chat tabs some more --- src/net/ea/buysellhandler.cpp | 5 ++--- src/net/ea/chathandler.cpp | 2 +- src/net/ea/equipmenthandler.cpp | 2 +- src/net/ea/inventoryhandler.cpp | 3 ++- src/net/ea/playerhandler.cpp | 3 ++- src/net/ea/skillhandler.cpp | 3 ++- src/net/ea/tradehandler.cpp | 3 ++- src/net/tmwserv/partyhandler.cpp | 3 ++- src/net/tmwserv/tradehandler.cpp | 3 ++- 9 files changed, 16 insertions(+), 11 deletions(-) (limited to 'src/net') diff --git a/src/net/ea/buysellhandler.cpp b/src/net/ea/buysellhandler.cpp index b99db6a4..56d6a986 100644 --- a/src/net/ea/buysellhandler.cpp +++ b/src/net/ea/buysellhandler.cpp @@ -33,12 +33,11 @@ #include "gui/buy.h" #include "gui/buysell.h" -#include "gui/chat.h" #include "gui/sell.h" -#include "utils/gettext.h" +#include "gui/widgets/chattab.h" -#include +#include "utils/gettext.h" BuySellHandler::BuySellHandler() { diff --git a/src/net/ea/chathandler.cpp b/src/net/ea/chathandler.cpp index 14432b28..6aca58a3 100644 --- a/src/net/ea/chathandler.cpp +++ b/src/net/ea/chathandler.cpp @@ -30,7 +30,7 @@ #include "game.h" #include "player_relations.h" -#include "gui/chat.h" +#include "gui/widgets/chattab.h" #include "utils/gettext.h" #include "utils/stringutils.h" diff --git a/src/net/ea/equipmenthandler.cpp b/src/net/ea/equipmenthandler.cpp index 7a287bea..f81bf7ed 100644 --- a/src/net/ea/equipmenthandler.cpp +++ b/src/net/ea/equipmenthandler.cpp @@ -31,7 +31,7 @@ #include "localplayer.h" #include "log.h" -#include "gui/chat.h" +#include "gui/widgets/chattab.h" #include "utils/gettext.h" diff --git a/src/net/ea/inventoryhandler.cpp b/src/net/ea/inventoryhandler.cpp index 21ae6dcb..5f7e6c6c 100644 --- a/src/net/ea/inventoryhandler.cpp +++ b/src/net/ea/inventoryhandler.cpp @@ -32,9 +32,10 @@ #include "localplayer.h" #include "log.h" -#include "gui/chat.h" #include "gui/storagewindow.h" +#include "gui/widgets/chattab.h" + #include "resources/iteminfo.h" #include "utils/gettext.h" diff --git a/src/net/ea/playerhandler.cpp b/src/net/ea/playerhandler.cpp index 00230ea3..bf775f51 100644 --- a/src/net/ea/playerhandler.cpp +++ b/src/net/ea/playerhandler.cpp @@ -33,7 +33,6 @@ #include "gui/buy.h" #include "gui/buysell.h" -#include "gui/chat.h" #include "gui/gui.h" #include "gui/npc_text.h" #include "gui/npcintegerdialog.h" @@ -45,6 +44,8 @@ #include "gui/storagewindow.h" #include "gui/viewport.h" +#include "gui/widgets/chattab.h" + #include "utils/stringutils.h" #include "utils/gettext.h" diff --git a/src/net/ea/skillhandler.cpp b/src/net/ea/skillhandler.cpp index fcc0f4b2..477f96bf 100644 --- a/src/net/ea/skillhandler.cpp +++ b/src/net/ea/skillhandler.cpp @@ -27,9 +27,10 @@ #include "log.h" -#include "gui/chat.h" #include "gui/skill.h" +#include "gui/widgets/chattab.h" + #include "utils/gettext.h" /** job dependend identifiers (?) */ diff --git a/src/net/ea/tradehandler.cpp b/src/net/ea/tradehandler.cpp index ea41ed70..1df02a1e 100644 --- a/src/net/ea/tradehandler.cpp +++ b/src/net/ea/tradehandler.cpp @@ -30,10 +30,11 @@ #include "localplayer.h" #include "player_relations.h" -#include "gui/chat.h" #include "gui/confirm_dialog.h" #include "gui/trade.h" +#include "gui/widgets/chattab.h" + #include "utils/gettext.h" std::string tradePartnerName; diff --git a/src/net/tmwserv/partyhandler.cpp b/src/net/tmwserv/partyhandler.cpp index dfbcea80..510eb77a 100644 --- a/src/net/tmwserv/partyhandler.cpp +++ b/src/net/tmwserv/partyhandler.cpp @@ -26,9 +26,10 @@ #include "net/messagein.h" -#include "gui/chat.h" #include "gui/partywindow.h" +#include "gui/widgets/chattab.h" + #include "log.h" #include "localplayer.h" diff --git a/src/net/tmwserv/tradehandler.cpp b/src/net/tmwserv/tradehandler.cpp index 85228355..8b3e06c6 100644 --- a/src/net/tmwserv/tradehandler.cpp +++ b/src/net/tmwserv/tradehandler.cpp @@ -30,10 +30,11 @@ #include "item.h" #include "localplayer.h" -#include "gui/chat.h" #include "gui/confirm_dialog.h" #include "gui/trade.h" +#include "gui/widgets/chattab.h" + std::string tradePartnerName; int tradePartnerID; -- cgit v1.2.3-70-g09d2