modernize: Pass arguments by value and move in constructors

[quassel.git] / src / common / buffersyncer.cpp

diff --git a/src/common/buffersyncer.cpp b/src/common/buffersyncer.cpp
index ca146b5..9949306 100644 (file)
--- a/src/common/buffersyncer.cpp
+++ b/src/common/buffersyncer.cpp
@@ -1,5 +1,5 @@
 /***************************************************************************
- *   Copyright (C) 2005-2016 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,18 +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, const QHash<BufferId, Message::Types> &activities, QObject *parent)
-    : SyncableObject(parent),
-    _lastSeenMsg(lastSeenMsg),
-    _markerLines(markerLines),
-    _bufferActivities(activities)
+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))
 {
 }
 
@@ -128,7 +135,7 @@ void BufferSyncer::initSetMarkerLines(const QVariantList &list)
 QVariantList BufferSyncer::initActivities() const
 {
     QVariantList list;
-    QHash<BufferId, Message::Types>::const_iterator iter = _bufferActivities.constBegin();
+    auto iter = _bufferActivities.constBegin();
     while (iter != _bufferActivities.constEnd()) {
         list << QVariant::fromValue<BufferId>(iter.key())
              << QVariant::fromValue<int>((int) iter.value());
@@ -160,6 +167,10 @@ void BufferSyncer::removeBuffer(BufferId 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);
 }
@@ -171,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>());
+    }
+}