diff options
author | MTRNord <mtrnord1@gmail.com> | 2021-12-23 02:46:33 +0100 |
---|---|---|
committer | MTRNord <mtrnord1@gmail.com> | 2021-12-23 02:46:33 +0100 |
commit | a872bdf8c5dc17f901cc9f553d4ff2539f0334f6 (patch) | |
tree | 337f9c8d5bebde948b73048907d887955a7531c9 /src/timeline | |
parent | Apply (selective) Clang-tidy and clazy suggestions on TimelineModel (diff) | |
download | nheko-a872bdf8c5dc17f901cc9f553d4ff2539f0334f6.tar.xz |
Apply (selective) Clang-tidy move and some new detected const pointer suggestions on TimelineModel
Diffstat (limited to 'src/timeline')
-rw-r--r-- | src/timeline/TimelineModel.cpp | 15 | ||||
-rw-r--r-- | src/timeline/TimelineModel.h | 8 |
2 files changed, 12 insertions, 11 deletions
diff --git a/src/timeline/TimelineModel.cpp b/src/timeline/TimelineModel.cpp index 3fe52553..543d2c84 100644 --- a/src/timeline/TimelineModel.cpp +++ b/src/timeline/TimelineModel.cpp @@ -17,6 +17,7 @@ #include <QRegularExpression> #include <QStandardPaths> #include <QVariant> +#include <utility> #include "Cache_p.h" #include "ChatPage.h" @@ -407,7 +408,7 @@ TimelineModel::TimelineModel(TimelineViewManager *manager, const QString &room_i ChatPage::instance()->receivedRoomDeviceVerificationRequest(msg, this); }); connect(&events, &EventStore::updateFlowEventId, this, [this](std::string event_id) { - this->updateFlowEventId(event_id); + this->updateFlowEventId(std::move(event_id)); }); // When a message is sent, check if the current edit/reply relates to that message, @@ -1069,11 +1070,11 @@ TimelineModel::forwardMessage(const QString & eventId, QString roomId) if (!e) return; - emit forwardToRoom(e, roomId); + emit forwardToRoom(e, std::move(roomId)); } void -TimelineModel::viewDecryptedRawMessage(QString id) +TimelineModel::viewDecryptedRawMessage(const QString &id) { auto e = events.get(id.toStdString(), ""); if (!e) @@ -1086,7 +1087,7 @@ TimelineModel::viewDecryptedRawMessage(QString id) void TimelineModel::openUserProfile(QString userid) { - UserProfile *userProfile = new UserProfile(room_id_, userid, manager_, this); + UserProfile *userProfile = new UserProfile(room_id_, std::move(userid), manager_, this); connect(this, &TimelineModel::roomAvatarUrlChanged, userProfile, &UserProfile::updateAvatarUrl); emit manager_->openProfile(userProfile); } @@ -1094,7 +1095,7 @@ TimelineModel::openUserProfile(QString userid) void TimelineModel::replyAction(QString id) { - setReply(id); + setReply(std::move(id)); } void @@ -1423,7 +1424,7 @@ TimelineModel::addPendingMessage(mtx::events::collections::TimelineEvents event) } void -TimelineModel::openMedia(QString eventId) +TimelineModel::openMedia(const QString &eventId) { cacheMedia(eventId, [](const QString &filename) { QDesktopServices::openUrl(QUrl::fromLocalFile(filename)); }); @@ -1700,7 +1701,7 @@ TimelineModel::copyLinkToEvent(const QString &eventId) const } QString -TimelineModel::formatTypingUsers(const std::vector<QString> &users, QColor bg) +TimelineModel::formatTypingUsers(const std::vector<QString> &users, const QColor &bg) { QString temp = tr("%1 and %2 are typing.", diff --git a/src/timeline/TimelineModel.h b/src/timeline/TimelineModel.h index 4d6f7015..f9f11009 100644 --- a/src/timeline/TimelineModel.h +++ b/src/timeline/TimelineModel.h @@ -245,7 +245,7 @@ public: Q_INVOKABLE QString displayName(QString id) const; Q_INVOKABLE QString avatarUrl(QString id) const; Q_INVOKABLE QString formatDateSeparator(QDate date) const; - Q_INVOKABLE QString formatTypingUsers(const std::vector<QString> &users, QColor bg); + Q_INVOKABLE QString formatTypingUsers(const std::vector<QString> &users, const QColor &bg); Q_INVOKABLE bool showAcceptKnockButton(const QString &id); Q_INVOKABLE void acceptKnock(const QString &id); Q_INVOKABLE QString formatMemberEvent(const QString &id); @@ -257,7 +257,7 @@ public: Q_INVOKABLE void viewRawMessage(const QString &id); Q_INVOKABLE void forwardMessage(const QString &eventId, QString roomId); - Q_INVOKABLE void viewDecryptedRawMessage(QString id); + Q_INVOKABLE void viewDecryptedRawMessage(const QString &id); Q_INVOKABLE void openUserProfile(QString userid); Q_INVOKABLE void editAction(QString id); Q_INVOKABLE void replyAction(QString id); @@ -267,7 +267,7 @@ public: Q_INVOKABLE void redactEvent(const QString &id); Q_INVOKABLE int idToIndex(const QString &id) const; Q_INVOKABLE QString indexToId(int index) const; - Q_INVOKABLE void openMedia(QString eventId); + Q_INVOKABLE void openMedia(const QString &eventId); Q_INVOKABLE void cacheMedia(const QString &eventId); Q_INVOKABLE bool saveMedia(const QString &eventId) const; Q_INVOKABLE void showEvent(QString eventId); @@ -331,7 +331,7 @@ public slots: std::vector<QString> typingUsers() const { return typingUsers_; } bool paginationInProgress() const { return m_paginationInProgress; } QString reply() const { return reply_; } - void setReply(QString newReply) + void setReply(const QString &newReply) { if (edit_.startsWith('m')) return; |