X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fcommon%2Fbuffersyncer.cpp;h=1c432a487d06aa43df081e76caef5084f62a3196;hp=222f65bc8eb84ee44b87c821d4a51587944f494e;hb=579e559a6322209df7cd51c34801fecff5fe734b;hpb=9da8a8a14a39bffe74403001978a13cc8b130138

diff --git a/src/common/buffersyncer.cpp b/src/common/buffersyncer.cpp
index 222f65bc..1c432a48 100644
--- a/src/common/buffersyncer.cpp
+++ b/src/common/buffersyncer.cpp
@@ -1,5 +1,5 @@
 /***************************************************************************
- *   Copyright (C) 2005-09 by the Quassel Project                          *
+ *   Copyright (C) 2005-2019 by the Quassel Project                        *
  *   devel@quassel-irc.org                                                 *
  *                                                                         *
  *   This program is free software; you can redistribute it and/or modify  *
@@ -15,111 +15,182 @@
  *   You should have received a copy of the GNU General Public License     *
  *   along with this program; if not, write to the                         *
  *   Free Software Foundation, Inc.,                                       *
- *   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.             *
+ *   51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.         *
  ***************************************************************************/
 
 #include "buffersyncer.h"
 
-INIT_SYNCABLE_OBJECT(BufferSyncer)
-BufferSyncer::BufferSyncer(QObject *parent)
-  : SyncableObject(parent)
+#include <utility>
+
+BufferSyncer::BufferSyncer(QObject* parent)
+    : SyncableObject(parent)
+{}
+
+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))
+{}
+
+MsgId BufferSyncer::lastSeenMsg(BufferId buffer) const
 {
+    return _lastSeenMsg.value(buffer, MsgId());
 }
 
-BufferSyncer::BufferSyncer(const QHash<BufferId, MsgId> &lastSeenMsg, const QHash<BufferId, MsgId> &markerLines, QObject *parent)
-  : SyncableObject(parent),
-    _lastSeenMsg(lastSeenMsg),
-    _markerLines(markerLines)
+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;
 }
 
-MsgId BufferSyncer::lastSeenMsg(BufferId buffer) const {
-  return _lastSeenMsg.value(buffer, MsgId());
+MsgId BufferSyncer::markerLine(BufferId buffer) const
+{
+    return _markerLines.value(buffer, MsgId());
 }
 
-bool BufferSyncer::setLastSeenMsg(BufferId buffer, const MsgId &msgId) {
-  if(!msgId.isValid())
-    return false;
+bool BufferSyncer::setMarkerLine(BufferId buffer, const MsgId& msgId)
+{
+    if (!msgId.isValid())
+        return false;
+
+    if (_markerLines.value(buffer) == msgId)
+        return false;
 
-  const MsgId oldLastSeenMsg = lastSeenMsg(buffer);
-  if(!oldLastSeenMsg.isValid() || oldLastSeenMsg < msgId) {
-    _lastSeenMsg[buffer] = msgId;
+    _markerLines[buffer] = msgId;
     SYNC(ARG(buffer), ARG(msgId))
-    emit lastSeenMsgSet(buffer, msgId);
+    emit markerLineSet(buffer, msgId);
     return true;
-  }
-  return false;
 }
 
-MsgId BufferSyncer::markerLine(BufferId buffer) const {
-  return _markerLines.value(buffer, MsgId());
+QVariantList BufferSyncer::initLastSeenMsg() const
+{
+    QVariantList list;
+    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;
 }
 
-bool BufferSyncer::setMarkerLine(BufferId buffer, const MsgId &msgId) {
-  if(!msgId.isValid())
-    return false;
+void BufferSyncer::initSetLastSeenMsg(const QVariantList& list)
+{
+    _lastSeenMsg.clear();
+    Q_ASSERT(list.count() % 2 == 0);
+    for (int i = 0; i < list.count(); i += 2) {
+        setLastSeenMsg(list.at(i).value<BufferId>(), list.at(i + 1).value<MsgId>());
+    }
+}
 
-  if(_markerLines.value(buffer) == msgId)
-    return false;
+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::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>());
+    }
+}
 
-  _markerLines[buffer] = msgId;
-  SYNC(ARG(buffer), ARG(msgId))
-  emit markerLineSet(buffer, msgId);
-  return true;
-}
-
-QVariantList BufferSyncer::initLastSeenMsg() const {
-  QVariantList list;
-  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::initSetLastSeenMsg(const QVariantList &list) {
-  _lastSeenMsg.clear();
-  Q_ASSERT(list.count() % 2 == 0);
-  for(int i = 0; i < list.count(); i += 2) {
-    setLastSeenMsg(list.at(i).value<BufferId>(), list.at(i+1).value<MsgId>());
-  }
-}
-
-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::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(_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);
+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);
+}
+
+void BufferSyncer::mergeBuffersPermanently(BufferId buffer1, BufferId buffer2)
+{
+    if (_lastSeenMsg.contains(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>());
+    }
 }