livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Maintenance: More removal of code duplication - this time: processChatTypeTriggers()

meow-7.2.2
Ansariel 2015-11-12 10:12:39 +01:00
parent d9c391a2c9
commit b951290955
4 changed files with 5 additions and 46 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

45
indra/newview/fsfloaternearbychat.cpp
View File

@ -81,16 +81,6 @@ void send_chat_from_nearby_floater(std::string utf8_out_text, EChatType type, S3
// [/RLVa:KB]
void really_send_chat_from_nearby_floater(std::string utf8_out_text, EChatType type, S32 channel);
struct LLChatTypeTrigger {
std::string name;
EChatType type;
};
static LLChatTypeTrigger sChatTypeTriggers[] = {
{ "/whisper" , CHAT_TYPE_WHISPER},
{ "/shout" , CHAT_TYPE_SHOUT}
};
FSFloaterNearbyChat::FSFloaterNearbyChat(const LLSD& key)
: LLFloater(key)
,mChatHistory(NULL)
@ -693,6 +683,7 @@ BOOL FSFloaterNearbyChat::handleKeyHere( KEY key, MASK mask )
}
else if (mask == (MASK_SHIFT | MASK_CONTROL))
{
// linefeed
if (!gSavedSettings.getBOOL("FSUseSingleLineChatEntry"))
{
if ((wstring_utf8_length(mInputEditor->getWText()) + wchar_utf8_length('\n')) > mInputEditor->getMaxTextLength())
@ -746,38 +737,6 @@ void FSFloaterNearbyChat::reshapeChatLayoutPanel()
mChatLayoutPanel->reshape(mChatLayoutPanel->getRect().getWidth(), mInputEditor->getRect().getHeight() + mInputEditorPad, FALSE);
}
EChatType FSFloaterNearbyChat::processChatTypeTriggers(EChatType type, std::string &str)
{
U32 length = str.length();
S32 cnt = sizeof(sChatTypeTriggers) / sizeof(*sChatTypeTriggers);
for (S32 n = 0; n < cnt; n++)
{
if (length >= sChatTypeTriggers[n].name.length())
{
std::string trigger = str.substr(0, sChatTypeTriggers[n].name.length());
if (!LLStringUtil::compareInsensitive(trigger, sChatTypeTriggers[n].name))
{
U32 trigger_length = sChatTypeTriggers[n].name.length();
// It's to remove space after trigger name
if (length > trigger_length && str[trigger_length] == ' ')
trigger_length++;
str = str.substr(trigger_length, length);
if (CHAT_TYPE_NORMAL == type)
return sChatTypeTriggers[n].type;
else
break;
}
}
}
return type;
}
void FSFloaterNearbyChat::sendChat( EChatType type )
{
if (mInputEditor)
@ -839,7 +798,7 @@ void FSFloaterNearbyChat::sendChat( EChatType type )
nType = type;
}
type = processChatTypeTriggers(nType, utf8_revised_text);
type = FSNearbyChat::processChatTypeTriggers(nType, utf8_revised_text);
if (!utf8_revised_text.empty() && cmd_line_chat(utf8_revised_text, type))
{

1
indra/newview/fsfloaternearbychat.h
View File

@ -111,7 +111,6 @@ protected:
void onChatBoxCommit();
void onChatTypeChanged();
EChatType processChatTypeTriggers(EChatType type, std::string &str);
void reshapeFloater(bool collapse);
void reshapeChatLayoutPanel();

3
indra/newview/fsnearbychathub.cpp
View File

@ -65,7 +65,7 @@ struct LLChatTypeTrigger {
static LLChatTypeTrigger sChatTypeTriggers[] = {
{ "/whisper" , CHAT_TYPE_WHISPER},
{ "/shout" , CHAT_TYPE_SHOUT}
{ "/shout" , CHAT_TYPE_SHOUT}
};
S32 FSNearbyChat::sLastSpecialChatChannel = 0;
@ -318,6 +318,7 @@ void FSNearbyChat::sendChatFromViewer(const LLWString& wtext, EChatType type, BO
send_chat_from_viewer(utf8_out_text, type, channel);
}
// static
EChatType FSNearbyChat::processChatTypeTriggers(EChatType type, std::string &str)
{
U32 length = str.length();

2
indra/newview/fsnearbychathub.h
View File

@ -57,7 +57,7 @@ public:
void sendChat(LLWString text, EChatType type);
static LLWString stripChannelNumber(const LLWString &mesg, S32* channel, S32* last_channel, bool* is_set);
EChatType processChatTypeTriggers(EChatType type, std::string &str);
static EChatType processChatTypeTriggers(EChatType type, std::string &str);
void sendChatFromViewer(const std::string& utf8text, EChatType type, BOOL animate);
void sendChatFromViewer(const LLWString& wtext, EChatType type, BOOL animate);