X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fcommon%2Fbuffersyncer.cpp;h=99493068b951fae57d296ebf2be142d6ab3d33ce;hp=05f337db7dd16b8c19d4715eb8402221a7f42f0d;hb=3a3e844f9fcfd12235a0086af75ecd503b621ef4;hpb=b65b9f7615165e8700a44d59b7275a55558dd45b

diff --git a/src/common/buffersyncer.cpp b/src/common/buffersyncer.cpp
index 05f337db..99493068 100644
--- a/src/common/buffersyncer.cpp
+++ b/src/common/buffersyncer.cpp
@@ -1,5 +1,5 @@
 /***************************************************************************
- *   Copyright (C) 2005-2015 by the Quassel Project                        *
+ *   Copyright (C) 2005-2018 by the Quassel Project                        *
  *   devel@quassel-irc.org                                                 *
  *                                                                         *
  *   This program is free software; you can redistribute it and/or modify  *
@@ -20,17 +20,25 @@
 
 #include "buffersyncer.h"
 
-INIT_SYNCABLE_OBJECT(BufferSyncer)
+#include <utility>
+
 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)
+BufferSyncer::BufferSyncer(
+        QHash<BufferId, MsgId> lastSeenMsg,
+        QHash<BufferId, MsgId> markerLines,
+        QHash<BufferId, Message::Types> activities,
+        QHash<BufferId, int> highlightCounts,
+        QObject *parent
+) : SyncableObject(parent),
+    _lastSeenMsg(std::move(lastSeenMsg)),
+    _markerLines(std::move(markerLines)),
+    _bufferActivities(std::move(activities)),
+    _highlightCounts(std::move(highlightCounts))
 {
 }
 
@@ -124,12 +132,45 @@ 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);
+    if (_highlightCounts.contains(buffer))
+        _highlightCounts.remove(buffer);
     SYNC(ARG(buffer))
     emit bufferRemoved(buffer);
 }
@@ -141,6 +182,33 @@ void BufferSyncer::mergeBuffersPermanently(BufferId buffer1, BufferId buffer2)
         _lastSeenMsg.remove(buffer2);
     if (_markerLines.contains(buffer2))
         _markerLines.remove(buffer2);
+    if (_bufferActivities.contains(buffer2))
+        _bufferActivities.remove(buffer2);
+    if (_highlightCounts.contains(buffer2))
+        _highlightCounts.remove(buffer2);
     SYNC(ARG(buffer1), ARG(buffer2))
     emit buffersPermanentlyMerged(buffer1, buffer2);
 }
+
+int BufferSyncer::highlightCount(BufferId buffer) const {
+    return _highlightCounts.value(buffer, 0);
+}
+
+QVariantList BufferSyncer::initHighlightCounts() const {
+    QVariantList list;
+    auto iter = _highlightCounts.constBegin();
+    while (iter != _highlightCounts.constEnd()) {
+        list << QVariant::fromValue<BufferId>(iter.key())
+             << QVariant::fromValue<int>((int) iter.value());
+        ++iter;
+    }
+    return list;
+}
+
+void BufferSyncer::initSetHighlightCounts(const QVariantList &list) {
+    _highlightCounts.clear();
+    Q_ASSERT(list.count() % 2 == 0);
+    for (int i = 0; i < list.count(); i += 2) {
+        setHighlightCount(list.at(i).value<BufferId>(), list.at(i+1).value<int>());
+    }
+}