X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fclient%2Fbuffer.cpp;fp=src%2Fclient%2Fbuffer.cpp;h=df7863967efcb3f8c06ca234928c14afc1af0eb4;hp=241e2e687ae8eeff26f7be1b0386b8aef1a79fae;hb=e1b6d538b7c4cc279f9218614e23adb5d8a81fe5;hpb=12e89ab96ec63667e0f1d61c88fe6f2a3023682a diff --git a/src/client/buffer.cpp b/src/client/buffer.cpp index 241e2e68..df786396 100644 --- a/src/client/buffer.cpp +++ b/src/client/buffer.cpp @@ -42,55 +42,17 @@ BufferInfo Buffer::bufferInfo() const { return _bufferInfo; } -const QList &Buffer::contents() const { - return layoutedMsgs; -} - -void Buffer::appendMsg(const Message &msg) { - updateActivityLevel(msg); - AbstractUiMsg *m = Client::layoutMsg(msg); - layoutedMsgs.append(m); - emit msgAppended(m); -} - -void Buffer::prependMsg(const Message &msg) { - // check for duplicate first - if(!layoutedMsgs.isEmpty() && msg.msgId() >= layoutedMsgs.first()->msgId()) { - return; - } - updateActivityLevel(msg); - layoutQueue.append(msg); -} - -bool Buffer::layoutMsg() { - if(layoutQueue.isEmpty()) - return false; - - AbstractUiMsg *m = Client::layoutMsg(layoutQueue.takeFirst()); - layoutedMsgs.prepend(m); - emit msgPrepended(m); - - return !layoutQueue.isEmpty(); -} - void Buffer::setVisible(bool visible) { _isVisible = visible; setActivityLevel(NoActivity); - //if(layoutedMsgs.isEmpty()) - // return; - //setLastSeenMsg(layoutedMsgs.last()->msgId()); if(_lastRcvdMsg.msgId() > 0) setLastSeenMsg(_lastRcvdMsg.msgId()); - //qDebug() << "setting last seen" << _lastRcvdMsg.msgId(); } void Buffer::setLastSeenMsg(const MsgId &msgId) { - // qDebug() << "want to set lastSeen:" << bufferInfo() << seen << lastSeen(); const MsgId oldLastSeen = lastSeenMsg(); if(!oldLastSeen.isValid() || (msgId.isValid() && msgId > oldLastSeen)) { - //qDebug() << "setting:" << bufferInfo().bufferName() << seen; _lastSeenMsg = msgId; Client::setBufferLastSeenMsg(bufferInfo().bufferId(), msgId); - //qDebug() << "setting lastSeen:" << bufferInfo() << lastSeen(); setActivityLevel(NoActivity); } } @@ -99,7 +61,6 @@ void Buffer::setActivityLevel(ActivityLevel level) { _activityLevel = level; if(bufferInfo().bufferId() > 0) { Client::networkModel()->setBufferActivity(bufferInfo(), level); - //qDebug() << "setting level:" << bufferInfo() << lastSeen() << level; } }