Core: ported headers cleanup from master branch

1 files changed, 10 insertions, 17 deletions

diff --git a/src/server/game/Texts/ChatTextBuilder.h b/src/server/game/Texts/ChatTextBuilder.h
index c913e177894..1fe51dc7258 100644
--- a/src/server/game/Texts/ChatTextBuilder.h
+++ b/src/server/game/Texts/ChatTextBuilder.h
@@ -18,8 +18,13 @@
 #ifndef __CHATTEXT_BUILDER_H
 #define __CHATTEXT_BUILDER_H
 
-#include "Chat.h"
-#include "ObjectMgr.h"
+#include "Common.h"
+#include "SharedDefines.h"
+#include <string>
+
+class Unit;
+class WorldObject;
+class WorldPacket;
 
 namespace Trinity
 {
@@ -29,17 +34,8 @@ namespace Trinity
             BroadcastTextBuilder(Unit const* obj, ChatMsg msgType, uint32 textId, WorldObject const* target = nullptr, uint32 achievementId = 0)
                 : _source(obj), _msgType(msgType), _textId(textId), _target(target), _achievementId(achievementId) { }
 
-            void operator()(WorldPacket& data, LocaleConstant locale)
-            {
-                BroadcastText const* bct = sObjectMgr->GetBroadcastText(_textId);
-                ChatHandler::BuildChatPacket(data, _msgType, bct ? Language(bct->Language) : LANG_UNIVERSAL, _source, _target, bct ? bct->GetText(locale, _source->getGender()) : "", _achievementId, "", locale);
-            }
-
-            size_t operator()(WorldPacket* data, LocaleConstant locale) const
-            {
-                BroadcastText const* bct = sObjectMgr->GetBroadcastText(_textId);
-                return ChatHandler::BuildChatPacket(*data, _msgType, bct ? Language(bct->Language) : LANG_UNIVERSAL, _source, _target, bct ? bct->GetText(locale, _source->getGender()) : "", _achievementId, "", locale);
-            }
+            void operator()(WorldPacket& data, LocaleConstant locale) const;
+            size_t operator()(WorldPacket* data, LocaleConstant locale) const;
 
         private:
             Unit const* _source;
@@ -55,10 +51,7 @@ namespace Trinity
             CustomChatTextBuilder(WorldObject const* obj, ChatMsg msgType, std::string const& text, Language language = LANG_UNIVERSAL, WorldObject const* target = nullptr)
                 : _source(obj), _msgType(msgType), _text(text), _language(language), _target(target) { }
 
-            void operator()(WorldPacket& data, LocaleConstant locale)
-            {
-                ChatHandler::BuildChatPacket(data, _msgType, _language, _source, _target, _text, 0, "", locale);
-            }
+            void operator()(WorldPacket& data, LocaleConstant locale) const;
 
         private:
             WorldObject const* _source;