X-Git-Url: https://git.quassel-irc.org/?a=blobdiff_plain;f=src%2Fcore%2Fcorebuffersyncer.h;h=6aeaa6d3c9d0cd6b8df8f8111e2d40c186729613;hb=0dbec2cfc937857d66a9645249f876f1e6b3f05e;hp=c490419a95bd7363fd241cdb43dd4e817eb32b5e;hpb=fd16e241d2fd1f33f4625b3255956f025a67273b;p=quassel.git diff --git a/src/core/corebuffersyncer.h b/src/core/corebuffersyncer.h index c490419a..6aeaa6d3 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-2018 by the Quassel Project * * devel@quassel-irc.org * * * * This program is free software; you can redistribute it and/or modify * @@ -31,41 +31,42 @@ class CoreBufferSyncer : public BufferSyncer Q_OBJECT public: - CoreBufferSyncer(CoreSession *parent); + explicit CoreBufferSyncer(CoreSession *parent); 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; - void addBufferActivity(Message message) { + void addBufferActivity(const Message &message) { auto oldActivity = activity(message.bufferId()); if (!oldActivity.testFlag(message.type())) { setBufferActivity(message.bufferId(), (int) (oldActivity | message.type())); } } - void setBufferActivity(BufferId buffer, const int &activity) override; + void setBufferActivity(BufferId buffer, int activity) override; - virtual inline void requestRenameBuffer(BufferId buffer, QString newName) { renameBuffer(buffer, newName); } - virtual void renameBuffer(BufferId buffer, QString newName); + inline void requestRenameBuffer(BufferId buffer, QString newName) override { renameBuffer(buffer, newName); } + void renameBuffer(BufferId buffer, QString newName) override; - virtual inline void requestMergeBuffersPermanently(BufferId buffer1, BufferId buffer2) { mergeBuffersPermanently(buffer1, buffer2); } - virtual void mergeBuffersPermanently(BufferId buffer1, BufferId buffer2); + inline void requestMergeBuffersPermanently(BufferId buffer1, BufferId buffer2) override { mergeBuffersPermanently(buffer1, buffer2); } + void mergeBuffersPermanently(BufferId buffer1, BufferId buffer2) override; - virtual void requestPurgeBufferIds(); + void requestPurgeBufferIds() override; - virtual inline void requestMarkBufferAsRead(BufferId buffer) { - setLastSeenMsg(buffer, (int) Message::Types()); + inline void requestMarkBufferAsRead(BufferId buffer) override { + int activity = Message::Types(); + setBufferActivity(buffer, activity); markBufferAsRead(buffer); } void storeDirtyIds(); protected: - virtual void customEvent(QEvent *event); + void customEvent(QEvent *event) override; private: CoreSession *_coreSession;