X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fcore%2Fcorebuffersyncer.h;h=87023c5a5b881a3ee2eb1f97e335b491c0521389;hp=1cf66fd47af42df3f9a242f187b641877b584b04;hb=c0d6dc0dec628f2e143e37ecc95cec45e636f8a5;hpb=c9c7a444453b988b277cf746b10fde5dadf73a2c

diff --git a/src/core/corebuffersyncer.h b/src/core/corebuffersyncer.h
index 1cf66fd4..87023c5a 100644
--- a/src/core/corebuffersyncer.h
+++ b/src/core/corebuffersyncer.h
@@ -1,5 +1,5 @@
 /***************************************************************************
- *   Copyright (C) 2005-2016 by the Quassel Project                        *
+ *   Copyright (C) 2005-2020 by the Quassel Project                        *
  *   devel@quassel-irc.org                                                 *
  *                                                                         *
  *   This program is free software; you can redistribute it and/or modify  *
@@ -18,8 +18,7 @@
  *   51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.         *
  ***************************************************************************/
 
-#ifndef COREBUFFERSYNCER_H
-#define COREBUFFERSYNCER_H
+#pragma once
 
 #include "buffersyncer.h"
 
@@ -27,28 +26,38 @@ class CoreSession;
 
 class CoreBufferSyncer : public BufferSyncer
 {
-    SYNCABLE_OBJECT
-        Q_OBJECT
+    Q_OBJECT
 
 public:
-    explicit CoreBufferSyncer(CoreSession *parent);
+    explicit CoreBufferSyncer(CoreSession* parent);
 
 public slots:
-    void requestSetLastSeenMsg(BufferId buffer, const MsgId &msgId) override;
-    void requestSetMarkerLine(BufferId buffer, const MsgId &msgId) override;
+    void requestSetLastSeenMsg(BufferId buffer, const MsgId& msgId) override;
+    void requestSetMarkerLine(BufferId buffer, const MsgId& msgId) override;
 
     inline void requestRemoveBuffer(BufferId buffer) override { removeBuffer(buffer); }
     void removeBuffer(BufferId bufferId) override;
 
-    void addBufferActivity(const Message &message) {
+    void addBufferActivity(const Message& message)
+    {
         auto oldActivity = activity(message.bufferId());
         if (!oldActivity.testFlag(message.type())) {
-            setBufferActivity(message.bufferId(), (int) (oldActivity | message.type()));
+            setBufferActivity(message.bufferId(), (int)(oldActivity | message.type()));
+        }
+    }
+
+    void addCoreHighlight(const Message& message)
+    {
+        auto oldHighlightCount = highlightCount(message.bufferId());
+        if (message.flags().testFlag(Message::Flag::Highlight) && !message.flags().testFlag(Message::Flag::Self)) {
+            setHighlightCount(message.bufferId(), oldHighlightCount + 1);
         }
     }
 
     void setBufferActivity(BufferId buffer, int activity) override;
 
+    void setHighlightCount(BufferId buffer, int highlightCount) override;
+
     inline void requestRenameBuffer(BufferId buffer, QString newName) override { renameBuffer(buffer, newName); }
     void renameBuffer(BufferId buffer, QString newName) override;
 
@@ -57,27 +66,27 @@ public slots:
 
     void requestPurgeBufferIds() override;
 
-    inline void requestMarkBufferAsRead(BufferId buffer) override {
+    inline void requestMarkBufferAsRead(BufferId buffer) override
+    {
         int activity = Message::Types();
         setBufferActivity(buffer, activity);
+        setHighlightCount(buffer, 0);
         markBufferAsRead(buffer);
     }
 
     void storeDirtyIds();
 
 protected:
-    void customEvent(QEvent *event) override;
+    void customEvent(QEvent* event) override;
 
 private:
-    CoreSession *_coreSession;
+    CoreSession* _coreSession;
     bool _purgeBuffers;
 
     QSet<BufferId> dirtyLastSeenBuffers;
     QSet<BufferId> dirtyMarkerLineBuffers;
     QSet<BufferId> dirtyActivities;
+    QSet<BufferId> dirtyHighlights;
 
     void purgeBufferIds();
 };
-
-
-#endif //COREBUFFERSYNCER_H