From: Marcus Eggenberger Date: Fri, 8 Feb 2008 20:10:49 +0000 (+0000) Subject: highlight respects now word boundaries. thx int X-Git-Tag: 0.2.0-alpha1~92 X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=commitdiff_plain;h=3bb86923bd1b39089abacc4fcb08bb4939ab70e0;hp=4604f6d6f0daa7980e36753b2a417ab709d9ce6a highlight respects now word boundaries. thx int --- diff --git a/src/client/networkmodel.cpp b/src/client/networkmodel.cpp index 71b586e7..8cf95bb6 100644 --- a/src/client/networkmodel.cpp +++ b/src/client/networkmodel.cpp @@ -758,9 +758,13 @@ void NetworkModel::updateBufferActivity(const Message &msg) { if(msg.type() == Message::Plain || msg.type() == Message::Notice) level |= BufferItem::NewMessage; + const Network *net = Client::network(msg.bufferInfo().networkId()); - if(net && (msg.type() == Message::Plain || msg.type() == Message::Notice || msg.type() == Message::Action) && msg.text().contains(net->myNick())) - level |= BufferItem::Highlight; + if(net) { + QRegExp nickRegExp("^(.*\\W)?"+net->myNick()+"(\\W.*)?$"); + if((msg.type() == Message::Plain || msg.type() == Message::Notice || msg.type() == Message::Action) && nickRegExp.exactMatch(msg.text())) + level |= BufferItem::Highlight; + } bufferItem(msg.bufferInfo())->updateActivity(level); }