Merge branch '0.7.0-dev' of ssh://github.com/Nheko-Reborn/nheko into 0.7.0-dev

3 files changed, 7 insertions, 4 deletions

diff --git a/src/timeline/TimelineView.cpp b/src/timeline/TimelineView.cpp

index ee7021d8..6d947c15 100644
--- a/src/timeline/TimelineView.cpp
+++ b/src/timeline/TimelineView.cpp
@@ -690,7 +690,9 @@ TimelineView::updatePendingMessage(const std::string &txn_id, const QString &eve
 }
 
 void
-TimelineView::addUserMessage(mtx::events::MessageType ty, const QString &body, const QString &related_event)
+TimelineView::addUserMessage(mtx::events::MessageType ty,
+                             const QString &body,
+                             const QString &related_event)
 {
         auto with_sender = (lastSender_ != local_user_) || isDateDifference(lastMsgTimestamp_);
 
diff --git a/src/timeline/TimelineView.h b/src/timeline/TimelineView.h

index 450b5dfa..db6087eb 100644
--- a/src/timeline/TimelineView.h
+++ b/src/timeline/TimelineView.h
@@ -121,7 +121,9 @@ public:
 
         // Add new events at the end of the timeline.
         void addEvents(const mtx::responses::Timeline &timeline);
-        void addUserMessage(mtx::events::MessageType ty, const QString &body, const QString &related_event);
+        void addUserMessage(mtx::events::MessageType ty,
+                            const QString &body,
+                            const QString &related_event);
         void addUserMessage(mtx::events::MessageType ty, const QString &msg);
 
         template<class Widget, mtx::events::MessageType MsgType>
diff --git a/src/timeline/TimelineViewManager.cpp b/src/timeline/TimelineViewManager.cpp

index 10c2d747..1ce3794f 100644
--- a/src/timeline/TimelineViewManager.cpp
+++ b/src/timeline/TimelineViewManager.cpp
@@ -79,8 +79,7 @@ TimelineViewManager::queueEmoteMessage(const QString &msg)
 }
 
 void
-TimelineViewManager::queueReplyMessage(const QString &reply,
-                                       const QString &related_event)
+TimelineViewManager::queueReplyMessage(const QString &reply, const QString &related_event)
 {
         if (active_room_.isEmpty())
                 return;