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, 21 insertions, 18 deletions

diff --git a/src/encryption/DeviceVerificationFlow.cpp b/src/encryption/DeviceVerificationFlow.cpp

index f05d5c9f..42a0d041 100644
--- a/src/encryption/DeviceVerificationFlow.cpp
+++ b/src/encryption/DeviceVerificationFlow.cpp
@@ -662,9 +662,12 @@ DeviceVerificationFlow::sendVerificationRequest()
     } else if (this->type == DeviceVerificationFlow::Type::RoomMsg && model_) {
         req.to      = this->toClient.to_string();
         req.msgtype = "m.key.verification.request";
+        // clang-format off
+        // clang-format < 12 is buggy on this
         req.body    = "User is requesting to verify keys with you. However, your client does "
-                   "not support this method, so you will need to use the legacy method of "
-                   "key verification.";
+                      "not support this method, so you will need to use the legacy method of "
+                      "key verification.";
+        // clang-format on
     }
 
     send(req);
diff --git a/src/encryption/DeviceVerificationFlow.h b/src/encryption/DeviceVerificationFlow.h

index 537adf31..396421f7 100644
--- a/src/encryption/DeviceVerificationFlow.h
+++ b/src/encryption/DeviceVerificationFlow.h
@@ -103,22 +103,22 @@ public:
     };
     Q_ENUM(Error)
 
-    static QSharedPointer<DeviceVerificationFlow> NewInRoomVerification(
-      QObject *parent_,
-      TimelineModel *timelineModel_,
-      const mtx::events::msg::KeyVerificationRequest &msg,
-      QString other_user_,
-      QString event_id_);
-    static QSharedPointer<DeviceVerificationFlow> NewToDeviceVerification(
-      QObject *parent_,
-      const mtx::events::msg::KeyVerificationRequest &msg,
-      QString other_user_,
-      QString txn_id_);
-    static QSharedPointer<DeviceVerificationFlow> NewToDeviceVerification(
-      QObject *parent_,
-      const mtx::events::msg::KeyVerificationStart &msg,
-      QString other_user_,
-      QString txn_id_);
+    static QSharedPointer<DeviceVerificationFlow>
+    NewInRoomVerification(QObject *parent_,
+                          TimelineModel *timelineModel_,
+                          const mtx::events::msg::KeyVerificationRequest &msg,
+                          QString other_user_,
+                          QString event_id_);
+    static QSharedPointer<DeviceVerificationFlow>
+    NewToDeviceVerification(QObject *parent_,
+                            const mtx::events::msg::KeyVerificationRequest &msg,
+                            QString other_user_,
+                            QString txn_id_);
+    static QSharedPointer<DeviceVerificationFlow>
+    NewToDeviceVerification(QObject *parent_,
+                            const mtx::events::msg::KeyVerificationStart &msg,
+                            QString other_user_,
+                            QString txn_id_);
     static QSharedPointer<DeviceVerificationFlow>
     InitiateUserVerification(QObject *parent_, TimelineModel *timelineModel_, QString userid);
     static QSharedPointer<DeviceVerificationFlow>