From ed8a0fbbe0ba28bd321950c45e7bb5cd9249df2e Mon Sep 17 00:00:00 2001 From: Janne Koschinski Date: Tue, 19 Dec 2017 17:43:32 +0100 Subject: [PATCH] Implement changes requested in review --- src/client/client.cpp | 2 +- src/common/buffersyncer.h | 8 +++--- .../select_buffer_bufferactivities.sql | 2 +- .../select_buffer_bufferactivity.sql | 2 +- .../update_buffer_bufferactivity.sql | 2 +- ...de_000_alter_buffer_add_bufferactivity.sql | 2 +- .../SQLite/select_buffer_bufferactivities.sql | 2 +- .../SQLite/select_buffer_bufferactivity.sql | 2 +- .../SQLite/update_buffer_bufferactivity.sql | 2 +- ...de_000_alter_buffer_add_bufferactivity.sql | 2 +- src/core/core.h | 4 +-- src/core/corebuffersyncer.cpp | 5 ++-- src/core/corebuffersyncer.h | 28 +++++++++---------- src/core/postgresqlstorage.cpp | 4 +-- src/core/postgresqlstorage.h | 6 ++-- src/core/sqlitestorage.cpp | 4 +-- src/core/sqlitestorage.h | 6 ++-- src/core/storage.h | 4 +-- 18 files changed, 44 insertions(+), 43 deletions(-) diff --git a/src/client/client.cpp b/src/client/client.cpp index 1b6659a2..343ad854 100644 --- a/src/client/client.cpp +++ b/src/client/client.cpp @@ -390,7 +390,7 @@ void Client::setSyncedToCore() 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(); diff --git a/src/common/buffersyncer.h b/src/common/buffersyncer.h index ff78eb19..34d59c14 100644 --- a/src/common/buffersyncer.h +++ b/src/common/buffersyncer.h @@ -42,7 +42,7 @@ public: void markActivitiesChanged() { for (auto buffer : _bufferActivities.keys()) { - emit bufferActivityChange(buffer, activity(buffer)); + emit bufferActivityChanged(buffer, activity(buffer)); } } @@ -59,11 +59,11 @@ public slots: 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)) } @@ -87,7 +87,7 @@ signals: 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); diff --git a/src/core/SQL/PostgreSQL/select_buffer_bufferactivities.sql b/src/core/SQL/PostgreSQL/select_buffer_bufferactivities.sql index e40467cd..0e8fe3ae 100644 --- a/src/core/SQL/PostgreSQL/select_buffer_bufferactivities.sql +++ b/src/core/SQL/PostgreSQL/select_buffer_bufferactivities.sql @@ -1,3 +1,3 @@ SELECT bufferid, bufferactivity FROM buffer -WHERE userid = :userid \ No newline at end of file +WHERE userid = :userid diff --git a/src/core/SQL/PostgreSQL/select_buffer_bufferactivity.sql b/src/core/SQL/PostgreSQL/select_buffer_bufferactivity.sql index 294a6ccb..3156485a 100644 --- a/src/core/SQL/PostgreSQL/select_buffer_bufferactivity.sql +++ b/src/core/SQL/PostgreSQL/select_buffer_bufferactivity.sql @@ -3,4 +3,4 @@ FROM (SELECT DISTINCT TYPE FROM backlog WHERE bufferid = :bufferid - AND messageid > :lastseenmsgid) t; \ No newline at end of file + AND messageid > :lastseenmsgid) t; diff --git a/src/core/SQL/PostgreSQL/update_buffer_bufferactivity.sql b/src/core/SQL/PostgreSQL/update_buffer_bufferactivity.sql index 29400b99..7bd85d1f 100644 --- a/src/core/SQL/PostgreSQL/update_buffer_bufferactivity.sql +++ b/src/core/SQL/PostgreSQL/update_buffer_bufferactivity.sql @@ -1,3 +1,3 @@ UPDATE buffer SET bufferactivity = :bufferactivity -WHERE userid = :userid AND bufferid = :bufferid \ No newline at end of file +WHERE userid = :userid AND bufferid = :bufferid diff --git a/src/core/SQL/PostgreSQL/version/24/upgrade_000_alter_buffer_add_bufferactivity.sql b/src/core/SQL/PostgreSQL/version/24/upgrade_000_alter_buffer_add_bufferactivity.sql index b5cfa6cb..67d1ce58 100644 --- a/src/core/SQL/PostgreSQL/version/24/upgrade_000_alter_buffer_add_bufferactivity.sql +++ b/src/core/SQL/PostgreSQL/version/24/upgrade_000_alter_buffer_add_bufferactivity.sql @@ -1,2 +1,2 @@ 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 diff --git a/src/core/SQL/SQLite/select_buffer_bufferactivities.sql b/src/core/SQL/SQLite/select_buffer_bufferactivities.sql index e40467cd..0e8fe3ae 100644 --- a/src/core/SQL/SQLite/select_buffer_bufferactivities.sql +++ b/src/core/SQL/SQLite/select_buffer_bufferactivities.sql @@ -1,3 +1,3 @@ SELECT bufferid, bufferactivity FROM buffer -WHERE userid = :userid \ No newline at end of file +WHERE userid = :userid diff --git a/src/core/SQL/SQLite/select_buffer_bufferactivity.sql b/src/core/SQL/SQLite/select_buffer_bufferactivity.sql index 294a6ccb..3156485a 100644 --- a/src/core/SQL/SQLite/select_buffer_bufferactivity.sql +++ b/src/core/SQL/SQLite/select_buffer_bufferactivity.sql @@ -3,4 +3,4 @@ FROM (SELECT DISTINCT TYPE FROM backlog WHERE bufferid = :bufferid - AND messageid > :lastseenmsgid) t; \ No newline at end of file + AND messageid > :lastseenmsgid) t; diff --git a/src/core/SQL/SQLite/update_buffer_bufferactivity.sql b/src/core/SQL/SQLite/update_buffer_bufferactivity.sql index 29400b99..7bd85d1f 100644 --- a/src/core/SQL/SQLite/update_buffer_bufferactivity.sql +++ b/src/core/SQL/SQLite/update_buffer_bufferactivity.sql @@ -1,3 +1,3 @@ UPDATE buffer SET bufferactivity = :bufferactivity -WHERE userid = :userid AND bufferid = :bufferid \ No newline at end of file +WHERE userid = :userid AND bufferid = :bufferid diff --git a/src/core/SQL/SQLite/version/25/upgrade_000_alter_buffer_add_bufferactivity.sql b/src/core/SQL/SQLite/version/25/upgrade_000_alter_buffer_add_bufferactivity.sql index b5cfa6cb..67d1ce58 100644 --- a/src/core/SQL/SQLite/version/25/upgrade_000_alter_buffer_add_bufferactivity.sql +++ b/src/core/SQL/SQLite/version/25/upgrade_000_alter_buffer_add_bufferactivity.sql @@ -1,2 +1,2 @@ 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 diff --git a/src/core/core.h b/src/core/core.h index 420cc62a..4e0deec7 100644 --- a/src/core/core.h +++ b/src/core/core.h @@ -539,7 +539,7 @@ public: * \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); } @@ -561,7 +561,7 @@ public: * \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); } diff --git a/src/core/corebuffersyncer.cpp b/src/core/corebuffersyncer.cpp index caed62e2..ce90e42e 100644 --- a/src/core/corebuffersyncer.cpp +++ b/src/core/corebuffersyncer.cpp @@ -45,7 +45,8 @@ CoreBufferSyncer::CoreBufferSyncer(CoreSession *parent) 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; } } @@ -190,7 +191,7 @@ void CoreBufferSyncer::purgeBufferIds() } } -void CoreBufferSyncer::setBufferActivity(BufferId buffer, const int &activity) { +void CoreBufferSyncer::setBufferActivity(BufferId buffer, int activity) { BufferSyncer::setBufferActivity(buffer, activity); dirtyActivities << buffer; } diff --git a/src/core/corebuffersyncer.h b/src/core/corebuffersyncer.h index af009d06..93e2cf90 100644 --- a/src/core/corebuffersyncer.h +++ b/src/core/corebuffersyncer.h @@ -31,33 +31,33 @@ 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) { + inline void requestMarkBufferAsRead(BufferId buffer) override { setBufferActivity(buffer, (int) Message::Types()); markBufferAsRead(buffer); } @@ -65,7 +65,7 @@ public slots: void storeDirtyIds(); protected: - virtual void customEvent(QEvent *event); + void customEvent(QEvent *event) override; private: CoreSession *_coreSession; diff --git a/src/core/postgresqlstorage.cpp b/src/core/postgresqlstorage.cpp index 23787691..955253b7 100644 --- a/src/core/postgresqlstorage.cpp +++ b/src/core/postgresqlstorage.cpp @@ -1386,7 +1386,7 @@ QHash PostgreSqlStorage::bufferMarkerLineMsgIds(UserId user) } -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")); @@ -1426,7 +1426,7 @@ QHash PostgreSqlStorage::bufferActivities(UserId user) 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")); diff --git a/src/core/postgresqlstorage.h b/src/core/postgresqlstorage.h index ca6e90fc..02aca2fb 100644 --- a/src/core/postgresqlstorage.h +++ b/src/core/postgresqlstorage.h @@ -96,9 +96,9 @@ public slots: virtual QHash bufferLastSeenMsgIds(UserId user); virtual void setBufferMarkerLineMsg(UserId user, const BufferId &bufferId, const MsgId &msgId); virtual QHash bufferMarkerLineMsgIds(UserId user); - virtual void setBufferActivity(UserId id, const BufferId &bufferId, const Message::Types &type); - virtual QHash bufferActivities(UserId id); - virtual Message::Types bufferActivity(BufferId &bufferId, const MsgId &lastSeenMsgId); + virtual void setBufferActivity(UserId id, BufferId bufferId, Message::Types type); + QHash bufferActivities(UserId id) override; + Message::Types bufferActivity(BufferId bufferId, MsgId lastSeenMsgId) override; /* Message handling */ virtual bool logMessage(Message &msg); diff --git a/src/core/sqlitestorage.cpp b/src/core/sqlitestorage.cpp index 78b688a2..3044fcc8 100644 --- a/src/core/sqlitestorage.cpp +++ b/src/core/sqlitestorage.cpp @@ -1503,7 +1503,7 @@ QHash SqliteStorage::bufferMarkerLineMsgIds(UserId user) 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(); @@ -1553,7 +1553,7 @@ QHash SqliteStorage::bufferActivities(UserId user) } -Message::Types SqliteStorage::bufferActivity(BufferId &bufferId, const MsgId &lastSeenMsgId) +Message::Types SqliteStorage::bufferActivity(BufferId bufferId, MsgId lastSeenMsgId) { QSqlDatabase db = logDb(); db.transaction(); diff --git a/src/core/sqlitestorage.h b/src/core/sqlitestorage.h index 04381e2a..75e32f3a 100644 --- a/src/core/sqlitestorage.h +++ b/src/core/sqlitestorage.h @@ -97,9 +97,9 @@ public slots: virtual QHash bufferLastSeenMsgIds(UserId user); virtual void setBufferMarkerLineMsg(UserId user, const BufferId &bufferId, const MsgId &msgId); virtual QHash bufferMarkerLineMsgIds(UserId user); - virtual void setBufferActivity(UserId id, const BufferId &bufferId, const Message::Types &type); - virtual QHash bufferActivities(UserId id) override; - virtual Message::Types bufferActivity(BufferId &bufferId, const MsgId &lastSeenMsgId); + virtual void setBufferActivity(UserId id, BufferId bufferId, Message::Types type); + QHash bufferActivities(UserId id) override; + Message::Types bufferActivity(BufferId bufferId, MsgId lastSeenMsgId) override; /* Message handling */ virtual bool logMessage(Message &msg); diff --git a/src/core/storage.h b/src/core/storage.h index 32018f43..d0f2ae37 100644 --- a/src/core/storage.h +++ b/src/core/storage.h @@ -392,7 +392,7 @@ public slots: * \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 @@ -409,7 +409,7 @@ public slots: * \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 */ -- 2.20.1