summary refs log tree commit diff
path: root/src/encryption/DeviceVerificationFlow.h
diff options
context:
space:
mode:
authorNicolas Werner <nicolas.werner@hotmail.de>2021-11-22 00:32:49 +0100
committerNicolas Werner <nicolas.werner@hotmail.de>2021-11-22 00:33:43 +0100
commita13f492e7d587ade54606a77c4e9f497a0fea737 (patch)
treeffb115cd17450e8094e7e15e0d04f2d5d2e9a852 /src/encryption/DeviceVerificationFlow.h
parentMerge pull request #822 from Nheko-Reborn/dm-filter (diff)
downloadnheko-a13f492e7d587ade54606a77c4e9f497a0fea737.tar.xz
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.
Diffstat (limited to 'src/encryption/DeviceVerificationFlow.h')
-rw-r--r--src/encryption/DeviceVerificationFlow.h32
1 files changed, 16 insertions, 16 deletions
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>