aboutsummaryrefslogtreecommitdiff
path: root/src/server/game/Chat/ChatLink.cpp
diff options
context:
space:
mode:
authorariel- <ariel-@users.noreply.github.com>2016-10-03 06:06:33 -0300
committerariel- <ariel-@users.noreply.github.com>2016-10-07 01:09:28 -0300
commit59a9bc5ca0ae81ef58107f9b24b1a92b11478fd8 (patch)
tree0ca9878358731b10a38577cf95a41220051155f6 /src/server/game/Chat/ChatLink.cpp
parent4b5e5bbd72bd12683b9fc792d9c291cad1e52c0e (diff)
Core/Channels: Revamp of channel system
* Core/Chat: general cleanup and revamping: (#17576) (fbbb03212e93591a77a1169a30fb01867cd3c0e9) * Core/Channel: restore accidentally deleted line, fixes channels not honoring ownership setting (7c714179930c8c369f124d8d1404656fff0a1199) * Channel Followup: avoid setting an invisible gm as Channel owner (#17597) (8a8362ef153eca50be0bcb5670e615b9685607fc) * Core/Channel: change the way channels are stored and sent to client, fixes multiple channels per zone when using different locales (#17980)
Diffstat (limited to 'src/server/game/Chat/ChatLink.cpp')
-rw-r--r--src/server/game/Chat/ChatLink.cpp22
1 files changed, 11 insertions, 11 deletions
diff --git a/src/server/game/Chat/ChatLink.cpp b/src/server/game/Chat/ChatLink.cpp
index 1a78b716682..1abb14a1669 100644
--- a/src/server/game/Chat/ChatLink.cpp
+++ b/src/server/game/Chat/ChatLink.cpp
@@ -70,7 +70,7 @@ inline std::string ReadSkip(std::istringstream& iss, char term)
return res;
}
-inline bool CheckDelimiter(std::istringstream& iss, char delimiter, const char* context)
+inline bool CheckDelimiter(std::istringstream& iss, char delimiter, char const* context)
{
char c = iss.peek();
if (c != delimiter)
@@ -95,7 +95,7 @@ inline bool ReadHex(std::istringstream& iss, uint32& res, uint32 length)
#define DELIMITER ':'
#define PIPE_CHAR '|'
-bool ChatLink::ValidateName(char* buffer, const char* /*context*/)
+bool ChatLink::ValidateName(char* buffer, char const* /*context*/)
{
_name = buffer;
return true;
@@ -218,11 +218,11 @@ std::string ItemChatLink::FormatName(uint8 index, LocalizedString* suffixStrings
return ss.str();
}
-bool ItemChatLink::ValidateName(char* buffer, const char* context)
+bool ItemChatLink::ValidateName(char* buffer, char const* context)
{
ChatLink::ValidateName(buffer, context);
- LocalizedString* suffixStrings = _suffix ? _suffix->Name : (_property ? _property->Name : NULL);
+ LocalizedString* suffixStrings = _suffix ? _suffix->Name : (_property ? _property->Name : nullptr);
bool res = (FormatName(LOCALE_enUS, suffixStrings) == buffer);
if (!res)
@@ -280,7 +280,7 @@ bool QuestChatLink::Initialize(std::istringstream& iss)
return true;
}
-bool QuestChatLink::ValidateName(char* buffer, const char* context)
+bool QuestChatLink::ValidateName(char* buffer, char const* context)
{
ChatLink::ValidateName(buffer, context);
@@ -321,7 +321,7 @@ bool SpellChatLink::Initialize(std::istringstream& iss)
return true;
}
-bool SpellChatLink::ValidateName(char* buffer, const char* context)
+bool SpellChatLink::ValidateName(char* buffer, char const* context)
{
ChatLink::ValidateName(buffer, context);
@@ -414,7 +414,7 @@ bool AchievementChatLink::Initialize(std::istringstream& iss)
return true;
}
-bool AchievementChatLink::ValidateName(char* buffer, const char* context)
+bool AchievementChatLink::ValidateName(char* buffer, char const* context)
{
ChatLink::ValidateName(buffer, context);
@@ -583,7 +583,7 @@ bool GlyphChatLink::Initialize(std::istringstream& iss)
return true;
}
-LinkExtractor::LinkExtractor(const char* msg) : _iss(msg) { }
+LinkExtractor::LinkExtractor(char const* msg) : _iss(msg) { }
LinkExtractor::~LinkExtractor()
{
@@ -595,19 +595,19 @@ LinkExtractor::~LinkExtractor()
bool LinkExtractor::IsValidMessage()
{
const char validSequence[6] = "cHhhr";
- const char* validSequenceIterator = validSequence;
+ char const* validSequenceIterator = validSequence;
char buffer[256];
std::istringstream::pos_type startPos = 0;
uint32 color = 0;
- ChatLink* link = NULL;
+ ChatLink* link = nullptr;
while (!_iss.eof())
{
if (validSequence == validSequenceIterator)
{
- link = NULL;
+ link = nullptr;
_iss.ignore(255, PIPE_CHAR);
startPos = _iss.tellg() - std::istringstream::pos_type(1);
}