projects
/
quassel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
common: Prepare Quassel::quit() to be used more widely
[quassel.git]
/
src
/
core
/
corebuffersyncer.cpp
diff --git
a/src/core/corebuffersyncer.cpp
b/src/core/corebuffersyncer.cpp
index
caed62e
..
0548326
100644
(file)
--- a/
src/core/corebuffersyncer.cpp
+++ b/
src/core/corebuffersyncer.cpp
@@
-1,5
+1,5
@@
/***************************************************************************
/***************************************************************************
- * Copyright (C) 2005-201
6
by the Quassel Project *
+ * Copyright (C) 2005-201
8
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 *
@@
-34,18
+34,24
@@
public:
INIT_SYNCABLE_OBJECT(CoreBufferSyncer)
CoreBufferSyncer::CoreBufferSyncer(CoreSession *parent)
INIT_SYNCABLE_OBJECT(CoreBufferSyncer)
CoreBufferSyncer::CoreBufferSyncer(CoreSession *parent)
- : BufferSyncer(Core::bufferLastSeenMsgIds(parent->user()), Core::bufferMarkerLineMsgIds(parent->user()), Core::bufferActivities(parent->user()), parent),
+ : BufferSyncer(Core::bufferLastSeenMsgIds(parent->user()), Core::bufferMarkerLineMsgIds(parent->user()), Core::bufferActivities(parent->user()),
Core::highlightCounts(parent->user()),
parent),
_coreSession(parent),
_purgeBuffers(false)
{
connect(parent, SIGNAL(displayMsg(Message)), SLOT(addBufferActivity(Message)));
_coreSession(parent),
_purgeBuffers(false)
{
connect(parent, SIGNAL(displayMsg(Message)), SLOT(addBufferActivity(Message)));
+ connect(parent, SIGNAL(displayMsg(Message)), SLOT(addCoreHighlight(Message)));
}
void CoreBufferSyncer::requestSetLastSeenMsg(BufferId buffer, const MsgId &msgId)
{
if (setLastSeenMsg(buffer, msgId)) {
}
void CoreBufferSyncer::requestSetLastSeenMsg(BufferId buffer, const MsgId &msgId)
{
if (setLastSeenMsg(buffer, msgId)) {
- setBufferActivity(buffer, (int) Core::bufferActivity(buffer, msgId));
+ int activity = Core::bufferActivity(buffer, msgId);
+ int highlightCount = Core::highlightCount(buffer, msgId);
+
+ setBufferActivity(buffer, activity);
+ setHighlightCount(buffer, highlightCount);
+
dirtyLastSeenBuffers << buffer;
}
}
dirtyLastSeenBuffers << buffer;
}
}
@@
-78,9
+84,14
@@
void CoreBufferSyncer::storeDirtyIds()
Core::setBufferActivity(userId, bufferId, activity(bufferId));
}
Core::setBufferActivity(userId, bufferId, activity(bufferId));
}
+ foreach(BufferId bufferId, dirtyHighlights) {
+ Core::setHighlightCount(userId, bufferId, highlightCount(bufferId));
+ }
+
dirtyLastSeenBuffers.clear();
dirtyMarkerLineBuffers.clear();
dirtyActivities.clear();
dirtyLastSeenBuffers.clear();
dirtyMarkerLineBuffers.clear();
dirtyActivities.clear();
+ dirtyHighlights.clear();
}
}
@@
-190,7
+201,12
@@
void CoreBufferSyncer::purgeBufferIds()
}
}
}
}
-void CoreBufferSyncer::setBufferActivity(BufferId buffer,
const int &
activity) {
+void CoreBufferSyncer::setBufferActivity(BufferId buffer,
int
activity) {
BufferSyncer::setBufferActivity(buffer, activity);
dirtyActivities << buffer;
}
BufferSyncer::setBufferActivity(buffer, activity);
dirtyActivities << buffer;
}
+
+void CoreBufferSyncer::setHighlightCount(BufferId buffer, int highlightCount) {
+ BufferSyncer::setHighlightCount(buffer, highlightCount);
+ dirtyHighlights << buffer;
+}