X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fclient%2Fclient.cpp;h=6a7faa9c474b74107a6ede7b74c7a263ed8eefa9;hp=a8cc7f93c78cdfa9c8e8e6473edbdbea23c12f2d;hb=dbdca302fc349d0e3d46aa0d8091c08b2df28af5;hpb=84af2151d56be3ad799a09143e8ac2cad4388ca0 diff --git a/src/client/client.cpp b/src/client/client.cpp index a8cc7f93..6a7faa9c 100644 --- a/src/client/client.cpp +++ b/src/client/client.cpp @@ -497,7 +497,7 @@ void Client::recvMessage(const Message &message) { ? net->networkName() + ":" : QString(); QString sender = networkName + msg.bufferInfo().bufferName() + ":" + msg.sender(); - Message mmsg = Message(msg.timestamp(), msg.bufferInfo(), msg.type(), msg.text(), sender, msg.flags()); + Message mmsg = Message(msg.timestamp(), msg.bufferInfo(), msg.type(), msg.contents(), sender, msg.flags()); monitorBuffer()->appendMsg(mmsg); } emit messageReceived(msg); @@ -588,7 +588,7 @@ void Client::checkForHighlight(Message &msg) { QRegExp nickRegExp("^(.*\\W)?" + QRegExp::escape(nickname) + "(\\W.*)?$"); if((msg.type() & (Message::Plain | Message::Notice | Message::Action)) && !(msg.flags() & Message::Self) - && nickRegExp.exactMatch(msg.text())) { + && nickRegExp.exactMatch(msg.contents())) { msg.setFlags(msg.flags() | Message::Highlight); return; } @@ -608,7 +608,7 @@ void Client::checkForHighlight(Message &msg) { } if((msg.type() & (Message::Plain | Message::Notice | Message::Action)) && !(msg.flags() & Message::Self) - && userRegExp.exactMatch(msg.text())) { + && userRegExp.exactMatch(msg.contents())) { msg.setFlags(msg.flags() | Message::Highlight); return; }