Continuing my personal crusade against Buffer.

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

diff --git a/src/client/buffer.cpp b/src/client/buffer.cpp
index c020424..9108d69 100644 (file)
--- a/src/client/buffer.cpp
+++ b/src/client/buffer.cpp
@@ -30,11 +30,8 @@
 
 Buffer::Buffer(BufferInfo bufferid, QObject *parent)
   : QObject(parent),
-    _bufferInfo(bufferid),
-    _isVisible(false),
-    _activityLevel(NoActivity)
+    _bufferInfo(bufferid)
 {
-
 }
 
 BufferInfo Buffer::bufferInfo() const {
@@ -42,82 +39,3 @@ BufferInfo Buffer::bufferInfo() const {
   return _bufferInfo;
 }
 
-const QList<AbstractUiMsg *> &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());
-}
-
-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);
-  }
-}
-
-void Buffer::setActivityLevel(ActivityLevel level) {
-  _activityLevel = level;
-  if(bufferInfo().bufferId() > 0) {
-    Client::networkModel()->setBufferActivity(bufferInfo(), level);
-    //qDebug() << "setting level:" << bufferInfo() << lastSeen() << level;
-  }
-}
-
-void Buffer::updateActivityLevel(const Message &msg) {
-  if(isVisible())
-    return;
-
-  if(msg.flags() & Message::Self)      // don't update activity for our own messages
-    return;
-
-  if(lastSeenMsg().isValid() && lastSeenMsg() >= msg.msgId())
-    return;
-
-  ActivityLevel level = activityLevel() | OtherActivity;
-  if(msg.type() & (Message::Plain | Message::Notice | Message::Action))
-    level |= NewMessage;
-  
-  if(msg.flags() & Message::Highlight)
-    level |= Highlight;
-
-  if(level != activityLevel())
-    setActivityLevel(level);
-}