-void BufferSyncer::removeBuffer(BufferId buffer) {
- if(_lastSeen.contains(buffer))
- _lastSeen.remove(buffer);
- emit bufferRemoved(buffer);
+
+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);