Ok this is the major rework of quassel we've all been waiting for. For the actual...

[quassel.git] / src / qtgui / chatline.cpp

diff --git a/src/qtgui/chatline.cpp b/src/qtgui/chatline.cpp
index 7c6ffaa..335e15b 100644 (file)
--- 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);