Fix initial backlog for buffers with no new messages

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

diff --git a/src/client/networkmodel.cpp b/src/client/networkmodel.cpp
index b5c21c4..fbf84c4 100644 (file)
--- a/src/client/networkmodel.cpp
+++ b/src/client/networkmodel.cpp
@@ -24,14 +24,12 @@
 #include <QTextDocument>       // for Qt::escape()
 
 #include "buffermodel.h"
+#include "buffersettings.h"
 #include "client.h"
-#include "signalproxy.h"
-#include "network.h"
+#include "clientsettings.h"
 #include "ircchannel.h"
-
-#include "buffersettings.h"
-
-#include "util.h" // get rid of this (needed for isChannelName)
+#include "network.h"
+#include "signalproxy.h"
 
 /*****************************************
 *  Network Items
@@ -490,8 +488,8 @@ QString ChannelBufferItem::toolTip(int column) const {
         toolTip.append(tr("<b>Mode:</b> %1").arg(channelMode));
     }
 
-    BufferSettings s;
-    bool showTopic = s.value("DisplayTopicInTooltip", QVariant(false)).toBool();
+    ItemViewSettings s;
+    bool showTopic = s.displayTopicInTooltip();
     if(showTopic) {
       QString _topic = topic();
       if(_topic != "") {
@@ -829,7 +827,7 @@ NetworkModel::NetworkModel(QObject *parent)
 
 QList<QVariant >NetworkModel::defaultHeader() {
   QList<QVariant> data;
-  data << tr("Buffer") << tr("Topic") << tr("Nick Count");
+  data << tr("Chat") << tr("Topic") << tr("Nick Count");
   return data;
 }