X-Git-Url: https://git.quassel-irc.org/?a=blobdiff_plain;f=src%2Fclient%2Fbuffer.cpp;h=c020424a81849e391600b831d1bfcfe165d0face;hb=fd8d472f11d024b2df59027f719fbf3387315ec5;hp=1fc9846f9f0dad56df1816a2ece05c1ce5755408;hpb=9f9d207ecf28dd5470ecef9d4076a3f447662a20;p=quassel.git

diff --git a/src/client/buffer.cpp b/src/client/buffer.cpp
index 1fc9846f..c020424a 100644
--- a/src/client/buffer.cpp
+++ b/src/client/buffer.cpp
@@ -42,7 +42,7 @@ BufferInfo Buffer::bufferInfo() const {
   return _bufferInfo;
 }
 
-QList<AbstractUiMsg *> Buffer::contents() const {
+const QList<AbstractUiMsg *> &Buffer::contents() const {
   return layoutedMsgs;
 }
 
@@ -55,7 +55,7 @@ void Buffer::appendMsg(const Message &msg) {
 
 void Buffer::prependMsg(const Message &msg) {
   // check for duplicate first
-  if(contents().count() > 0 && msg.msgId() >= contents().first()->msgId()) {
+  if(!layoutedMsgs.isEmpty()  && msg.msgId() >= layoutedMsgs.first()->msgId()) {
     return;
   }
   updateActivityLevel(msg);
@@ -63,18 +63,21 @@ void Buffer::prependMsg(const Message &msg) {
 }
 
 bool Buffer::layoutMsg() {
-  if(layoutQueue.count()) {
-    AbstractUiMsg *m = Client::layoutMsg(layoutQueue.takeFirst());
-    layoutedMsgs.prepend(m);
-    emit msgPrepended(m);
-  }
-  return layoutQueue.count();
+  if(layoutQueue.isEmpty())
+    return false;
+  
+  AbstractUiMsg *m = Client::layoutMsg(layoutQueue.takeFirst());
+  layoutedMsgs.prepend(m);
+  emit msgPrepended(m);
+
+  return !layoutQueue.isEmpty();
 }
 
 void Buffer::setVisible(bool visible) {
   _isVisible = visible;
   setActivityLevel(NoActivity);
-  if(!layoutedMsgs.count()) return;
+  if(layoutedMsgs.isEmpty())
+    return;
   setLastSeenMsg(layoutedMsgs.last()->msgId());
 }
 
@@ -109,8 +112,12 @@ void Buffer::updateActivityLevel(const Message &msg) {
     return;
 
   ActivityLevel level = activityLevel() | OtherActivity;
-  if(msg.type() == Message::Plain || msg.type() == Message::Notice) level |= NewMessage;
-  if(msg.flags() & Message::Highlight) level |= Highlight;
-
-  if(level != activityLevel()) setActivityLevel(level);
+  if(msg.type() & (Message::Plain | Message::Notice | Message::Action))
+    level |= NewMessage;
+  
+  if(msg.flags() & Message::Highlight)
+    level |= Highlight;
+
+  if(level != activityLevel())
+    setActivityLevel(level);
 }