X-Git-Url: https://git.quassel-irc.org/?a=blobdiff_plain;f=src%2Fcommon%2Fbuffersyncer.cpp;h=310dfa695ffc25828fe664c0d05600c20b3af55b;hb=da5d020b0b8a29477261ee46013b7785ffabfee5;hp=a1b5b63b44a3122bc4eb460bcd0b4bdf76e66b90;hpb=0a43227b8cd44625f4881cc1545d42c8c8a4876c;p=quassel.git

diff --git a/src/common/buffersyncer.cpp b/src/common/buffersyncer.cpp
index a1b5b63b..310dfa69 100644
--- a/src/common/buffersyncer.cpp
+++ b/src/common/buffersyncer.cpp
@@ -27,10 +27,11 @@ BufferSyncer::BufferSyncer(QObject *parent)
 }
 
 
-BufferSyncer::BufferSyncer(const QHash<BufferId, MsgId> &lastSeenMsg, const QHash<BufferId, MsgId> &markerLines, QObject *parent)
+BufferSyncer::BufferSyncer(const QHash<BufferId, MsgId> &lastSeenMsg, const QHash<BufferId, MsgId> &markerLines, const QHash<BufferId, Message::Types> &activities, QObject *parent)
     : SyncableObject(parent),
     _lastSeenMsg(lastSeenMsg),
-    _markerLines(markerLines)
+    _markerLines(markerLines),
+    _bufferActivities(activities)
 {
 }
 
@@ -124,12 +125,43 @@ void BufferSyncer::initSetMarkerLines(const QVariantList &list)
 }
 
 
+QVariantList BufferSyncer::initActivities() const
+{
+    QVariantList list;
+    auto iter = _bufferActivities.constBegin();
+    while (iter != _bufferActivities.constEnd()) {
+        list << QVariant::fromValue<BufferId>(iter.key())
+             << QVariant::fromValue<int>((int) iter.value());
+        ++iter;
+    }
+    return list;
+}
+
+
+void BufferSyncer::initSetActivities(const QVariantList &list)
+{
+    _bufferActivities.clear();
+    Q_ASSERT(list.count() % 2 == 0);
+    for (int i = 0; i < list.count(); i += 2) {
+        setBufferActivity(list.at(i).value<BufferId>(), list.at(i+1).value<int>());
+    }
+}
+
+
+Message::Types BufferSyncer::activity(BufferId buffer) const
+{
+    return _bufferActivities.value(buffer, Message::Types());
+}
+
+
 void BufferSyncer::removeBuffer(BufferId buffer)
 {
     if (_lastSeenMsg.contains(buffer))
         _lastSeenMsg.remove(buffer);
     if (_markerLines.contains(buffer))
         _markerLines.remove(buffer);
+    if (_bufferActivities.contains(buffer))
+        _bufferActivities.remove(buffer);
     SYNC(ARG(buffer))
     emit bufferRemoved(buffer);
 }
@@ -141,6 +173,8 @@ void BufferSyncer::mergeBuffersPermanently(BufferId buffer1, BufferId buffer2)
         _lastSeenMsg.remove(buffer2);
     if (_markerLines.contains(buffer2))
         _markerLines.remove(buffer2);
+    if (_bufferActivities.contains(buffer2))
+        _bufferActivities.remove(buffer2);
     SYNC(ARG(buffer1), ARG(buffer2))
     emit buffersPermanentlyMerged(buffer1, buffer2);
 }