connect(bufferSyncer(), SIGNAL(buffersPermanentlyMerged(BufferId, BufferId)), this, SLOT(buffersPermanentlyMerged(BufferId, BufferId)));
connect(bufferSyncer(), SIGNAL(buffersPermanentlyMerged(BufferId, BufferId)), _messageModel, SLOT(buffersPermanentlyMerged(BufferId, BufferId)));
connect(bufferSyncer(), SIGNAL(bufferMarkedAsRead(BufferId)), SIGNAL(bufferMarkedAsRead(BufferId)));
- connect(bufferSyncer(), SIGNAL(bufferActivityChange(BufferId, const Message::Types)), _networkModel, SLOT(bufferActivityChanged(BufferId, const Message::Types)));
+ connect(bufferSyncer(), SIGNAL(bufferActivityChanged(BufferId, const Message::Types)), _networkModel, SLOT(bufferActivityChanged(BufferId, const Message::Types)));
connect(networkModel(), SIGNAL(requestSetLastSeenMsg(BufferId, MsgId)), bufferSyncer(), SLOT(requestSetLastSeenMsg(BufferId, const MsgId &)));
SignalProxy *p = signalProxy();
void markActivitiesChanged() {
for (auto buffer : _bufferActivities.keys()) {
- emit bufferActivityChange(buffer, activity(buffer));
+ emit bufferActivityChanged(buffer, activity(buffer));
}
}
virtual inline void requestSetLastSeenMsg(BufferId buffer, const MsgId &msgId) { REQUEST(ARG(buffer), ARG(msgId)) }
virtual inline void requestSetMarkerLine(BufferId buffer, const MsgId &msgId) { REQUEST(ARG(buffer), ARG(msgId)) setMarkerLine(buffer, msgId); }
- virtual inline void setBufferActivity(BufferId buffer, const int &activity) {
+ virtual inline void setBufferActivity(BufferId buffer, int activity) {
auto flags = Message::Types(activity);
SYNC(ARG(buffer), ARG(activity));
_bufferActivities[buffer] = flags;
- emit bufferActivityChange(buffer, flags);
+ emit bufferActivityChanged(buffer, flags);
}
virtual inline void requestRemoveBuffer(BufferId buffer) { REQUEST(ARG(buffer)) }
void bufferRenamed(BufferId buffer, QString newName);
void buffersPermanentlyMerged(BufferId buffer1, BufferId buffer2);
void bufferMarkedAsRead(BufferId buffer);
- void bufferActivityChange(BufferId, Message::Types);
+ void bufferActivityChanged(BufferId, Message::Types);
protected slots:
bool setLastSeenMsg(BufferId buffer, const MsgId &msgId);
SELECT bufferid, bufferactivity
FROM buffer
-WHERE userid = :userid
\ No newline at end of file
+WHERE userid = :userid
(SELECT DISTINCT TYPE
FROM backlog
WHERE bufferid = :bufferid
- AND messageid > :lastseenmsgid) t;
\ No newline at end of file
+ AND messageid > :lastseenmsgid) t;
UPDATE buffer
SET bufferactivity = :bufferactivity
-WHERE userid = :userid AND bufferid = :bufferid
\ No newline at end of file
+WHERE userid = :userid AND bufferid = :bufferid
ALTER TABLE buffer
-ADD COLUMN bufferactivity integer NOT NULL DEFAULT 0
\ No newline at end of file
+ADD COLUMN bufferactivity integer NOT NULL DEFAULT 0
SELECT bufferid, bufferactivity
FROM buffer
-WHERE userid = :userid
\ No newline at end of file
+WHERE userid = :userid
(SELECT DISTINCT TYPE
FROM backlog
WHERE bufferid = :bufferid
- AND messageid > :lastseenmsgid) t;
\ No newline at end of file
+ AND messageid > :lastseenmsgid) t;
UPDATE buffer
SET bufferactivity = :bufferactivity
-WHERE userid = :userid AND bufferid = :bufferid
\ No newline at end of file
+WHERE userid = :userid AND bufferid = :bufferid
ALTER TABLE buffer
-ADD COLUMN bufferactivity integer NOT NULL DEFAULT 0
\ No newline at end of file
+ADD COLUMN bufferactivity integer NOT NULL DEFAULT 0
* \param bufferId The buffer id
* \param MsgId The Message id where the marker line should be placed
*/
- static inline void setBufferActivity(UserId user, const BufferId &bufferId, const Message::Types &activity) {
+ static inline void setBufferActivity(UserId user, BufferId bufferId, Message::Types activity) {
return instance()->_storage->setBufferActivity(user, bufferId, activity);
}
* \param bufferId The buffer
* \param lastSeenMsgId The last seen message
*/
- static inline Message::Types bufferActivity(BufferId &bufferId, const MsgId &lastSeenMsgId) {
+ static inline Message::Types bufferActivity(BufferId bufferId, MsgId lastSeenMsgId) {
return instance()->_storage->bufferActivity(bufferId, lastSeenMsgId);
}
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);
+ setBufferActivity(buffer, activity);
dirtyLastSeenBuffers << buffer;
}
}
}
}
-void CoreBufferSyncer::setBufferActivity(BufferId buffer, const int &activity) {
+void CoreBufferSyncer::setBufferActivity(BufferId buffer, int activity) {
BufferSyncer::setBufferActivity(buffer, activity);
dirtyActivities << buffer;
}
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) {
+ inline void requestMarkBufferAsRead(BufferId buffer) override {
setBufferActivity(buffer, (int) Message::Types());
markBufferAsRead(buffer);
}
void storeDirtyIds();
protected:
- virtual void customEvent(QEvent *event);
+ void customEvent(QEvent *event) override;
private:
CoreSession *_coreSession;
}
-void PostgreSqlStorage::setBufferActivity(UserId user, const BufferId &bufferId, const Message::Types &bufferActivity)
+void PostgreSqlStorage::setBufferActivity(UserId user, BufferId bufferId, Message::Types bufferActivity)
{
QSqlQuery query(logDb());
query.prepare(queryString("update_buffer_bufferactivity"));
return bufferActivityHash;
}
-Message::Types PostgreSqlStorage::bufferActivity(BufferId &bufferId, const MsgId &lastSeenMsgId)
+Message::Types PostgreSqlStorage::bufferActivity(BufferId bufferId, MsgId lastSeenMsgId)
{
QSqlQuery query(logDb());
query.prepare(queryString("select_buffer_bufferactivity"));
virtual QHash<BufferId, MsgId> bufferLastSeenMsgIds(UserId user);
virtual void setBufferMarkerLineMsg(UserId user, const BufferId &bufferId, const MsgId &msgId);
virtual QHash<BufferId, MsgId> bufferMarkerLineMsgIds(UserId user);
- virtual void setBufferActivity(UserId id, const BufferId &bufferId, const Message::Types &type);
- virtual QHash<BufferId, Message::Types> bufferActivities(UserId id);
- virtual Message::Types bufferActivity(BufferId &bufferId, const MsgId &lastSeenMsgId);
+ virtual void setBufferActivity(UserId id, BufferId bufferId, Message::Types type);
+ QHash<BufferId, Message::Types> bufferActivities(UserId id) override;
+ Message::Types bufferActivity(BufferId bufferId, MsgId lastSeenMsgId) override;
/* Message handling */
virtual bool logMessage(Message &msg);
return markerLineHash;
}
-void SqliteStorage::setBufferActivity(UserId user, const BufferId &bufferId, const Message::Types &bufferActivity)
+void SqliteStorage::setBufferActivity(UserId user, BufferId bufferId, Message::Types bufferActivity)
{
QSqlDatabase db = logDb();
db.transaction();
}
-Message::Types SqliteStorage::bufferActivity(BufferId &bufferId, const MsgId &lastSeenMsgId)
+Message::Types SqliteStorage::bufferActivity(BufferId bufferId, MsgId lastSeenMsgId)
{
QSqlDatabase db = logDb();
db.transaction();
virtual QHash<BufferId, MsgId> bufferLastSeenMsgIds(UserId user);
virtual void setBufferMarkerLineMsg(UserId user, const BufferId &bufferId, const MsgId &msgId);
virtual QHash<BufferId, MsgId> bufferMarkerLineMsgIds(UserId user);
- virtual void setBufferActivity(UserId id, const BufferId &bufferId, const Message::Types &type);
- virtual QHash<BufferId, Message::Types> bufferActivities(UserId id) override;
- virtual Message::Types bufferActivity(BufferId &bufferId, const MsgId &lastSeenMsgId);
+ virtual void setBufferActivity(UserId id, BufferId bufferId, Message::Types type);
+ QHash<BufferId, Message::Types> bufferActivities(UserId id) override;
+ Message::Types bufferActivity(BufferId bufferId, MsgId lastSeenMsgId) override;
/* Message handling */
virtual bool logMessage(Message &msg);
* \param bufferId The buffer id
* \param MsgId The Message id where the marker line should be placed
*/
- virtual void setBufferActivity(UserId id, const BufferId &bufferId, const Message::Types &type) = 0;
+ virtual void setBufferActivity(UserId id, BufferId bufferId, Message::Types type) = 0;
//! Get a Hash of all buffer activity states
/** This Method is called when the Quassel Core is started to restore the BufferActivities
* \param bufferId The buffer
* \param lastSeenMsgId The last seen message
*/
- virtual Message::Types bufferActivity(BufferId &bufferId, const MsgId &lastSeenMsgId) = 0;
+ virtual Message::Types bufferActivity(BufferId bufferId, MsgId lastSeenMsgId) = 0;
/* Message handling */