diff options
author | Andrei Karas <akaras@inbox.ru> | 2015-05-24 22:04:29 +0300 |
---|---|---|
committer | Andrei Karas <akaras@inbox.ru> | 2015-05-24 22:04:29 +0300 |
commit | 7ae8a11e0e99ab28730a8ca98388a6ec0ea1923e (patch) | |
tree | 6b440c246a9ed2c3d915c98f6b090a45673a2fb7 /src/gui/widgets | |
parent | 860d3e8e1bbe99b77763d533aebba9fde01e74c6 (diff) | |
download | manaplus-7ae8a11e0e99ab28730a8ca98388a6ec0ea1923e.tar.gz manaplus-7ae8a11e0e99ab28730a8ca98388a6ec0ea1923e.tar.bz2 manaplus-7ae8a11e0e99ab28730a8ca98388a6ec0ea1923e.tar.xz manaplus-7ae8a11e0e99ab28730a8ca98388a6ec0ea1923e.zip |
Add strong typed bool type TryRemoveColors.
Diffstat (limited to 'src/gui/widgets')
-rw-r--r-- | src/gui/widgets/tabs/chat/chattab.cpp | 7 | ||||
-rw-r--r-- | src/gui/widgets/tabs/chat/chattab.h | 4 |
2 files changed, 7 insertions, 4 deletions
diff --git a/src/gui/widgets/tabs/chat/chattab.cpp b/src/gui/widgets/tabs/chat/chattab.cpp index 072ab677e..dd2ff9a54 100644 --- a/src/gui/widgets/tabs/chat/chattab.cpp +++ b/src/gui/widgets/tabs/chat/chattab.cpp @@ -109,7 +109,7 @@ ChatTab::~ChatTab() void ChatTab::chatLog(std::string line, ChatMsgType::Type own, const IgnoreRecord ignoreRecord, - const bool tryRemoveColors) + const TryRemoveColors tryRemoveColors) { // Trim whitespace trim(line); @@ -117,7 +117,8 @@ void ChatTab::chatLog(std::string line, if (line.empty()) return; - if (tryRemoveColors && own == ChatMsgType::BY_OTHER && + if (tryRemoveColors == TryRemoveColors_true && + own == ChatMsgType::BY_OTHER && config.getBoolValue("removeColors")) { line = removeColors(line); @@ -364,7 +365,7 @@ void ChatTab::chatLog(const std::string &nick, std::string msg) chatLog(std::string(nick).append(" : ").append(msg), byWho, IgnoreRecord_false, - false); + TryRemoveColors_false); } void ChatTab::chatInput(const std::string &message) diff --git a/src/gui/widgets/tabs/chat/chattab.h b/src/gui/widgets/tabs/chat/chattab.h index 7af3920ef..6eee19b9d 100644 --- a/src/gui/widgets/tabs/chat/chattab.h +++ b/src/gui/widgets/tabs/chat/chattab.h @@ -27,6 +27,7 @@ #include "enums/simpletypes/ignorerecord.h" #include "enums/simpletypes/online.h" +#include "enums/simpletypes/tryremovecolors.h" #include "gui/widgets/browserbox.h" @@ -81,7 +82,8 @@ class ChatTab notfinal : public Tab void chatLog(std::string line, ChatMsgType::Type own = ChatMsgType::BY_SERVER, const IgnoreRecord ignoreRecord = IgnoreRecord_false, - const bool tryRemoveColors = true); + const TryRemoveColors tryRemoveColors + = TryRemoveColors_true); /** * Adds the text to the message list |