projects
/
quassel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
cmake: Fix build with Qt 5.11
[quassel.git]
/
src
/
core
/
corebuffersyncer.h
diff --git
a/src/core/corebuffersyncer.h
b/src/core/corebuffersyncer.h
index
cb58b0a
..
6aeaa6d
100644
(file)
--- a/
src/core/corebuffersyncer.h
+++ b/
src/core/corebuffersyncer.h
@@
-1,5
+1,5
@@
/***************************************************************************
/***************************************************************************
- * Copyright (C) 2005-
09 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 *
* devel@quassel-irc.org *
* *
* This program is free software; you can redistribute it and/or modify *
@@
-15,7
+15,7
@@
* 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., *
* 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., *
- * 5
9 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*
+ * 5
1 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*
***************************************************************************/
#ifndef COREBUFFERSYNCER_H
***************************************************************************/
#ifndef COREBUFFERSYNCER_H
@@
-25,43
+25,59
@@
class CoreSession;
class CoreSession;
-class CoreBufferSyncer : public BufferSyncer {
- SYNCABLE_OBJECT
- Q_OBJECT
+class CoreBufferSyncer : public BufferSyncer
+{
+ SYNCABLE_OBJECT
+ Q_OBJECT
public:
public:
- CoreBufferSyncer(CoreSession *parent);
+
explicit
CoreBufferSyncer(CoreSession *parent);
public slots:
public slots:
-
virtual void requestSetLastSeenMsg(BufferId buffer, const MsgId &msgId)
;
-
virtual void requestSetMarkerLine(BufferId buffer, const MsgId &msgId)
;
+
void requestSetLastSeenMsg(BufferId buffer, const MsgId &msgId) override
;
+
void requestSetMarkerLine(BufferId buffer, const MsgId &msgId) override
;
-
virtual inline void requestRemoveBuffer(BufferId buffer)
{ removeBuffer(buffer); }
-
virtual void removeBuffer(BufferId bufferId)
;
+
inline void requestRemoveBuffer(BufferId buffer) override
{ removeBuffer(buffer); }
+
void removeBuffer(BufferId bufferId) override
;
- virtual inline void requestRenameBuffer(BufferId buffer, QString newName) { renameBuffer(buffer, newName); }
- virtual void renameBuffer(BufferId buffer, QString newName);
+ void addBufferActivity(const Message &message) {
+ auto oldActivity = activity(message.bufferId());
+ if (!oldActivity.testFlag(message.type())) {
+ setBufferActivity(message.bufferId(), (int) (oldActivity | message.type()));
+ }
+ }
- virtual inline void requestMergeBuffersPermanently(BufferId buffer1, BufferId buffer2) { mergeBuffersPermanently(buffer1, buffer2); }
- virtual void mergeBuffersPermanently(BufferId buffer1, BufferId buffer2);
+ void setBufferActivity(BufferId buffer, int activity) override;
- virtual void requestPurgeBufferIds();
+ inline void requestRenameBuffer(BufferId buffer, QString newName) override { renameBuffer(buffer, newName); }
+ void renameBuffer(BufferId buffer, QString newName) override;
- virtual inline void requestMarkBufferAsRead(BufferId buffer) { markBufferAsRead(buffer); }
+ inline void requestMergeBuffersPermanently(BufferId buffer1, BufferId buffer2) override { mergeBuffersPermanently(buffer1, buffer2); }
+ void mergeBuffersPermanently(BufferId buffer1, BufferId buffer2) override;
- void storeDirtyIds();
+ void requestPurgeBufferIds() override;
+
+ inline void requestMarkBufferAsRead(BufferId buffer) override {
+ int activity = Message::Types();
+ setBufferActivity(buffer, activity);
+ markBufferAsRead(buffer);
+ }
+
+ void storeDirtyIds();
protected:
protected:
-
virtual void customEvent(QEvent *event)
;
+
void customEvent(QEvent *event) override
;
private:
private:
- CoreSession *_coreSession;
- bool _purgeBuffers;
+
CoreSession *_coreSession;
+
bool _purgeBuffers;
- QSet<BufferId> dirtyLastSeenBuffers;
- QSet<BufferId> dirtyMarkerLineBuffers;
+ QSet<BufferId> dirtyLastSeenBuffers;
+ QSet<BufferId> dirtyMarkerLineBuffers;
+ QSet<BufferId> dirtyActivities;
- void purgeBufferIds();
+
void purgeBufferIds();
};
};
+
#endif //COREBUFFERSYNCER_H
#endif //COREBUFFERSYNCER_H