X-Git-Url: https://git.quassel-irc.org/?a=blobdiff_plain;f=src%2Fclient%2Fnetworkmodel.cpp;h=5c65df9087213c4232b015f22001ff859c2138c3;hb=eecce2c8b6bf90f69c3172a11daf38352a6990c6;hp=3f806b5c6afd15f801778af20e831576a56a3ad1;hpb=9d22ec1fd8e8652744e6ea6c91de4a6ec5b2146c;p=quassel.git

diff --git a/src/client/networkmodel.cpp b/src/client/networkmodel.cpp
index 3f806b5c..5c65df90 100644
--- a/src/client/networkmodel.cpp
+++ b/src/client/networkmodel.cpp
@@ -918,12 +918,7 @@ void NetworkModel::setLastSeenMsgId(const BufferId &bufferId, const MsgId &msgId
 }
 
 void NetworkModel::updateBufferActivity(const Message &msg) {
-  BufferItem *bufferItem = findBufferItem(msg.bufferInfo());
-  if(!bufferItem) {
-    qDebug() << "NetworkModel::updateBufferActivity(): buffer is unknown:" << msg.bufferInfo();
-    return;
-  }
-  bufferItem->updateActivityLevel(msg);
+  bufferItem(msg.bufferInfo())->updateActivityLevel(msg);
 }
 
 void NetworkModel::setBufferActivity(const BufferId &bufferId, Buffer::ActivityLevel level) {
@@ -970,6 +965,20 @@ QString NetworkModel::bufferName(BufferId bufferId) {
   return _bufferItemCache[bufferId]->bufferName();
 }
 
+BufferInfo::Type NetworkModel::bufferType(BufferId bufferId) {
+  if(!_bufferItemCache.contains(bufferId))
+    return BufferInfo::InvalidBuffer;
+
+  return _bufferItemCache[bufferId]->bufferType();
+}
+
+BufferInfo NetworkModel::bufferInfo(BufferId bufferId) {
+  if(!_bufferItemCache.contains(bufferId))
+    return BufferInfo();
+
+  return _bufferItemCache[bufferId]->bufferInfo();
+}
+
 NetworkId NetworkModel::networkId(BufferId bufferId) {
   if(!_bufferItemCache.contains(bufferId))
     return NetworkId();
@@ -991,10 +1000,3 @@ QString NetworkModel::networkName(BufferId bufferId) {
   else
     return QString();
 }
-
-BufferInfo::Type NetworkModel::bufferType(BufferId bufferId) {
-  if(!_bufferItemCache.contains(bufferId))
-    return BufferInfo::InvalidBuffer;
-
-  return _bufferItemCache[bufferId]->bufferType();
-}