From: Daniel Albers <daniel@lbers.com>
Date: Wed, 23 Sep 2009 19:05:23 +0000 (+0200)
Subject: don't require regex highlights to match whole line
X-Git-Tag: 0.5-rc2~15
X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=commitdiff_plain;h=de7b3d6260c8e6a38738d9dc63517944ffaa7155;ds=sidebyside

don't require regex highlights to match whole line
---

diff --git a/src/qtui/qtuimessageprocessor.cpp b/src/qtui/qtuimessageprocessor.cpp
index 336a18d1..a80dcd29 100644
--- a/src/qtui/qtuimessageprocessor.cpp
+++ b/src/qtui/qtuimessageprocessor.cpp
@@ -131,14 +131,13 @@ void QtUiMessageProcessor::checkForHighlight(Message &msg) {
       if(!rule.isEnabled)
 	continue;
 
-      bool match = false;
+      QRegExp rx;
       if(rule.isRegExp) {
-        QRegExp rx(rule.name, rule.caseSensitive? Qt::CaseSensitive : Qt::CaseInsensitive);
-        match = rx.exactMatch(msg.contents());
+        rx = QRegExp(rule.name, rule.caseSensitive? Qt::CaseSensitive : Qt::CaseInsensitive);
       } else {
-        QRegExp rx("(^|\\W)" + QRegExp::escape(rule.name) + "(\\W|$)", rule.caseSensitive? Qt::CaseSensitive : Qt::CaseInsensitive);
-        match = (rx.indexIn(msg.contents()) >= 0);
+        rx = QRegExp("(^|\\W)" + QRegExp::escape(rule.name) + "(\\W|$)", rule.caseSensitive? Qt::CaseSensitive : Qt::CaseInsensitive);
       }
+      bool match = (rx.indexIn(msg.contents()) >= 0);
       if(match) {
         msg.setFlags(msg.flags() | Message::Highlight);
         return;