X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fcommon%2Fbuffersyncer.cpp;h=74126a14bd760d31b6a6e7a1ca1e31bb7a654598;hp=cbebd03a8d65544352a3a82fbf43309ee4c6f945;hb=b134e777b822b929a78455fd92146bf7443e9aa1;hpb=7168c6adaa3cd2be160aa1731c7444dc384a4a98

diff --git a/src/common/buffersyncer.cpp b/src/common/buffersyncer.cpp
index cbebd03a..74126a14 100644
--- a/src/common/buffersyncer.cpp
+++ b/src/common/buffersyncer.cpp
@@ -26,18 +26,25 @@ BufferSyncer::BufferSyncer(QObject* parent)
     : SyncableObject(parent)
 {}
 
-BufferSyncer::BufferSyncer(QHash<BufferId, MsgId> lastSeenMsg,
+BufferSyncer::BufferSyncer(QHash<BufferId, MsgId> lastMsg,
+                           QHash<BufferId, MsgId> lastSeenMsg,
                            QHash<BufferId, MsgId> markerLines,
                            QHash<BufferId, Message::Types> activities,
                            QHash<BufferId, int> highlightCounts,
                            QObject* parent)
     : SyncableObject(parent)
+    , _lastMsg(std::move(lastMsg))
     , _lastSeenMsg(std::move(lastSeenMsg))
     , _markerLines(std::move(markerLines))
     , _bufferActivities(std::move(activities))
     , _highlightCounts(std::move(highlightCounts))
 {}
 
+MsgId BufferSyncer::lastMsg(BufferId buffer) const
+{
+    return _lastMsg.value(buffer, MsgId());
+}
+
 MsgId BufferSyncer::lastSeenMsg(BufferId buffer) const
 {
     return _lastSeenMsg.value(buffer, MsgId());
@@ -77,6 +84,26 @@ bool BufferSyncer::setMarkerLine(BufferId buffer, const MsgId& msgId)
     return true;
 }
 
+QVariantList BufferSyncer::initLastMsg() const
+{
+    QVariantList list;
+    QHash<BufferId, MsgId>::const_iterator iter = _lastMsg.constBegin();
+    while (iter != _lastMsg.constEnd()) {
+        list << QVariant::fromValue<BufferId>(iter.key()) << QVariant::fromValue<MsgId>(iter.value());
+        ++iter;
+    }
+    return list;
+}
+
+void BufferSyncer::initSetLastMsg(const QVariantList& list)
+{
+    _lastMsg.clear();
+    Q_ASSERT(list.count() % 2 == 0);
+    for (int i = 0; i < list.count(); i += 2) {
+        setLastMsg(list.at(i).value<BufferId>(), list.at(i + 1).value<MsgId>());
+    }
+}
+
 QVariantList BufferSyncer::initLastSeenMsg() const
 {
     QVariantList list;
@@ -144,6 +171,8 @@ Message::Types BufferSyncer::activity(BufferId buffer) const
 
 void BufferSyncer::removeBuffer(BufferId buffer)
 {
+    if (_lastMsg.contains(buffer))
+        _lastMsg.remove(buffer);
     if (_lastSeenMsg.contains(buffer))
         _lastSeenMsg.remove(buffer);
     if (_markerLines.contains(buffer))
@@ -158,9 +187,12 @@ void BufferSyncer::removeBuffer(BufferId buffer)
 
 void BufferSyncer::mergeBuffersPermanently(BufferId buffer1, BufferId buffer2)
 {
+    setLastMsg(buffer1, std::max(_lastMsg[buffer1], _lastMsg[buffer2]));
     setBufferActivity(buffer1, _bufferActivities[buffer1] | _bufferActivities[buffer2]);
     setHighlightCount(buffer1, _highlightCounts[buffer1] + _highlightCounts[buffer2]);
 
+    if (_lastMsg.contains(buffer2))
+        _lastMsg.remove(buffer2);
     if (_lastSeenMsg.contains(buffer2))
         _lastSeenMsg.remove(buffer2);
     if (_markerLines.contains(buffer2))