projects
/
quassel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix buffersyncer state when merging buffers
[quassel.git]
/
src
/
common
/
buffersyncer.cpp
diff --git
a/src/common/buffersyncer.cpp
b/src/common/buffersyncer.cpp
index
32f579e
..
cbebd03
100644
(file)
--- a/
src/common/buffersyncer.cpp
+++ b/
src/common/buffersyncer.cpp
@@
-1,5
+1,5
@@
/***************************************************************************
/***************************************************************************
- * Copyright (C) 2005-20
18
by the Quassel Project *
+ * Copyright (C) 2005-20
20
by the Quassel Project *
* devel@quassel-irc.org *
* *
* This program is free software; you can redistribute it and/or modify *
* devel@quassel-irc.org *
* *
* This program is free software; you can redistribute it and/or modify *
@@
-82,7
+82,7
@@
QVariantList BufferSyncer::initLastSeenMsg() const
QVariantList list;
QHash<BufferId, MsgId>::const_iterator iter = _lastSeenMsg.constBegin();
while (iter != _lastSeenMsg.constEnd()) {
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());
+ list << QVariant::fromValue
(iter.key()) << QVariant::fromValue
(iter.value());
++iter;
}
return list;
++iter;
}
return list;
@@
-102,7
+102,7
@@
QVariantList BufferSyncer::initMarkerLines() const
QVariantList list;
QHash<BufferId, MsgId>::const_iterator iter = _markerLines.constBegin();
while (iter != _markerLines.constEnd()) {
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());
+ list << QVariant::fromValue
(iter.key()) << QVariant::fromValue
(iter.value());
++iter;
}
return list;
++iter;
}
return list;
@@
-122,7
+122,7
@@
QVariantList BufferSyncer::initActivities() const
QVariantList list;
auto iter = _bufferActivities.constBegin();
while (iter != _bufferActivities.constEnd()) {
QVariantList list;
auto iter = _bufferActivities.constBegin();
while (iter != _bufferActivities.constEnd()) {
- list << QVariant::fromValue
<BufferId>(iter.key()) << QVariant::fromValue<int>
((int)iter.value());
+ list << QVariant::fromValue
(iter.key()) << QVariant::fromValue
((int)iter.value());
++iter;
}
return list;
++iter;
}
return list;
@@
-158,6
+158,9
@@
void BufferSyncer::removeBuffer(BufferId buffer)
void BufferSyncer::mergeBuffersPermanently(BufferId buffer1, BufferId buffer2)
{
void BufferSyncer::mergeBuffersPermanently(BufferId buffer1, BufferId buffer2)
{
+ setBufferActivity(buffer1, _bufferActivities[buffer1] | _bufferActivities[buffer2]);
+ setHighlightCount(buffer1, _highlightCounts[buffer1] + _highlightCounts[buffer2]);
+
if (_lastSeenMsg.contains(buffer2))
_lastSeenMsg.remove(buffer2);
if (_markerLines.contains(buffer2))
if (_lastSeenMsg.contains(buffer2))
_lastSeenMsg.remove(buffer2);
if (_markerLines.contains(buffer2))
@@
-180,7
+183,7
@@
QVariantList BufferSyncer::initHighlightCounts() const
QVariantList list;
auto iter = _highlightCounts.constBegin();
while (iter != _highlightCounts.constEnd()) {
QVariantList list;
auto iter = _highlightCounts.constBegin();
while (iter != _highlightCounts.constEnd()) {
- list << QVariant::fromValue
<BufferId>(iter.key()) << QVariant::fromValue<int>
((int)iter.value());
+ list << QVariant::fromValue
(iter.key()) << QVariant::fromValue
((int)iter.value());
++iter;
}
return list;
++iter;
}
return list;