X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fcommon%2Fbuffersyncer.cpp;h=f05d16376d867d6ae620712143d1c76f44154fc7;hp=227370c20307c1e4916473b3b4ad8627b994beae;hb=79fbcfb49f7cc92a89f0158ebac1a3006a559e8a;hpb=55712d5a21e948ea8b2b9ffe935635fddad485cb

diff --git a/src/common/buffersyncer.cpp b/src/common/buffersyncer.cpp
index 227370c2..f05d1637 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,54 +20,64 @@
 
 #include "buffersyncer.h"
 
-BufferSyncer::BufferSyncer(QObject *parent) : SyncableObject(parent) {
-
-
+BufferSyncer::BufferSyncer(QObject *parent)
+  : SyncableObject(parent)
+{
 }
 
+BufferSyncer::BufferSyncer(const QHash<BufferId, MsgId> &lastSeenMsg, QObject *parent)
+  : SyncableObject(parent),
+    _lastSeenMsg(lastSeenMsg)
+{
+}
 
-QDateTime BufferSyncer::lastSeen(BufferId buffer) const {
-  if(_lastSeen.contains(buffer)) return _lastSeen[buffer];
-  return QDateTime();
+MsgId BufferSyncer::lastSeenMsg(BufferId buffer) const {
+  if(_lastSeenMsg.contains(buffer))
+    return _lastSeenMsg[buffer];
+  return MsgId();
 }
 
-bool BufferSyncer::setLastSeen(BufferId buffer, const QDateTime &time) {
-  if(!time.isValid()) return false;
-  if(!lastSeen(buffer).isValid() || 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;
+    emit lastSeenMsgSet(buffer, msgId);
     return true;
   }
   return false;
 }
 
-QVariantList BufferSyncer::initLastSeen() const {
+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[i].value<BufferId>(), list[i+1].value<MsgId>());
   }
 }
 
-void BufferSyncer::requestSetLastSeen(BufferId buffer, const QDateTime &time) {
-  if(setLastSeen(buffer, time)) emit setLastSeenRequested(buffer, time);
+void BufferSyncer::removeBuffer(BufferId buffer) {
+  if(_lastSeenMsg.contains(buffer))
+    _lastSeenMsg.remove(buffer);
+  emit bufferRemoved(buffer);
 }
 
 
-void BufferSyncer::requestRemoveBuffer(BufferId buffer) {
-  emit removeBufferRequested(buffer);
-}
-
-void BufferSyncer::removeBuffer(BufferId buffer) {
-  if(_lastSeen.contains(buffer))
-    _lastSeen.remove(buffer);
-  emit bufferRemoved(buffer);
+void BufferSyncer::mergeBuffersPermanently(BufferId buffer1, BufferId buffer2) {
+  if(_lastSeenMsg.contains(buffer2))
+    _lastSeenMsg.remove(buffer2);
+  emit buffersPermanentlyMerged(buffer1, buffer2);
 }