X-Git-Url: https://git.quassel-irc.org/?a=blobdiff_plain;f=src%2Fclient%2Fclient.cpp;h=6a7faa9c474b74107a6ede7b74c7a263ed8eefa9;hb=4fdf00a414eba03fb95cade3aca3ba53705c7b97;hp=5f22eef28d2f91499a49300665c837123f03b459;hpb=22f141be889377b07472bb967d92186dad23be3e;p=quassel.git

diff --git a/src/client/client.cpp b/src/client/client.cpp
index 5f22eef2..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);
@@ -528,7 +528,7 @@ void Client::receiveBacklog(BufferId bufferId, const QVariantList &msgs) {
 void Client::receiveBacklog(BufferId bufferId, const QVariantList &msgs) {
   Buffer *buffer_ = buffer(bufferId);
   if(!buffer_) {
-    qWarning() << "Client::recvBacklogData(): received Backlog for unknown Buffer:" << bufferId;
+    qWarning() << "Client::receiveBacklog(): received Backlog for unknown Buffer:" << bufferId;
     return;
   }
 
@@ -564,7 +564,7 @@ void Client::layoutMsg() {
   if(buffer->layoutMsg()) {
     layoutQueue.append(buffer);  // Buffer has more messages in its queue --> Round Robin
     return;
-  } 
+  }
 
   if(layoutQueue.isEmpty())
     layoutTimer->stop();
@@ -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;
       }