change highlight regexp boundaries from \b to \W

[quassel.git] / src / qtui / qtuimessageprocessor.cpp

diff --git a/src/qtui/qtuimessageprocessor.cpp b/src/qtui/qtuimessageprocessor.cpp
index 353928a..e245a7b 100644 (file)
--- a/src/qtui/qtuimessageprocessor.cpp
+++ b/src/qtui/qtuimessageprocessor.cpp
@@ -119,8 +119,7 @@ void QtUiMessageProcessor::checkForHighlight(Message &msg) {
         nickList.prepend(net->myNick());
     }
     foreach(QString nickname, nickList) {
         nickList.prepend(net->myNick());
     }
     foreach(QString nickname, nickList) {

-      QRegExp nickRegExp("\\b" + QRegExp::escape(nickname) + "(\\W|\\b|$)", // + "\\b", this does not seem to work for trailing ` -> upstream bug?
-                          _nicksCaseSensitive ? Qt::CaseSensitive : Qt::CaseInsensitive);
+      QRegExp nickRegExp("(^|\\W)" + QRegExp::escape(nickname) + "(\\W|$)", _nicksCaseSensitive ? Qt::CaseSensitive : Qt::CaseInsensitive);

       if(nickRegExp.indexIn(msg.contents()) >= 0) {
         msg.setFlags(msg.flags() | Message::Highlight);
         return;
       if(nickRegExp.indexIn(msg.contents()) >= 0) {
         msg.setFlags(msg.flags() | Message::Highlight);
         return;


@@ -137,7 +136,7 @@ void QtUiMessageProcessor::checkForHighlight(Message &msg) {
         QRegExp rx(rule.name, rule.caseSensitive? Qt::CaseSensitive : Qt::CaseInsensitive);
         match = rx.exactMatch(msg.contents());
       } else {
         QRegExp rx(rule.name, rule.caseSensitive? Qt::CaseSensitive : Qt::CaseInsensitive);
         match = rx.exactMatch(msg.contents());
       } else {

-        QRegExp rx("\\b" + QRegExp::escape(rule.name) + "\\b", rule.caseSensitive? Qt::CaseSensitive : Qt::CaseInsensitive);
+        QRegExp rx("\\W" + QRegExp::escape(rule.name) + "\\W", rule.caseSensitive? Qt::CaseSensitive : Qt::CaseInsensitive);

         match = (rx.indexIn(msg.contents()) >= 0);
       }
       if(match) {
         match = (rx.indexIn(msg.contents()) >= 0);
       }
       if(match) {