diff options
author | Richard Maudsley <richard.maudsley@isode.com> | 2014-01-22 14:54:41 (GMT) |
---|---|---|
committer | Richard Maudsley <richard.maudsley@isode.com> | 2014-01-22 14:54:41 (GMT) |
commit | 55b9f6759ab637e9365693b3b34f04ecc211608d (patch) | |
tree | 3ca8d3d022e77b41141fa0e3d9bb818788856cc8 | |
parent | ff6103b78e16383cd4d0191ae39097496be6a65c (diff) | |
download | swift-55b9f6759ab637e9365693b3b34f04ecc211608d.zip swift-55b9f6759ab637e9365693b3b34f04ecc211608d.tar.bz2 |
More work on Highlight rules.
Change-Id: I8a3f860f6731801759f48b0160b6285ddfdfd75d
-rw-r--r-- | Swift/Controllers/HighlightRule.cpp | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/Swift/Controllers/HighlightRule.cpp b/Swift/Controllers/HighlightRule.cpp index 91bd3ab..622fbad 100644 --- a/Swift/Controllers/HighlightRule.cpp +++ b/Swift/Controllers/HighlightRule.cpp @@ -70,11 +70,12 @@ bool HighlightRule::isMatch(const std::string& body, const std::string& sender, } } - if (!matchesKeyword && nickIsKeyword_ && !nick.empty()) { - if (boost::regex_search(body, regexFromString(nick))) { - matchesKeyword = true; - } - } + /* keyword highlighting has now moved to ChatMessageParser.cpp */ + //if (!matchesKeyword && nickIsKeyword_ && !nick.empty()) { + //if (boost::regex_search(body, regexFromString(nick))) { + //matchesKeyword = true; + //} + //} foreach (const boost::regex & rx, senderRegex_) { if (boost::regex_search(sender, rx)) { |