X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fqtgui%2Fchatline.cpp;h=335e15b74f96bc40299c8cd2fdefc03b1d9e6ad8;hp=7c6ffaa537d27efa44a5c17f372a06e3e8e73108;hb=902c95728306e5ba115de84800fc8d5d239c9d62;hpb=6d021114c9dbcccbfe5e7c485c8e705404f35123

diff --git a/src/qtgui/chatline.cpp b/src/qtgui/chatline.cpp
index 7c6ffaa5..335e15b7 100644
--- a/src/qtgui/chatline.cpp
+++ b/src/qtgui/chatline.cpp
@@ -122,7 +122,7 @@ uint ChatLine::msgId() const {
   return msg.buffer().uid();
 }
 
-BufferId ChatLine::bufferId() const {
+BufferInfo ChatLine::bufferInfo() const {
   return msg.buffer();
 }
 
@@ -235,7 +235,7 @@ qreal ChatLine::layout(qreal tsw, qreal senderw, qreal textw) {
   line.y = 0;
   line.start = 0;
   line.height = minHeight;  // first line needs room for ts and sender
-  for(int i = 0; i < words.count(); i++) {
+  for(uint i = 0; i < (uint)words.count(); i++) {
     int lastpos = charPos[words[i].start + words[i].length]; // We use charPos[lastchar + 1], 'coz last char needs to fit
     if(lastpos - offset <= textw) {
       line.height = qMax(line.height, words[i].height);