X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fcommon%2Fbuffersyncer.cpp;h=222f65bc8eb84ee44b87c821d4a51587944f494e;hp=b97d2337e4438066de240a7fc45ddd78c555f802;hb=3eebe11329417e77038d860af3b6f35630f40450;hpb=c7a5ea8c0e5807fd0079bcb10cb88e4356526bad

diff --git a/src/common/buffersyncer.cpp b/src/common/buffersyncer.cpp
index b97d2337..222f65bc 100644
--- a/src/common/buffersyncer.cpp
+++ b/src/common/buffersyncer.cpp
@@ -1,5 +1,5 @@
 /***************************************************************************
- *   Copyright (C) 2005-08 by the Quassel IRC Team                         *
+ *   Copyright (C) 2005-09 by the Quassel Project                          *
  *   devel@quassel-irc.org                                                 *
  *                                                                         *
  *   This program is free software; you can redistribute it and/or modify  *
@@ -20,53 +20,106 @@
 
 #include "buffersyncer.h"
 
-BufferSyncer::BufferSyncer(QObject *parent) : SyncableObject(parent) {
-
-
+INIT_SYNCABLE_OBJECT(BufferSyncer)
+BufferSyncer::BufferSyncer(QObject *parent)
+  : SyncableObject(parent)
+{
 }
 
+BufferSyncer::BufferSyncer(const QHash<BufferId, MsgId> &lastSeenMsg, const QHash<BufferId, MsgId> &markerLines, QObject *parent)
+  : SyncableObject(parent),
+    _lastSeenMsg(lastSeenMsg),
+    _markerLines(markerLines)
+{
+}
 
-QDateTime BufferSyncer::lastSeen(BufferId buffer) const {
-  if(_lastSeen.contains(buffer)) return _lastSeen[buffer];
-  return QDateTime();
+MsgId BufferSyncer::lastSeenMsg(BufferId buffer) const {
+  return _lastSeenMsg.value(buffer, MsgId());
 }
 
-bool BufferSyncer::setLastSeen(BufferId buffer, const QDateTime &time) {
-  if(_lastSeen[buffer] < time) {
-    _lastSeen[buffer] = time;
-    emit lastSeenSet(buffer, time);
+bool BufferSyncer::setLastSeenMsg(BufferId buffer, const MsgId &msgId) {
+  if(!msgId.isValid())
+    return false;
+
+  const MsgId oldLastSeenMsg = lastSeenMsg(buffer);
+  if(!oldLastSeenMsg.isValid() || oldLastSeenMsg < msgId) {
+    _lastSeenMsg[buffer] = msgId;
+    SYNC(ARG(buffer), ARG(msgId))
+    emit lastSeenMsgSet(buffer, msgId);
     return true;
   }
   return false;
 }
 
-QVariantList BufferSyncer::initLastSeen() const {
+MsgId BufferSyncer::markerLine(BufferId buffer) const {
+  return _markerLines.value(buffer, MsgId());
+}
+
+bool BufferSyncer::setMarkerLine(BufferId buffer, const MsgId &msgId) {
+  if(!msgId.isValid())
+    return false;
+
+  if(_markerLines.value(buffer) == msgId)
+    return false;
+
+  _markerLines[buffer] = msgId;
+  SYNC(ARG(buffer), ARG(msgId))
+  emit markerLineSet(buffer, msgId);
+  return true;
+}
+
+QVariantList BufferSyncer::initLastSeenMsg() const {
   QVariantList list;
-  foreach(BufferId id, _lastSeen.keys()) {
-    list << QVariant::fromValue<BufferId>(id) << _lastSeen[id];
+  QHash<BufferId, MsgId>::const_iterator iter = _lastSeenMsg.constBegin();
+  while(iter != _lastSeenMsg.constEnd()) {
+    list << QVariant::fromValue<BufferId>(iter.key())
+         << QVariant::fromValue<MsgId>(iter.value());
+    ++iter;
   }
   return list;
 }
 
-void BufferSyncer::initSetLastSeen(const QVariantList &list) {
-  _lastSeen.clear();
+void BufferSyncer::initSetLastSeenMsg(const QVariantList &list) {
+  _lastSeenMsg.clear();
   Q_ASSERT(list.count() % 2 == 0);
   for(int i = 0; i < list.count(); i += 2) {
-    setLastSeen(list[i].value<BufferId>(), list[i+1].toDateTime());
+    setLastSeenMsg(list.at(i).value<BufferId>(), list.at(i+1).value<MsgId>());
   }
 }
 
-void BufferSyncer::requestSetLastSeen(BufferId buffer, const QDateTime &time) {
-  if(setLastSeen(buffer, time)) emit setLastSeenRequested(buffer, time);
+QVariantList BufferSyncer::initMarkerLines() const {
+  QVariantList list;
+  QHash<BufferId, MsgId>::const_iterator iter = _markerLines.constBegin();
+  while(iter != _markerLines.constEnd()) {
+    list << QVariant::fromValue<BufferId>(iter.key())
+         << QVariant::fromValue<MsgId>(iter.value());
+    ++iter;
+  }
+  return list;
 }
 
-
-void BufferSyncer::requestRemoveBuffer(BufferId buffer) {
-  emit removeBufferRequested(buffer);
+void BufferSyncer::initSetMarkerLines(const QVariantList &list) {
+  _markerLines.clear();
+  Q_ASSERT(list.count() % 2 == 0);
+  for(int i = 0; i < list.count(); i += 2) {
+    setMarkerLine(list.at(i).value<BufferId>(), list.at(i+1).value<MsgId>());
+  }
 }
 
 void BufferSyncer::removeBuffer(BufferId buffer) {
-  if(_lastSeen.contains(buffer))
-    _lastSeen.remove(buffer);
+  if(_lastSeenMsg.contains(buffer))
+    _lastSeenMsg.remove(buffer);
+  if(_markerLines.contains(buffer))
+    _markerLines.remove(buffer);
+  SYNC(ARG(buffer))
   emit bufferRemoved(buffer);
 }
+
+void BufferSyncer::mergeBuffersPermanently(BufferId buffer1, BufferId buffer2) {
+  if(_lastSeenMsg.contains(buffer2))
+    _lastSeenMsg.remove(buffer2);
+  if(_markerLines.contains(buffer2))
+    _markerLines.remove(buffer2);
+  SYNC(ARG(buffer1), ARG(buffer2))
+  emit buffersPermanentlyMerged(buffer1, buffer2);
+}