Make clang-format <13 and clang-format >=13 behave the same

I think old clang-format is just buggy in those cases, so we should
reenable those blocks, once everyone has 13 or up.

2 files changed, 23 insertions, 23 deletions

diff --git a/src/timeline/EventStore.h b/src/timeline/EventStore.h

index 1730f9fd..a60507c2 100644
--- a/src/timeline/EventStore.h
+++ b/src/timeline/EventStore.h
@@ -79,8 +79,8 @@ public:
     QVariantList reactions(const std::string &event_id);
     std::vector<mtx::events::collections::TimelineEvents> edits(const std::string &event_id);
     olm::DecryptionErrorCode decryptionError(std::string id);
-    void requestSession(const mtx::events::EncryptedEvent<mtx::events::msg::Encrypted> &ev,
-                        bool manual);
+    void
+    requestSession(const mtx::events::EncryptedEvent<mtx::events::msg::Encrypted> &ev, bool manual);
 
     int size() const
     {
@@ -121,9 +121,9 @@ public slots:
     void enableKeyRequests(bool suppressKeyRequests_);
 
 private:
-    olm::DecryptionResult *decryptEvent(
-      const IdIndex &idx,
-      const mtx::events::EncryptedEvent<mtx::events::msg::Encrypted> &e);
+    olm::DecryptionResult *
+    decryptEvent(const IdIndex &idx,
+                 const mtx::events::EncryptedEvent<mtx::events::msg::Encrypted> &e);
     void handle_room_verification(mtx::events::collections::TimelineEvents event);
 
     std::string room_id_;
diff --git a/src/timeline/TimelineModel.cpp b/src/timeline/TimelineModel.cpp

index aa7a68f3..4a81b243 100644
--- a/src/timeline/TimelineModel.cpp
+++ b/src/timeline/TimelineModel.cpp
@@ -126,43 +126,43 @@ struct RoomEventType
     {
         return qml_mtx_events::EventType::VideoMessage;
     }
-    qml_mtx_events::EventType operator()(
-      const mtx::events::Event<mtx::events::msg::KeyVerificationRequest> &)
+    qml_mtx_events::EventType
+    operator()(const mtx::events::Event<mtx::events::msg::KeyVerificationRequest> &)
     {
         return qml_mtx_events::EventType::KeyVerificationRequest;
     }
-    qml_mtx_events::EventType operator()(
-      const mtx::events::Event<mtx::events::msg::KeyVerificationStart> &)
+    qml_mtx_events::EventType
+    operator()(const mtx::events::Event<mtx::events::msg::KeyVerificationStart> &)
     {
         return qml_mtx_events::EventType::KeyVerificationStart;
     }
-    qml_mtx_events::EventType operator()(
-      const mtx::events::Event<mtx::events::msg::KeyVerificationMac> &)
+    qml_mtx_events::EventType
+    operator()(const mtx::events::Event<mtx::events::msg::KeyVerificationMac> &)
     {
         return qml_mtx_events::EventType::KeyVerificationMac;
     }
-    qml_mtx_events::EventType operator()(
-      const mtx::events::Event<mtx::events::msg::KeyVerificationAccept> &)
+    qml_mtx_events::EventType
+    operator()(const mtx::events::Event<mtx::events::msg::KeyVerificationAccept> &)
     {
         return qml_mtx_events::EventType::KeyVerificationAccept;
     }
-    qml_mtx_events::EventType operator()(
-      const mtx::events::Event<mtx::events::msg::KeyVerificationReady> &)
+    qml_mtx_events::EventType
+    operator()(const mtx::events::Event<mtx::events::msg::KeyVerificationReady> &)
     {
         return qml_mtx_events::EventType::KeyVerificationReady;
     }
-    qml_mtx_events::EventType operator()(
-      const mtx::events::Event<mtx::events::msg::KeyVerificationCancel> &)
+    qml_mtx_events::EventType
+    operator()(const mtx::events::Event<mtx::events::msg::KeyVerificationCancel> &)
     {
         return qml_mtx_events::EventType::KeyVerificationCancel;
     }
-    qml_mtx_events::EventType operator()(
-      const mtx::events::Event<mtx::events::msg::KeyVerificationKey> &)
+    qml_mtx_events::EventType
+    operator()(const mtx::events::Event<mtx::events::msg::KeyVerificationKey> &)
     {
         return qml_mtx_events::EventType::KeyVerificationKey;
     }
-    qml_mtx_events::EventType operator()(
-      const mtx::events::Event<mtx::events::msg::KeyVerificationDone> &)
+    qml_mtx_events::EventType
+    operator()(const mtx::events::Event<mtx::events::msg::KeyVerificationDone> &)
     {
         return qml_mtx_events::EventType::KeyVerificationDone;
     }
@@ -182,8 +182,8 @@ struct RoomEventType
     {
         return qml_mtx_events::EventType::CallHangUp;
     }
-    qml_mtx_events::EventType operator()(
-      const mtx::events::Event<mtx::events::msg::CallCandidates> &)
+    qml_mtx_events::EventType
+    operator()(const mtx::events::Event<mtx::events::msg::CallCandidates> &)
     {
         return qml_mtx_events::EventType::CallCandidates;
     }