Merge #810(kitsune): Sonar cleanup

quotient-im · Oct 16, 2024 · 17acff6 · 17acff6
2 parents b07afdc + ec193bc
commit 17acff6
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 17 deletions.
diff --git a/Quotient/events/eventcontent.h b/Quotient/events/eventcontent.h
@@ -282,20 +282,19 @@ using FileContent = UrlBasedContent<FileInfo>;
 template <typename InfoT>
 class PlayableContent : public UrlBasedContent<InfoT> {
 public:
-using UrlBasedContent<InfoT>::UrlBasedContent;
-PlayableContent(const QJsonObject& json)
-    : UrlBasedContent<InfoT>(json)
-    , duration(FileInfo::originalInfoJson["duration"_L1].toInt())
-{}
+    using UrlBasedContent<InfoT>::UrlBasedContent;
+    explicit PlayableContent(const QJsonObject& json)
+        : UrlBasedContent<InfoT>(json), duration(FileInfo::originalInfoJson["duration"_L1].toInt())
+    {}
 
 protected:
-void fillInfoJson(QJsonObject& infoJson) const override
-{
-    infoJson.insert("duration"_L1, duration);
+    void fillInfoJson(QJsonObject& infoJson) const override
+    {
+        infoJson.insert("duration"_L1, duration);
 }
 
 public:
-int duration;
+    int duration;
 };
 
 //! \brief Content class for m.video

diff --git a/Quotient/events/roommessageevent.cpp b/Quotient/events/roommessageevent.cpp
@@ -89,7 +89,7 @@ inline bool isReplacement(const std::optional<EventRelation>& rel)
 QJsonObject RoomMessageEvent::assembleContentJson(const QString& plainBody,
                                                   const QString& jsonMsgType,
                                                   std::unique_ptr<Base> content,
-                                                  std::optional<EventRelation> relatesTo)
+                                                  const std::optional<EventRelation>& relatesTo)
 {
     QJsonObject json;
     if (content) {
@@ -118,14 +118,14 @@ QJsonObject RoomMessageEvent::assembleContentJson(const QString& plainBody,
 
 RoomMessageEvent::RoomMessageEvent(const QString& plainBody, const QString& jsonMsgType,
                                    std::unique_ptr<Base> content,
-                                   std::optional<EventRelation> relatesTo)
+                                   const std::optional<EventRelation>& relatesTo)
     : RoomEvent(basicJson(TypeId, assembleContentJson(plainBody, jsonMsgType, std::move(content),
                                                       relatesTo)))
 {}
 
 RoomMessageEvent::RoomMessageEvent(const QString& plainBody, MsgType msgType,
                                    std::unique_ptr<Base> content,
-                                   std::optional<EventRelation> relatesTo)
+                                   const std::optional<EventRelation>& relatesTo)
     : RoomMessageEvent(plainBody, msgTypeToJson(msgType), std::move(content), relatesTo)
 {}
 

diff --git a/Quotient/events/roommessageevent.h b/Quotient/events/roommessageevent.h
@@ -35,10 +35,10 @@ class QUOTIENT_API RoomMessageEvent : public RoomEvent {
 
     RoomMessageEvent(const QString& plainBody, const QString& jsonMsgType,
                      std::unique_ptr<EventContent::Base> content = nullptr,
-                     std::optional<EventRelation> relatesTo = std::nullopt);
+                     const std::optional<EventRelation>& relatesTo = std::nullopt);
     explicit RoomMessageEvent(const QString& plainBody, MsgType msgType = MsgType::Text,
                               std::unique_ptr<EventContent::Base> content = nullptr,
-                              std::optional<EventRelation> relatesTo = std::nullopt);
+                              const std::optional<EventRelation>& relatesTo = std::nullopt);
 
     explicit RoomMessageEvent(const QJsonObject& obj);
 
@@ -179,7 +179,7 @@ class QUOTIENT_API RoomMessageEvent : public RoomEvent {
     // FIXME: should it really be static?
     static QJsonObject assembleContentJson(const QString& plainBody, const QString& jsonMsgType,
                                            std::unique_ptr<EventContent::Base> content,
-                                           std::optional<EventRelation> relatesTo);
+                                           const std::optional<EventRelation>& relatesTo);
 
     Q_ENUM(MsgType)
 };

diff --git a/Quotient/room.cpp b/Quotient/room.cpp
@@ -1740,8 +1740,8 @@ Room::Private::moveEventsToTimeline(RoomEventsRange events,
         if (usesEncryption)
             if (auto* const rme = ti.viewAs<RoomMessageEvent>())
                 if (const auto fileInfo = rme->fileContent()) {
-                    if (auto* const efm = std::get_if<EncryptedFileMetadata>(
-                            &fileInfo->source))
+                    if (const auto* const efm =
+                            std::get_if<EncryptedFileMetadata>(&fileInfo->source))
                         FileMetadataMap::add(id, eId, *efm);
                 }