Fix superfluous QString() usage and provide proper plural support

[quassel.git] / src / client / networkmodel.cpp

diff --git a/src/client/networkmodel.cpp b/src/client/networkmodel.cpp
index 3f806b5..75a18af 100644 (file)
--- a/src/client/networkmodel.cpp
+++ b/src/client/networkmodel.cpp
@@ -158,11 +158,11 @@ QString NetworkItem::toolTip(int column) const {
   Q_UNUSED(column);
 
   QStringList toolTip(QString("<b>%1</b>").arg(networkName()));
-  toolTip.append(QString("Server: %1").arg(currentServer()));
-  toolTip.append(QString("Users: %1").arg(nickCount()));
+  toolTip.append(tr("Server: %1").arg(currentServer()));
+  toolTip.append(tr("Users: %1").arg(nickCount()));
 
   if(_network) {
-    toolTip.append(QString("Lag: %1 msecs").arg(_network->latency()));
+    toolTip.append(tr("Lag: %1 msecs").arg(_network->latency()));
   }
 
   return QString("<p> %1 </p>").arg(toolTip.join("<br />"));
@@ -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();
-}