From 47f5c61087e4004c612e6b40eda2146ac71136fb Mon Sep 17 00:00:00 2001 From: Daniel Albers Date: Thu, 13 Aug 2009 00:45:00 +0200 Subject: [PATCH] change highlight regexp boundaries from \b to \W fixes #708 \b is between \w\W or \W\w, therefore doesn't match "^nickname^ something" due to "^ " being \W\W characters --- src/qtui/qtuimessageprocessor.cpp | 7 ++++--- 1 files changed, 4 insertions(+), 3 deletions(-) diff --git a/src/qtui/qtuimessageprocessor.cpp b/src/qtui/qtuimessageprocessor.cpp index 353928a..e0d7eeb 100644 --- a/src/qtui/qtuimessageprocessor.cpp +++ b/src/qtui/qtuimessageprocessor.cpp @@ -119,8 +119,9 @@ void QtUiMessageProcessor::checkForHighlight(Message &msg) { 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); + qDebug() << nickname << QRegExp::escape(nickname); + QRegExp nickRegExp("(^|\\W)" + QRegExp::escape(nickname) + "(\\W|$)", _nicksCaseSensitive ? Qt::CaseSensitive : Qt::CaseInsensitive); + qDebug() << nickRegExp; if(nickRegExp.indexIn(msg.contents()) >= 0) { msg.setFlags(msg.flags() | Message::Highlight); return; @@ -137,7 +138,7 @@ void QtUiMessageProcessor::checkForHighlight(Message &msg) { 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) { -- 1.6.0.4