projects
/
quassel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fixing custom highlights, thanks to Zarin for finding the bug
[quassel.git]
/
src
/
qtui
/
qtuimessageprocessor.cpp
diff --git
a/src/qtui/qtuimessageprocessor.cpp
b/src/qtui/qtuimessageprocessor.cpp
index
095b3e6
..
ac98bc8
100644
(file)
--- a/
src/qtui/qtuimessageprocessor.cpp
+++ b/
src/qtui/qtuimessageprocessor.cpp
@@
-151,13
+151,15
@@
void QtUiMessageProcessor::checkForHighlight(Message &msg) {
if(!rule.isEnabled)
continue;
if(!rule.isEnabled)
continue;
-
QRegExp userRegExp
;
+
bool match = false
;
if(rule.isRegExp) {
if(rule.isRegExp) {
- userRegExp = QRegExp(rule.name, rule.caseSensitive? Qt::CaseSensitive : Qt::CaseInsensitive);
+ QRegExp rx(rule.name, rule.caseSensitive? Qt::CaseSensitive : Qt::CaseInsensitive);
+ match = rx.exactMatch(msg.contents());
} else {
} else {
- userRegExp = QRegExp("\\b" + QRegExp::escape(rule.name) + "\\b", rule.caseSensitive? Qt::CaseSensitive : Qt::CaseInsensitive);
+ QRegExp rx("\\b" + QRegExp::escape(rule.name) + "\\b", rule.caseSensitive? Qt::CaseSensitive : Qt::CaseInsensitive);
+ match = (rx.indexIn(msg.contents()) >= 0);
}
}
- if(
userRegExp.exactMatch(msg.contents())
) {
+ if(
match
) {
msg.setFlags(msg.flags() | Message::Highlight);
return;
}
msg.setFlags(msg.flags() | Message::Highlight);
return;
}