summary refs log tree commit diff
path: root/src/timeline
diff options
context:
space:
mode:
authorLoren Burkholder <55629213+LorenDB@users.noreply.github.com>2022-10-03 17:57:30 -0400
committerGitHub <noreply@github.com>2022-10-03 21:57:30 +0000
commit8ecbb39dc6303fcf3ae36ad033d7e90ea29b9003 (patch)
treeccbf44824e2a038254ce77ae3890d2d6d86b0a94 /src/timeline
parentMerge pull request #1202 from Nheko-Reborn/grammar (diff)
downloadnheko-8ecbb39dc6303fcf3ae36ad033d7e90ea29b9003.tar.xz
cppcheck stuff (#1200)
* cppcheck stuff

* Update src/ui/RoomSettings.cpp

Co-authored-by: DeepBlueV7.X <nicolas.werner@hotmail.de>

* Update src/ui/RoomSettings.cpp

Co-authored-by: DeepBlueV7.X <nicolas.werner@hotmail.de>

* Fix linting

Co-authored-by: DeepBlueV7.X <nicolas.werner@hotmail.de>
Diffstat (limited to 'src/timeline')
-rw-r--r--src/timeline/CommunitiesModel.cpp4
-rw-r--r--src/timeline/CommunitiesModel.h2
-rw-r--r--src/timeline/EventStore.cpp5
-rw-r--r--src/timeline/InputBar.cpp8
-rw-r--r--src/timeline/InputBar.h6
-rw-r--r--src/timeline/RoomlistModel.cpp8
-rw-r--r--src/timeline/RoomlistModel.h10
-rw-r--r--src/timeline/TimelineModel.cpp4
-rw-r--r--src/timeline/TimelineModel.h4
-rw-r--r--src/timeline/TimelineViewManager.cpp6
-rw-r--r--src/timeline/TimelineViewManager.h7
11 files changed, 33 insertions, 31 deletions
diff --git a/src/timeline/CommunitiesModel.cpp b/src/timeline/CommunitiesModel.cpp

index 083f9668..ef023cee 100644 --- a/src/timeline/CommunitiesModel.cpp +++ b/src/timeline/CommunitiesModel.cpp
@@ -693,7 +693,7 @@ enum Categories }; Categories -tagIdToCat(QString tagId) +tagIdToCat(const QString &tagId) { if (tagId.isEmpty()) return World; @@ -757,7 +757,7 @@ FilteredCommunitiesModel::filterAcceptsRow(int sourceRow, const QModelIndex &) c } QVariantList -CommunitiesModel::spaceChildrenListFromIndex(QString room, int idx) const +CommunitiesModel::spaceChildrenListFromIndex(const QString &room, int idx) const { if (idx < -1) return {}; diff --git a/src/timeline/CommunitiesModel.h b/src/timeline/CommunitiesModel.h
index 786516e0..001c538d 100644 --- a/src/timeline/CommunitiesModel.h +++ b/src/timeline/CommunitiesModel.h
@@ -167,7 +167,7 @@ public: return false; } - Q_INVOKABLE QVariantList spaceChildrenListFromIndex(QString room, int idx = -1) const; + Q_INVOKABLE QVariantList spaceChildrenListFromIndex(const QString &room, int idx = -1) const; Q_INVOKABLE void updateSpaceStatus(QString space, QString room, bool setParent, diff --git a/src/timeline/EventStore.cpp b/src/timeline/EventStore.cpp
index 81f2eb9c..0b7a7b1b 100644 --- a/src/timeline/EventStore.cpp +++ b/src/timeline/EventStore.cpp
@@ -43,8 +43,9 @@ EventStore::EventStore(std::string room_id, QObject *) this, &EventStore::eventFetched, this, - [this]( - std::string id, std::string relatedTo, mtx::events::collections::TimelineEvents timeline) { + [this](const std::string &id, + const std::string &relatedTo, + mtx::events::collections::TimelineEvents timeline) { cache::client()->storeEvent(room_id_, id, {timeline}); if (!relatedTo.empty()) { diff --git a/src/timeline/InputBar.cpp b/src/timeline/InputBar.cpp
index 6854fce3..a9afb01c 100644 --- a/src/timeline/InputBar.cpp +++ b/src/timeline/InputBar.cpp
@@ -803,8 +803,8 @@ InputBar::command(const QString &command, QString args) } MediaUpload::MediaUpload(std::unique_ptr<QIODevice> source_, - QString mimetype, - QString originalFilename, + const QString &mimetype, + const QString &originalFilename, bool encrypt, QObject *parent) : QObject(parent) @@ -911,7 +911,7 @@ MediaUpload::MediaUpload(std::unique_ptr<QIODevice> source_, connect(mediaPlayer, qOverload<const QString &, const QVariant &>(&QMediaPlayer::metaDataChanged), this, - [this, mediaPlayer](QString t, QVariant) { + [this, mediaPlayer](const QString &t, const QVariant &) { nhlog::ui()->debug("Got metadata {}", t.toStdString()); if (mediaPlayer->duration() > 0) @@ -1029,7 +1029,7 @@ MediaUpload::startUpload() } void -InputBar::finalizeUpload(MediaUpload *upload, QString url) +InputBar::finalizeUpload(MediaUpload *upload, const QString &url) { auto mime = upload->mimetype(); auto filename = upload->filename(); diff --git a/src/timeline/InputBar.h b/src/timeline/InputBar.h
index d130fb8b..066074f7 100644 --- a/src/timeline/InputBar.h +++ b/src/timeline/InputBar.h
@@ -83,8 +83,8 @@ public: Q_ENUM(MediaType) explicit MediaUpload(std::unique_ptr<QIODevice> data, - QString mimetype, - QString originalFilename, + const QString &mimetype, + const QString &originalFilename, bool encrypt, QObject *parent = nullptr); @@ -218,7 +218,7 @@ private slots: void startTyping(); void stopTyping(); - void finalizeUpload(MediaUpload *upload, QString url); + void finalizeUpload(MediaUpload *upload, const QString &url); void removeRunUpload(MediaUpload *upload); signals: diff --git a/src/timeline/RoomlistModel.cpp b/src/timeline/RoomlistModel.cpp
index 6e95ef8e..181c2136 100644 --- a/src/timeline/RoomlistModel.cpp +++ b/src/timeline/RoomlistModel.cpp
@@ -249,7 +249,7 @@ RoomlistModel::data(const QModelIndex &index, int role) const } void -RoomlistModel::updateReadStatus(const std::map<QString, bool> roomReadStatus_) +RoomlistModel::updateReadStatus(const std::map<QString, bool> &roomReadStatus_) { std::vector<int> roomsToUpdate; roomsToUpdate.resize(roomReadStatus_.size()); @@ -657,7 +657,7 @@ RoomlistModel::clear() } void -RoomlistModel::joinPreview(QString roomid) +RoomlistModel::joinPreview(const QString &roomid) { if (previewedRooms.contains(roomid)) { ChatPage::instance()->joinRoomVia( @@ -742,7 +742,7 @@ RoomlistModel::getRoomPreviewById(QString roomid) const } void -RoomlistModel::setCurrentRoom(QString roomid) +RoomlistModel::setCurrentRoom(const QString &roomid) { if ((currentRoom_ && currentRoom_->roomId() == roomid) || (currentRoomPreview_ && currentRoomPreview_->roomid() == roomid)) @@ -1078,7 +1078,7 @@ FilteredRoomlistModel::filterAcceptsRow(int sourceRow, const QModelIndex &) cons } void -FilteredRoomlistModel::toggleTag(QString roomid, QString tag, bool on) +FilteredRoomlistModel::toggleTag(const QString &roomid, const QString &tag, bool on) { if (on) { http::client()->put_tag( diff --git a/src/timeline/RoomlistModel.h b/src/timeline/RoomlistModel.h
index 2f2ea066..1abeb812 100644 --- a/src/timeline/RoomlistModel.h +++ b/src/timeline/RoomlistModel.h
@@ -96,7 +96,7 @@ public slots: void initializeRooms(); void sync(const mtx::responses::Sync &sync_); void clear(); - int roomidToIndex(QString roomid) + int roomidToIndex(const QString &roomid) { for (int i = 0; i < (int)roomids.size(); i++) { if (roomids[i] == roomid) @@ -105,13 +105,13 @@ public slots: return -1; } - void joinPreview(QString roomid); + void joinPreview(const QString &roomid); void acceptInvite(QString roomid); void declineInvite(QString roomid); void leave(QString roomid, QString reason = ""); TimelineModel *currentRoom() const { return currentRoom_.get(); } RoomPreview currentRoomPreview() const { return currentRoomPreview_.value_or(RoomPreview{}); } - void setCurrentRoom(QString roomid); + void setCurrentRoom(const QString &roomid); void resetCurrentRoom() { currentRoom_ = nullptr; @@ -120,7 +120,7 @@ public slots: } private slots: - void updateReadStatus(const std::map<QString, bool> roomReadStatus_); + void updateReadStatus(const std::map<QString, bool> &roomReadStatus_); signals: void totalUnreadMessageCountUpdated(int unreadMessages); @@ -173,7 +173,7 @@ public slots: void acceptInvite(QString roomid) { roomlistmodel->acceptInvite(roomid); } void declineInvite(QString roomid) { roomlistmodel->declineInvite(roomid); } void leave(QString roomid, QString reason = "") { roomlistmodel->leave(roomid, reason); } - void toggleTag(QString roomid, QString tag, bool on); + void toggleTag(const QString &roomid, const QString &tag, bool on); void copyLink(QString roomid); TimelineModel *currentRoom() const { return roomlistmodel->currentRoom(); } diff --git a/src/timeline/TimelineModel.cpp b/src/timeline/TimelineModel.cpp
index 13ebd506..6c967633 100644 --- a/src/timeline/TimelineModel.cpp +++ b/src/timeline/TimelineModel.cpp
@@ -1269,7 +1269,7 @@ TimelineModel::relatedInfo(const QString &id) } void -TimelineModel::showReadReceipts(QString id) +TimelineModel::showReadReceipts(const QString &id) { emit openReadReceiptsDialog(new ReadReceiptsProxy{id, roomId(), this}); } @@ -1372,7 +1372,7 @@ TimelineModel::markEventsAsRead(const std::vector<QString> &event_ids) } void -TimelineModel::updateLastReadId(QString currentRoomId) +TimelineModel::updateLastReadId(const QString &currentRoomId) { if (currentRoomId == room_id_) { last_event_id = cache::getFullyReadEventId(room_id_.toStdString()); diff --git a/src/timeline/TimelineModel.h b/src/timeline/TimelineModel.h
index 54a1cb3f..3a862cc9 100644 --- a/src/timeline/TimelineModel.h +++ b/src/timeline/TimelineModel.h
@@ -285,7 +285,7 @@ public: Q_INVOKABLE void openUserProfile(QString userid); Q_INVOKABLE void unpin(const QString &id); Q_INVOKABLE void pin(const QString &id); - Q_INVOKABLE void showReadReceipts(QString id); + Q_INVOKABLE void showReadReceipts(const QString &id); Q_INVOKABLE void redactEvent(const QString &id, const QString &reason = ""); Q_INVOKABLE void redactAllFromUser(const QString &userid, const QString &reason = ""); Q_INVOKABLE int idToIndex(const QString &id) const; @@ -349,7 +349,7 @@ public slots: int currentIndex() const { return idToIndex(currentId); } void eventShown(); void markEventsAsRead(const std::vector<QString> &event_ids); - void updateLastReadId(QString currentRoomId); + void updateLastReadId(const QString &currentRoomId); void lastReadIdOnWindowFocus(); void checkAfterFetch(); QVariantMap getDump(const QString &eventId, const QString &relatedTo) const; diff --git a/src/timeline/TimelineViewManager.cpp b/src/timeline/TimelineViewManager.cpp
index b705606a..a75a79d1 100644 --- a/src/timeline/TimelineViewManager.cpp +++ b/src/timeline/TimelineViewManager.cpp
@@ -246,8 +246,8 @@ TimelineViewManager::escapeEmoji(QString str) const void TimelineViewManager::openImageOverlay(TimelineModel *room, - QString mxcUrl, - QString eventId, + const QString &mxcUrl, + const QString &eventId, double originalWidth, double proportionalHeight) { @@ -384,7 +384,7 @@ TimelineViewManager::focusMessageInput() } QObject * -TimelineViewManager::completerFor(QString completerName, QString roomId) +TimelineViewManager::completerFor(const QString &completerName, const QString &roomId) { if (completerName == QLatin1String("user")) { auto userModel = new UsersModel(roomId.toStdString()); diff --git a/src/timeline/TimelineViewManager.h b/src/timeline/TimelineViewManager.h
index 0ba732fe..572e3e22 100644 --- a/src/timeline/TimelineViewManager.h +++ b/src/timeline/TimelineViewManager.h
@@ -54,8 +54,8 @@ public: Q_INVOKABLE bool isInitialSync() const { return isInitialSync_; } bool isConnected() const { return isConnected_; } Q_INVOKABLE void openImageOverlay(TimelineModel *room, - QString mxcUrl, - QString eventId, + const QString &mxcUrl, + const QString &eventId, double originalWidth, double proportionalHeight); Q_INVOKABLE void openImagePackSettings(QString roomid); @@ -112,7 +112,8 @@ public slots: void setVideoCallItem(); - QObject *completerFor(QString completerName, QString roomId = QLatin1String(QLatin1String(""))); + QObject *completerFor(const QString &completerName, + const QString &roomId = QLatin1String(QLatin1String(""))); void forwardMessageToRoom(mtx::events::collections::TimelineEvents *e, QString roomId); RoomlistModel *rooms() { return rooms_; }